Changeset 182 in vbox for trunk/src/recompiler

Timestamp:

Jan 19, 2007 3:41:26 PM (18 years ago)

Author:

vboxsync

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

17656

Message:

gcc 3.3.3 didn't like my references to the two labels pointers. Also shut to two warnings and added an #error for amd64+darwin.

File:

• trunk/src/recompiler/new/exec-all.h (modified) (2 diffs)

trunk/src/recompiler/new/exec-all.h

@@ -205 +205 @@
     uint16_t tb_jmp_offset[4]; /* offset of jump instruction */
 #else
+# if defined(VBOX) && defined(__DARWIN__) && defined(__AMD64__)
+#  error "First 4GB aren't reachable. jmp dword [tb_next] wont work."
+# endif
     uint32_t tb_next[2]; /* address of jump generated code */
 #endif
@@ -363 +366 @@
                 variables. I've added a dummy __asm__ statement which reference
                 the two variables to prevent this. */
-#define GOTO_TB(opname, tbparam, n)\
-do {\
-    static void __attribute__((unused)) *dummy ## n = &&dummy_label ## n;\
-    static void __attribute__((unused)) *__op_label ## n \
-        __asm__(ASM_OP_LABEL_NAME(n, opname)) = &&label ## n;\
-    __asm__ ("" : : "m" (__op_label ## n), "m" (dummy ## n));\
-    goto *(void *)(((TranslationBlock *)tbparam)->tb_next[n]);\
-label ## n: ;\
-dummy_label ## n: ;\
-} while (0)
+#  if __GNUC__ >= 4
+#   define GOTO_TB(opname, tbparam, n)\
+    do {\
+        static void __attribute__((unused)) *dummy ## n = &&dummy_label ## n;\
+        static void __attribute__((unused)) *__op_label ## n \
+            __asm__(ASM_OP_LABEL_NAME(n, opname)) = &&label ## n;\
+        __asm__ ("" : : "m" (__op_label ## n), "m" (dummy ## n));\
+        goto *(void *)(uintptr_t)(((TranslationBlock *)tbparam)->tb_next[n]);\
+    label ## n: ;\
+    dummy_label ## n: ;\
+    } while (0)
+#  else
+#   define GOTO_TB(opname, tbparam, n)\
+    do {\
+        static void __attribute__((unused)) *dummy ## n = &&dummy_label ## n;\
+        static void __attribute__((unused)) *__op_label ## n \
+            __asm__(ASM_OP_LABEL_NAME(n, opname)) = &&label ## n;\
+        goto *(void *)(uintptr_t)(((TranslationBlock *)tbparam)->tb_next[n]);\
+    label ## n: ;\
+    dummy_label ## n: ;\
+    } while (0)
+#  endif 
 # else /* !VBOX */
 #define GOTO_TB(opname, tbparam, n)\