projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged trunk and subtype.
[cacao.git]
/
src
/
vm
/
jit
/
alpha
/
codegen.c
diff --git
a/src/vm/jit/alpha/codegen.c
b/src/vm/jit/alpha/codegen.c
index caa7834316708da6238f545c0ba192b67e2ee798..e52bb2c97d91664324b3c689917e4b3f0cdd3a63 100644
(file)
--- a/
src/vm/jit/alpha/codegen.c
+++ b/
src/vm/jit/alpha/codegen.c
@@
-38,29
+38,30
@@
#include "mm/memory.h"
#include "mm/memory.h"
-#include "native/jni.h"
#include "native/localref.h"
#include "native/native.h"
#include "threads/lock-common.h"
#include "native/localref.h"
#include "native/native.h"
#include "threads/lock-common.h"
-#include "vm/
builtin.h
"
-#include "vm/exceptions.h"
+#include "vm/
jit/builtin.hpp
"
+#include "vm/exceptions.h
pp
"
#include "vm/global.h"
#include "vm/global.h"
-#include "vm/vm.h"
+#include "vm/loader.hpp"
+#include "vm/options.h"
+#include "vm/vm.hpp"
#include "vm/jit/abi.h"
#include "vm/jit/asmpart.h"
#include "vm/jit/abi.h"
#include "vm/jit/asmpart.h"
-#include "vm/jit/codegen-common.h"
+#include "vm/jit/codegen-common.h
pp
"
#include "vm/jit/dseg.h"
#include "vm/jit/dseg.h"
-#include "vm/jit/emit-common.h"
-#include "vm/jit/jit.h"
+#include "vm/jit/emit-common.h
pp
"
+#include "vm/jit/jit.h
pp
"
#include "vm/jit/linenumbertable.h"
#include "vm/jit/parse.h"
#include "vm/jit/linenumbertable.h"
#include "vm/jit/parse.h"
-#include "vm/jit/patcher-common.h"
+#include "vm/jit/patcher-common.h
pp
"
#include "vm/jit/reg.h"
#include "vm/jit/reg.h"
-#include "vm/jit/replace.h"
-#include "vm/jit/stacktrace.h"
+#include "vm/jit/replace.h
pp
"
+#include "vm/jit/stacktrace.h
pp
"
#include "vm/jit/trap.h"
#if defined(ENABLE_SSA)
#include "vm/jit/trap.h"
#if defined(ENABLE_SSA)
@@
-70,9
+71,6
@@
# include "vm/jit/allocator/lsra.h"
#endif
# include "vm/jit/allocator/lsra.h"
#endif
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
-
/* codegen_emit ****************************************************************
/* codegen_emit ****************************************************************
@@
-3285,7
+3283,7
@@
void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
/* put env into first argument register */
/* put env into first argument register */
- disp = dseg_add_address(cd,
_Jv_env
);
+ disp = dseg_add_address(cd,
VM_get_jnienv()
);
M_ALD(REG_A0, REG_PV, disp);
}
M_ALD(REG_A0, REG_PV, disp);
}