Changeset 42601 in vbox for trunk/src/recompiler/tcg/tcg.h

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/recompiler/tcg/tcg.h (modified) (4 diffs)

trunk/src/recompiler/tcg/tcg.h

@@ -282 +282 @@
     /* goto_tb support */
     uint8_t *code_buf;
-    unsigned long *tb_next;
+    uintptr_t *tb_next;
     uint16_t *tb_next_offset;
     uint16_t *tb_jmp_offset; /* != NULL if USE_DIRECT_JUMP */
@@ -342 +342 @@
     TCGContext *s = &tcg_ctx;
     uint8_t *ptr, *ptr_end;
-    size = (size + sizeof(long) - 1) & ~(sizeof(long) - 1);
+    size = (size + sizeof(void *) - 1) & ~(sizeof(void *) - 1);
     ptr = s->pool_cur;
     ptr_end = ptr + size;
@@ -358 +358 @@
 
 int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf);
-int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset);
+int tcg_gen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, intptr_t offset);
 
 void tcg_set_frame(TCGContext *s, int reg,
@@ -502 +502 @@
 #if defined(_ARCH_PPC) && !defined(_ARCH_PPC64)
 #define tcg_qemu_tb_exec(tb_ptr) \
-    ((long REGPARM __attribute__ ((longcall)) (*)(void *))code_gen_prologue)(tb_ptr)
-#else
-# if defined(VBOX) && defined(GCC_WITH_BUGGY_REGPARM)
+    ((intptr_t REGPARM __attribute__ ((longcall)) (*)(void *))code_gen_prologue)(tb_ptr)
+#else
+# if defined(VBOX) && defined(GCC_WITH_BUGGY_REGPARM) && !defined(__MINGW64__)
 #  define tcg_qemu_tb_exec(tb_ptr, ret)        \
     __asm__ __volatile__("call *%%ecx" : "=a"(ret) : "a"(tb_ptr), "c" (&code_gen_prologue[0]) : "memory", "%edx", "cc")
-# else  /* !VBOX || !GCC_WITH_BUGGY_REG_PARAM */
-#define tcg_qemu_tb_exec(tb_ptr) ((long REGPARM (*)(void *))code_gen_prologue)(tb_ptr)
-# endif /* !VBOX || !GCC_WITH_BUGGY_REG_PARAM */
-#endif
+# else
+#define tcg_qemu_tb_exec(tb_ptr) ((intptr_t REGPARM (*)(void *))code_gen_prologue)(tb_ptr)
+# endif
+#endif