projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* merged with tip (040f180a056b)
[cacao.git]
/
src
/
vm
/
resolve.c
diff --git
a/src/vm/resolve.c
b/src/vm/resolve.c
index a98388550e533d90431e95ef0b5bd482492122a2..8bd21c916974c5d1f93dd2e0b3a3ce2322696b47 100644
(file)
--- a/
src/vm/resolve.c
+++ b/
src/vm/resolve.c
@@
-32,20
+32,20
@@
#include "mm/memory.h"
#include "vm/access.h"
#include "mm/memory.h"
#include "vm/access.h"
-#include "vm/exceptions.h"
+#include "vm/classcache.h"
+#include "vm/descriptor.h"
+#include "vm/exceptions.hpp"
#include "vm/global.h"
#include "vm/global.h"
-#include "vm/primitive.h"
+#include "vm/globals.hpp"
+#include "vm/linker.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+#include "vm/primitive.hpp"
#include "vm/resolve.h"
#include "vm/jit/jit.h"
#include "vm/jit/verify/typeinfo.h"
#include "vm/resolve.h"
#include "vm/jit/jit.h"
#include "vm/jit/verify/typeinfo.h"
-#include "vmcore/classcache.h"
-#include "vmcore/descriptor.h"
-#include "vmcore/linker.h"
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
-
/******************************************************************************/
/* DEBUG HELPERS */
/******************************************************************************/
/* DEBUG HELPERS */
@@
-500,7
+500,7
@@
bool resolve_class_from_typedesc(typedesc *d, bool checkaccess, bool link, class
else {
/* a primitive type */
else {
/* a primitive type */
- cls =
primitive_class_get_by_type(d->decl
type);
+ cls =
Primitive_get_class_by_type(d->primitive
type);
assert(cls->state & CLASS_LOADED);
assert(cls->state & CLASS_LOADED);
@@
-1329,7
+1329,7
@@
resolve_result_t resolve_field_lazy(methodinfo *refmethod,
fi = class_resolvefield(container,
fieldref->name, fieldref->descriptor,
fi = class_resolvefield(container,
fieldref->name, fieldref->descriptor,
- referer
, true
);
+ referer);
if (!fi) {
/* The field does not exist. But since we were called lazily, */
/* this error must not be reported now. (It will be reported */
if (!fi) {
/* The field does not exist. But since we were called lazily, */
/* this error must not be reported now. (It will be reported */
@@
-1427,7
+1427,7
@@
bool resolve_field(unresolved_field *ref,
fi = class_resolvefield(container,
ref->fieldref->name,ref->fieldref->descriptor,
fi = class_resolvefield(container,
ref->fieldref->name,ref->fieldref->descriptor,
- referer
,true
);
+ referer);
if (!fi) {
if (mode == resolveLazy) {
/* The field does not exist. But since we were called lazily, */
if (!fi) {
if (mode == resolveLazy) {
/* The field does not exist. But since we were called lazily, */