Changeset 42601 in vbox for trunk/src/recompiler/target-i386

Timestamp:

Aug 5, 2012 4:26:25 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

79786

Message:

REM: Initial changes to make it work (seemingly) with MinGW-w64.

Location:

trunk/src/recompiler/target-i386

Files:

• op_helper.c (modified) (3 diffs)
• translate.c (modified) (2 diffs)

trunk/src/recompiler/target-i386/op_helper.c

@@ -5643 +5643 @@
     TranslationBlock *tb;
     int ret;
-    unsigned long pc;
+    uintptr_t pc;
     CPUX86State *saved_env;
 
@@ -5655 +5655 @@
         if (retaddr) {
             /* now we have a real cpu fault */
-            pc = (unsigned long)retaddr;
+            pc = (uintptr_t)retaddr;
             tb = tb_find_pc(pc);
             if (tb) {
@@ -5845 +5845 @@
 DECLINLINE(void) tb_reset_jump(TranslationBlock *tb, int n)
 {
-    tb_set_jmp_target(tb, n, (unsigned long)(tb->tc_ptr + tb->tb_next_offset[n]));
+    tb_set_jmp_target(tb, n, (uintptr_t)(tb->tc_ptr + tb->tb_next_offset[n]));
 }
 

trunk/src/recompiler/target-i386/translate.c

@@ -2480 +2480 @@
         tcg_gen_goto_tb(tb_num);
         gen_jmp_im(eip);
-        tcg_gen_exit_tb((long)tb + tb_num);
+        tcg_gen_exit_tb((intptr_t)tb + tb_num);
     } else {
         /* jump to another page: currently not optimized */
@@ -8364 +8364 @@
 
 void gen_pc_load(CPUState *env, TranslationBlock *tb,
-                unsigned long searched_pc, int pc_pos, void *puc)
+                 uintptr_t searched_pc, int pc_pos, void *puc)
 {
     int cc_op;