Changeset 37689 in vbox for trunk/src/recompiler/translate-all.c

Timestamp:

Jun 29, 2011 4:01:23 PM (14 years ago)

Author:

vboxsync

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

72549

Message:

recompiler: Merged in changes from 0.13.0.

File:

• trunk/src/recompiler/translate-all.c (modified) (3 diffs)

trunk/src/recompiler/translate-all.c

@@ -40 +40 @@
 #include "disas.h"
 #include "tcg.h"
+#include "qemu-timer.h"
 
 /* code generation context */
@@ -50 +51 @@
 uint16_t gen_opc_icount[OPC_BUF_SIZE];
 uint8_t gen_opc_instr_start[OPC_BUF_SIZE];
-#if defined(TARGET_I386)
-uint8_t gen_opc_cc_op[OPC_BUF_SIZE];
-#elif defined(TARGET_SPARC)
-target_ulong gen_opc_npc[OPC_BUF_SIZE];
-target_ulong gen_opc_jump_pc[2];
-#elif defined(TARGET_MIPS) || defined(TARGET_SH4)
-uint32_t gen_opc_hflags[OPC_BUF_SIZE];
-#endif
-
-/* XXX: suppress that */
-unsigned long code_gen_max_block_size(void)
-{
-#ifdef VBOX
-    /* Just to suppress a lot of dummy warnings */
-    static long max;
-#else
-    static unsigned long max;
-#endif
-
-    if (max == 0) {
-        max = TCG_MAX_OP_SIZE;
-#define DEF(s, n, copy_size) max = copy_size > max? copy_size : max;
-#include "tcg-opc.h"
-#undef DEF
-        max *= OPC_MAX_SIZE;
-    }
-
-    return max;
-}
 
 void cpu_gen_init(void)
@@ -124 +96 @@
     s->tb_jmp_offset = tb->tb_jmp_offset;
     s->tb_next = NULL;
-    /* the following two entries are optional (only used for string ops) */
-    /* XXX: not used ? */
-    tb->tb_jmp_offset[2] = 0xffff;
-    tb->tb_jmp_offset[3] = 0xffff;
 #else
     s->tb_jmp_offset = NULL;