Changeset 13230

Timestamp:

10/13/08 21:03:16 (3 months ago)

Author:

vboxsync

Message:

further new recompiler work

Files:

• trunk/Config.kmk (modified) (1 diff)
• trunk/include/VBox/vm.h (modified) (1 diff)
• trunk/src/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/VMM/REMInternal.h (modified) (2 diffs)
• trunk/src/recompiler_new/Makefile.kmk (modified) (2 diffs)
• trunk/src/recompiler_new/Sun/config.h (modified) (1 diff)
• trunk/src/recompiler_new/Sun/structs.h (modified) (2 diffs)
• trunk/src/recompiler_new/VBoxRecompiler.c (modified) (6 diffs)
• trunk/src/recompiler_new/cpu-all.h (modified) (12 diffs)
• trunk/src/recompiler_new/cpu-defs.h (modified) (6 diffs)
• trunk/src/recompiler_new/exec-all.h (modified) (12 diffs)
• trunk/src/recompiler_new/osdep.h (modified) (1 diff)
• trunk/src/recompiler_new/target-i386/cpu.h (modified) (22 diffs)
• trunk/src/recompiler_new/target-i386/exec.h (modified) (9 diffs)
• trunk/src/recompiler_new/translate-all.c (modified) (4 diffs)

trunk/Config.kmk

@@ -1030 +1030 @@
-## @todo eliminate these guys.
-ifdef VBOX_WITH_INTERNAL_NETWORKING
-
-
-
+
+
+
+
+
-
-#

trunk/include/VBox/vm.h

@@ -683 +683 @@
-        struct REM  s;
-#endif
+
+#ifdef VBOX_WITH_NEW_RECOMPILER
+/* Must be multiple of 32 and coherent with REM_ENV_SIZE from REMInternal.h */
-#if GC_ARCH_BITS == 32
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    } rem;
-

trunk/src/Makefile.kmk

@@ -73 +73 @@
-
- ifdef VBOX_WITH_NEW_RECOMPILER
-
+ 
- else
-   SUBDIRS += recompiler

trunk/src/VBox/VMM/REMInternal.h

@@ -243 +243 @@
-#endif
-
+#ifdef VBOX_WITH_NEW_RECOMPILER
+#if GC_ARCH_BITS == 32
+#define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0xff00 : 0xff00)
+#else
+#define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0xff00 : 0xff00)
+#endif
+#else
-#if GC_ARCH_BITS == 32
-#define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0x6550 : 0xb4a0)
@@ -248 +255 @@
-#define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0x9440 : 0xd4a0)
-#endif
+#endif // VBOX_WITH_NEW_RECOMILER
-
-    /** Recompiler CPU state. */

trunk/src/recompiler_new/Makefile.kmk

@@ -41 +41 @@
-DLLS                 += VBoxREM
-IMPORT_LIBS          += VBoxREMImp
+
+DEFS                 += VBOX_WITH_NEW_RECOMPILER
+
-
-OTHER_CLEAN          += \
@@ -219 +222 @@
-        $(APPEND)    $@ ''
-
-translate-all.c_DEPS = 
-translate-op.c_DEPS = $(translate-all.c_DEPS)
-target-i386/translate.c_DEPS = $(translate-all.c_DEPS)
-
-#
-# The math testcase as a standalone program for testing and debugging purposes.

trunk/src/recompiler_new/Sun/config.h

@@ -29 +29 @@
-#define TARGET_X86_64
-#endif
-
-#define unlikely(cond) RT_UNLIKELY(cond)

trunk/src/recompiler_new/Sun/structs.h

