X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvm%2Fjit%2Fi386%2Fcodegen.c;h=a367f37aa4a05b5cd11801c2ca5a16bacd01d923;hb=cce34f898a508bde05c54be7f19c0fbfeb2dc0a2;hp=83682c7c62d0e2bc764b85bbb27dbb91becf3a36;hpb=1313591bcd88100eb98f4d75dc6851e7d72e0f79;p=cacao.git

diff --git a/src/vm/jit/i386/codegen.c b/src/vm/jit/i386/codegen.c
index 83682c7c6..a367f37aa 100644
--- a/src/vm/jit/i386/codegen.c
+++ b/src/vm/jit/i386/codegen.c
@@ -37,31 +37,33 @@
 #include "vm/jit/i386/emit.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.hpp"
+#include "native/native.hpp"
 
-#include "vm/builtin.h"
-#include "vm/exceptions.h"
+#include "threads/lock.hpp"
+
+#include "vm/jit/builtin.hpp"
+#include "vm/exceptions.hpp"
 #include "vm/global.h"
-#include "vm/primitive.h"
-#include "vm/stringlocal.h"
-#include "vm/vm.h"
+#include "vm/loader.hpp"
+#include "vm/options.h"
+#include "vm/primitive.hpp"
+#include "vm/utf8.h"
+#include "vm/vm.hpp"
 
 #include "vm/jit/abi.h"
 #include "vm/jit/asmpart.h"
-#include "vm/jit/codegen-common.h"
+#include "vm/jit/codegen-common.hpp"
 #include "vm/jit/dseg.h"
-#include "vm/jit/emit-common.h"
-#include "vm/jit/jit.h"
-#include "vm/jit/linenumbertable.h"
-#include "vm/jit/parse.h"
-#include "vm/jit/patcher-common.h"
+#include "vm/jit/emit-common.hpp"
+#include "vm/jit/jit.hpp"
+#include "vm/jit/linenumbertable.hpp"
+#include "vm/jit/parse.hpp"
+#include "vm/jit/patcher-common.hpp"
 #include "vm/jit/reg.h"
-#include "vm/jit/replace.h"
-#include "vm/jit/stacktrace.h"
+#include "vm/jit/replace.hpp"
+#include "vm/jit/stacktrace.hpp"
 #include "vm/jit/trap.h"
 
 #if defined(ENABLE_SSA)
@@ -71,10 +73,6 @@
 # include "vm/jit/allocator/lsra.h"
 #endif
 
-#include "vmcore/loader.h"
-#include "vmcore/options.h"
-#include "vmcore/utf8.h"
-
 
 /* codegen_emit ****************************************************************
 
@@ -408,9 +406,7 @@ bool codegen_emit(jitdata *jd)
 		if (bptr->bitflags & BBFLAG_REPLACEMENT) {
 			if (cd->replacementpoint[-1].flags & RPLPOINT_FLAG_COUNTDOWN) {
 				MCODECHECK(32);
-				disp = (s4) &(m->hitcountdown);
-				M_ISUB_IMM_MEMABS(1, disp);
-				M_BS(0);
+				emit_trap_countdown(cd, &(m->hitcountdown));
 			}
 		}
 #endif
@@ -2225,7 +2221,7 @@ bool codegen_emit(jitdata *jd)
 			break;
 
 		case ICMD_PUTSTATIC:  /* ..., value  ==> ...                          */
-
+			
 			if (INSTRUCTION_IS_UNRESOLVED(iptr)) {
 				uf        = iptr->sx.s23.s3.uf;
 				fieldtype = uf->fieldref->parseddesc.fd->type;
@@ -2891,6 +2887,21 @@ nowperformreturn:
 
 			bte = iptr->sx.s23.s3.bte;
 			md = bte->md;
+
+#if defined(ENABLE_ESCAPE_REASON)
+			if (bte->fp == BUILTIN_escape_reason_new) {
+				void set_escape_reasons(void *);
+				M_ASUB_IMM(8, REG_SP);
+				M_MOV_IMM(iptr->escape_reasons, REG_ITMP1);
+				M_AST(EDX, REG_SP, 4);
+				M_AST(REG_ITMP1, REG_SP, 0);
+				M_MOV_IMM(set_escape_reasons, REG_ITMP1);
+				M_CALL(REG_ITMP1);
+				M_ALD(EDX, REG_SP, 4);
+				M_AADD_IMM(8, REG_SP);
+			}
+#endif
+
 			goto gen_method;
 
 		case ICMD_INVOKESTATIC: /* ..., [arg1, [arg2 ...]] ==> ...            */
@@ -3670,7 +3681,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
 
 		/* put env into first argument */
 
-		M_AST_IMM(_Jv_env, REG_SP, 0 * 4);
+		M_AST_IMM(VM_get_jnienv(), REG_SP, 0 * 4);
 	}
 
 	/* Call the native function. */
@@ -3686,7 +3697,7 @@ void codegen_emit_stub_native(jitdata *jd, methoddesc *nmd, functionptr f, int s
 	switch (md->returntype.type) {
 	case TYPE_INT:
 	case TYPE_ADR:
-		switch (md->returntype.decltype) {
+		switch (md->returntype.primitivetype) {
 		case PRIMITIVETYPE_BOOLEAN:
 			M_BZEXT(REG_RESULT, REG_RESULT);
 			break;