@@ -230 +230 @@
-    REM_OFFSETOF(CPUState, ft0),
-    REM_SIZEOFMEMB(CPUState, ft0),
-    REM_OFFSETOF(CPUState, fp_convert),
-    REM_SIZEOFMEMB(CPUState, fp_convert),
-    REM_OFFSETOF(CPUState, sse_status),
-    REM_OFFSETOF(CPUState, mxcsr),
@@ -266 +264 @@
-    /* cpu-defs.h */
-    REM_OFFSETOF(CPUState, current_tb),
-write
-write
+io
+io
-    REM_OFFSETOF(CPUState, tlb_table),
-    REM_SIZEOFMEMB(CPUState, tlb_table),

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -289 +289 @@
-     * Init the recompiler.
-     */
-
+, "vbox"
-    {
-        AssertMsgFailed(("cpu_x86_init failed - impossible!\n"));
@@ -3806 +3806 @@
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_HARD);
-        else
-
+
+
-    }
-}
@@ -3841 +3842 @@
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
-        else
-
+
+
-    }
-}
@@ -3860 +3862 @@
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
-        else
-
+
+
-    }
-}
@@ -3879 +3882 @@
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
-        else
-
+
+
-    }
-}
@@ -3898 +3902 @@
-            cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
-        else
-
+
+
-    }
-}

trunk/src/recompiler_new/cpu-all.h

@@ -134 +134 @@
-#endif
-
+typedef union {
+    float32 f;
+    uint32_t l;
+} CPU_FloatU;
+
-/* NOTE: arm FPA is horrible as double 32 bit words are stored in big
-   endian ! */
@@ -152 +157 @@
-    uint64_t ll;
-} CPU_DoubleU;
+
+#ifdef TARGET_SPARC
+typedef union {
+    float128 q;
+#if defined(WORDS_BIGENDIAN) \
+    || (defined(__arm__) && !defined(__VFP_FP__) && !defined(CONFIG_SOFTFLOAT))
+    struct {
+        uint32_t upmost;
+        uint32_t upper;
+        uint32_t lower;
+        uint32_t lowest;
+    } l;
+    struct {
+        uint64_t upper;
+        uint64_t lower;
+    } ll;
+#else
+    struct {
+        uint32_t lowest;
+        uint32_t lower;
+        uint32_t upper;
+        uint32_t upmost;
+    } l;
+    struct {
+        uint64_t lower;
+        uint64_t upper;
+    } ll;
+#endif
+} CPU_QuadU;
+#endif
-
-/* CPU memory access without any memory or io remapping */
@@ -831 +866 @@
-   code */
-#define PAGE_WRITE_ORG 0x0010
+#define PAGE_RESERVED  0x0020
-
-void page_dump(FILE *f);
-int page_get_flags(target_ulong address);
-void page_set_flags(target_ulong start, target_ulong end, int flags);
+int page_check_range(target_ulong start, target_ulong len, int flags);
-void page_unprotect_range(target_ulong data, target_ulong data_size);
-
@@ -908 +945 @@
-extern CPUState *first_cpu;
-extern CPUState *cpu_single_env;
-
+
+
-
-#define CPU_INTERRUPT_EXIT   0x01 /* wants exit from main loop */
@@ -917 +955 @@
-#define CPU_INTERRUPT_HALT   0x20 /* CPU halt wanted */
-#define CPU_INTERRUPT_SMI    0x40 /* (x86 only) SMI interrupt pending */
+#define CPU_INTERRUPT_DEBUG  0x80 /* Debug event occured.  */
+#define CPU_INTERRUPT_VIRQ   0x100 /* virtual interrupt pending.  */
+#define CPU_INTERRUPT_NMI    0x200 /* NMI pending. */
-
-#ifdef VBOX
-/** Executes a single instruction. cpu_exec() will normally return EXCP_SINGLE_INSTR. */
-2
+4
-/** Executing a CPU_INTERRUPT_SINGLE_INSTR request, quit the cpu_loop. (for exceptions and suchlike) */
-4
+8
-/** VM execution was interrupted by VMR3Reset, VMR3Suspend or VMR3PowerOff. */
-08
+10
-/** Exit current TB to process an external interrupt request (also in op.c!!) */
-1
+2
-/** Exit current TB to process an external interrupt request (also in op.c!!) */
-2
+4
-/** Exit current TB to process an external interrupt request (also in op.c!!) */
-4
+8
-/** Exit current TB to process an external interrupt request (also in op.c!!) */
-8
+10
-#endif /* VBOX */
-void cpu_interrupt(CPUState *s, int mask);
-void cpu_reset_interrupt(CPUState *env, int mask);
-
+int cpu_watchpoint_insert(CPUState *env, target_ulong addr, int type);
+int cpu_watchpoint_remove(CPUState *env, target_ulong addr);
+void cpu_watchpoint_remove_all(CPUState *env);
-int cpu_breakpoint_insert(CPUState *env, target_ulong pc);
-int cpu_breakpoint_remove(CPUState *env, target_ulong pc);
+void cpu_breakpoint_remove_all(CPUState *env);
+
+#define SSTEP_ENABLE  0x1  /* Enable simulated HW single stepping */
+#define SSTEP_NOIRQ   0x2  /* Do not use IRQ while single stepping */
+#define SSTEP_NOTIMER 0x4  /* Do not Timers while single stepping */
+
-void cpu_single_step(CPUState *env, int enabled);
-void cpu_reset(CPUState *s);
@@ -981 +1031 @@
-int cpu_inw(CPUState *env, int addr);
-int cpu_inl(CPUState *env, int addr);
+#endif
+
+/* address in the RAM (different from a physical address) */
+#ifdef USE_KQEMU
+typedef uint32_t ram_addr_t;
+#else
+typedef unsigned long ram_addr_t;
-#endif
-
@@ -1007 +1064 @@
-#define IO_MEM_ROM         (1 << IO_MEM_SHIFT) /* hardcoded offset */
-#define IO_MEM_UNASSIGNED  (2 << IO_MEM_SHIFT)
-4 << IO_MEM_SHIFT) /* used internally, never use directly */
+3 << IO_MEM_SHIFT)
-#if defined(VBOX) && !defined(VBOX_WITH_NEW_PHYS_CODE)
-#define IO_MEM_RAM_MISSING (5 << IO_MEM_SHIFT) /* used internally, never use directly */
@@ -1015 +1072 @@
-   the physical address */
-#define IO_MEM_ROMD        (1)
+#define IO_MEM_SUBPAGE     (2)
+#define IO_MEM_SUBWIDTH    (4)
+
+/* Flags stored in the low bits of the TLB virtual address.  These are
+   defined so that fast path ram access is all zeros.  */
+/* Zero if TLB entry is valid.  */
+#define TLB_INVALID_MASK   (1 << 3)
+/* Set if TLB entry references a clean RAM page.  The iotlb entry will
+   contain the page physical address.  */
+#define TLB_NOTDIRTY    (1 << 4)
+/* Set if TLB entry is an IO callback.  */
+#define TLB_MMIO        (1 << 5)
-
-typedef void CPUWriteMemoryFunc(void *opaque, target_phys_addr_t addr, uint32_t value);
@@ -1020 +1089 @@
-
-void cpu_register_physical_memory(target_phys_addr_t start_addr,
-unsigned long
-unsigned long
+ram_addr_t
+ram_addr_t
-uint32_t cpu_get_physical_page_desc(target_phys_addr_t addr);
+ram_addr_t qemu_ram_alloc(ram_addr_t);
+void qemu_ram_free(ram_addr_t addr);
-int cpu_register_io_memory(int io_index,
-                           CPUReadMemoryFunc **mem_read,
@@ -1047 +1118 @@
-uint64_t ldq_phys(target_phys_addr_t addr);
-void stl_phys_notdirty(target_phys_addr_t addr, uint32_t val);
+void stq_phys_notdirty(target_phys_addr_t addr, uint64_t val);
-void stb_phys(target_phys_addr_t addr, uint32_t val);
-void stw_phys(target_phys_addr_t addr, uint32_t val);
@@ -1059 +1131 @@
-#define VGA_DIRTY_FLAG  0x01
-#define CODE_DIRTY_FLAG 0x02
+#define KQEMU_DIRTY_FLAG     0x04
+#define MIGRATION_DIRTY_FLAG 0x08
-
-/* read dirty bit (return 0 or 1) */
@@ -1104 +1178 @@
-                                     int dirty_flags);
-void cpu_tlb_update_dirty(CPUState *env);
+
+int cpu_physical_memory_set_dirty_tracking(int enable);
+
+int cpu_physical_memory_get_dirty_tracking(void);
-
-void dump_exec_info(FILE *f,

trunk/src/recompiler_new/cpu-defs.h

@@ -54 +54 @@
-typedef uint32_t target_ulong;
-#define TARGET_FMT_lx "%08x"
+#define TARGET_FMT_ld "%d"
+#define TARGET_FMT_lu "%u"
-#elif TARGET_LONG_SIZE == 8
-typedef int64_t target_long;
-typedef uint64_t target_ulong;
-#define TARGET_FMT_lx "%016" PRIx64
+#define TARGET_FMT_ld "%" PRId64
+#define TARGET_FMT_lu "%" PRIu64
-#else
-#error TARGET_LONG_SIZE undefined
@@ -70 +74 @@
-#if TARGET_PHYS_ADDR_BITS == 32
-typedef uint32_t target_phys_addr_t;
+#define TARGET_FMT_plx "%08x"
-#elif TARGET_PHYS_ADDR_BITS == 64
-typedef uint64_t target_phys_addr_t;
+#define TARGET_FMT_plx "%016" PRIx64
-#else
-#error TARGET_PHYS_ADDR_BITS undefined
-#endif
-
-/* address in the RAM (different from a physical address) */
-typedef unsigned long ram_addr_t;
-
-#define HOST_LONG_SIZE (HOST_LONG_BITS / 8)
@@ -92 +95 @@
-#endif /* VBOX */
-#define MAX_BREAKPOINTS 32
+#define MAX_WATCHPOINTS 32
-
-#define TB_JMP_CACHE_BITS 12
@@ -107 +111 @@
-#define CPU_TLB_SIZE (1 << CPU_TLB_BITS)
-
+#if TARGET_PHYS_ADDR_BITS == 32 && TARGET_LONG_BITS == 32
+#define CPU_TLB_ENTRY_BITS 4
+#else
+#define CPU_TLB_ENTRY_BITS 5
+#endif
+
-typedef struct CPUTLBEntry {
-31 to TARGET_PAGE_BITS : virtual address 
-IO_MEM_SHIFT : if non zero, memory io
-          zone number
+TARGET_LONG_BITS to TARGET_PAGE_BITS : virtual address
+4  : Nonzero for accesses that should not
+go directly to ram.
-       bit 3                      : indicates that the entry is invalid
-       bit 2..0                   : zero
@@ -117 +127 @@
-    target_ulong addr_write; 
-    target_ulong addr_code; 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-} CPUTLBEntry;
+
+#ifdef WORDS_BIGENDIAN
+typedef struct icount_decr_u16 {
+    uint16_t high;
+    uint16_t low;
+} icount_decr_u16;
+#else
+typedef struct icount_decr_u16 {
+    uint16_t low;
+    uint16_t high;
+} icount_decr_u16;
+#endif
+
+
+#define CPU_TEMP_BUF_NLONGS 128
+#ifdef VBOX
+struct TCGContext;
-
-#define CPU_COMMON                                                      \
-    struct TranslationBlock *current_tb; /* currently executing TB  */  \
-    /* soft mmu support */                                              \
-memory
-write helpers, we store some rarely used information in the CPU
+MMIO  
+helpers, we store some rarely used information in the CPU      
-       context) */                                                      \
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    struct TranslationBlock *tb_jmp_cache[TB_JMP_CACHE_SIZE];           \
+    /* buffer for temporaries in the code generator */                  \
+    long temp_buf[CPU_TEMP_BUF_NLONGS];                                 \
+                                                                        \
+    int64_t icount_extra; /* Instructions until next timer event.  */   \
+    /* Number of cycles left, with interrupt flag in high bit.          \
+       This allows a single read-compare-cbranch-write sequence to test \
+       for both decrementer underflow and exceptions.  */               \
+    union {                                                             \
+        uint32_t u32;                                                   \
+        icount_decr_u16 u16;                                            \
+    } icount_decr;                                                      \
+    uint32_t can_do_io; /* nonzero if memory mapped IO is safe.  */     \
-                                                                        \
-    /* from this point: preserved by CPU reset */                       \
@@ -141 +194 @@
-    int singlestep_enabled;                                             \
-                                                                        \
+    struct {                                                            \
+        target_ulong vaddr;                                             \
+        int type; /* PAGE_READ/PAGE_WRITE */                            \
+    } watchpoint[MAX_WATCHPOINTS];                                      \
+    int nb_watchpoints;                                                 \
+    int watchpoint_hit;                                                 \
+                                                                        \
+    /* Core interrupt code */                                           \
+    jmp_buf jmp_env;                                                    \
+    int exception_index;                                                \
+                                                                        \
+    int user_mode_only;                                                 \
+                                                                        \
-    void *next_cpu; /* next CPU sharing TB cache */                     \
-    int cpu_index; /* CPU index (informative) */                        \
+    int running; /* Nonzero if cpu is currently running(usermode).  */  \
-    /* user data */                                                     \
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/recompiler_new/exec-all.h

@@ -67 +67 @@
-#define DISAS_TB_JUMP 3 /* only pc was modified statically */
-
-struct
+typedef struct TranslationBlock
-
-/* XXX: make safe guess about sizes */
-
+
+
+
-#define OPC_BUF_SIZE 512
-#define OPC_MAX_SIZE (OPC_BUF_SIZE - MAX_OP_PER_INSTR)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-extern target_ulong gen_opc_pc[OPC_BUF_SIZE];
-extern target_ulong gen_opc_npc[OPC_BUF_SIZE];
-extern uint8_t gen_opc_cc_op[OPC_BUF_SIZE];
-extern uint8_t gen_opc_instr_start[OPC_BUF_SIZE];
+extern uint16_t gen_opc_icount[OPC_BUF_SIZE];
-extern target_ulong gen_opc_jump_pc[2];
-extern uint32_t gen_opc_hflags[OPC_BUF_SIZE];
@@ -92 +97 @@
-typedef void (GenOpFunc3)(long, long, long);
-
-
-
-
-
-
-
+
-extern FILE *logfile;
-extern int loglevel;
-
-
-
-
+
+
+
+
+
+
+
+
+
-int cpu_gen_code(CPUState *env, struct TranslationBlock *tb,
-max_code_size, int 
+
-int cpu_restore_state(struct TranslationBlock *tb,
-                      CPUState *env, unsigned long searched_pc,
-                      void *puc);
-int cpu_gen_code_copy(CPUState *env, struct TranslationBlock *tb,
-                      int max_code_size, int *gen_code_size_ptr);
-int cpu_restore_state_copy(struct TranslationBlock *tb,
-                           CPUState *env, unsigned long searched_pc,
-                           void *puc);
-void cpu_resume_from_signal(CPUState *env1, void *puc);
+void cpu_io_recompile(CPUState *env, void *retaddr);
+TranslationBlock *tb_gen_code(CPUState *env, 
+                              target_ulong pc, target_ulong cs_base, int flags,
+                              int cflags);
-void cpu_exec_init(CPUState *env);
-int page_unprotect(target_ulong address, unsigned long pc, void *puc);
-ulong start, target_ulong
+phys_addr_t start, target_phys_addr_t
-                                   int is_cpu_write_access);
-void tb_invalidate_page_range(target_ulong start, target_ulong end);
@@ -124 +131 @@
-int tlb_set_page_exec(CPUState *env, target_ulong vaddr,
-                      target_phys_addr_t paddr, int prot,
-is_user
-
+mmu_idx
+1
-                               target_phys_addr_t paddr, int prot,
-is_user
+mmu_idx
-{
-    if (prot & PAGE_READ)
-        prot |= PAGE_EXEC;
-
-
-
-
+
+
+
-#define CODE_GEN_ALIGN           16 /* must be >= of the size of a icache line */
-
@@ -140 +146 @@
-#define CODE_GEN_PHYS_HASH_SIZE     (1 << CODE_GEN_PHYS_HASH_BITS)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/* estimated block size for TB allocation */
@@ -174 +157 @@
-#endif
-
-
-
-
+
-#define USE_DIRECT_JUMP
-#endif
@@ -182 +163 @@
-#define USE_DIRECT_JUMP
-#endif
+
-#ifdef VBOX /* bird: not safe in next step because of threading & cpu_interrupt. */
-#undef USE_DIRECT_JUMP
-#endif /* VBOX */
-
-typedef 
+
-    target_ulong pc;   /* simulated PC corresponding to this block (EIP + CS base) */
-    target_ulong cs_base; /* CS base for this block */
@@ -193 +175 @@
-                           size <= TARGET_PAGE_SIZE) */
-    uint16_t cflags;    /* compile flags */
-
-
-
-
+
+
+
-#ifdef VBOX
-#define CF_RAW_MODE    0x0010 /* block was generated in raw mode */
@@ -226 +207 @@
-    struct TranslationBlock *jmp_next[2];
-    struct TranslationBlock *jmp_first;
-
+
+
-
-static inline unsigned int tb_jmp_cache_hash_page(target_ulong pc)
@@ -249 +231 @@
-
-TranslationBlock *tb_alloc(target_ulong pc);
+void tb_free(TranslationBlock *tb);
-void tb_flush(CPUState *env);
-void tb_link_phys(TranslationBlock *tb,
-                  target_ulong phys_pc, target_ulong phys_page2);
+void tb_phys_invalidate(TranslationBlock *tb, target_ulong page_addr);
-
-extern TranslationBlock *tb_phys_hash[CODE_GEN_PHYS_HASH_SIZE];
-
-extern uint8_t code_gen_buffer[CODE_GEN_BUFFER_SIZE];
-extern uint8_t *code_gen_ptr;
+extern int code_gen_max_blocks;
-
-#if defined(USE_DIRECT_JUMP)
@@ -342 +326 @@
-#define ASM_OP_LABEL_NAME(n, opname) \
-    ASM_NAME(__op_label) #n "." ASM_NAME(opname)
-
-#if defined(__powerpc__)
-
-/* we patch the jump instruction directly */
-#define GOTO_TB(opname, tbparam, n)\
-do {\
-    asm volatile (ASM_DATA_SECTION\
-                  ASM_OP_LABEL_NAME(n, opname) ":\n"\
-                  ".long 1f\n"\
-                  ASM_PREVIOUS_SECTION \
-                  "b " ASM_NAME(__op_jmp) #n "\n"\
-                  "1:\n");\
-} while (0)
-
-#elif defined(__i386__) && defined(USE_DIRECT_JUMP)
-
-/* we patch the jump instruction directly */
-#define GOTO_TB(opname, tbparam, n)\
-do {\
-    asm volatile (".section .data\n"\
-                  ASM_OP_LABEL_NAME(n, opname) ":\n"\
-                  ".long 1f\n"\
-                  ASM_PREVIOUS_SECTION \
-                  "jmp " ASM_NAME(__op_jmp) #n "\n"\
-                  "1:\n");\
-} while (0)
-
-#else
-
-/* jump to next block operations (more portable code, does not need
-   cache flushing, but slower because of indirect jump) */
-# ifdef VBOX /* bird: GCC4 (and Ming 3.4.x?) will remove the two unused static
-                variables. I've added a dummy __asm__ statement which reference
-                the two variables to prevent this. */
-#  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)\
-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 *)(((TranslationBlock *)tbparam)->tb_next[n]);\
-label ## n: ;\
-dummy_label ## n: ;\
-} while (0)
-# endif /* !VBOX */
-
-#endif
-
-extern CPUWriteMemoryFunc *io_mem_write[IO_MEM_NB_ENTRIES][4];
@@ -583 +498 @@
-              void *retaddr);