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

Timestamp:

Mar 3, 2011 1:48:16 PM (14 years ago)

Author:

vboxsync

Message:

rem: Re-synced to ​svn://svn.savannah.nongnu.org/qemu/trunk@5495 (repo UUID c046a42c-6fe2-441c-8c8c-71466251a162).

File:

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

trunk/src/recompiler/translate-all.c

@@ -32 +32 @@
 #include <stdio.h>
 #include <string.h>
+#include <inttypes.h>
 
 #include "config.h"
@@ -55 +56 @@
 target_ulong gen_opc_npc[OPC_BUF_SIZE];
 target_ulong gen_opc_jump_pc[2];
-#elif defined(TARGET_MIPS)
+#elif defined(TARGET_MIPS) || defined(TARGET_SH4)
 uint32_t gen_opc_hflags[OPC_BUF_SIZE];
 #endif
@@ -71 +72 @@
     if (max == 0) {
         max = TCG_MAX_OP_SIZE;
-#define DEF(s, n, copy_size) max = (copy_size > max) ? copy_size : max;
+#define DEF(s, n, copy_size) max = copy_size > max? copy_size : max;
 #include "tcg-opc.h"
 #undef DEF
@@ -80 +81 @@
 }
 
-void cpu_gen_init()
+void cpu_gen_init(void)
 {
     tcg_context_init(&tcg_ctx);
@@ -93 +94 @@
    code).
 */
-int cpu_gen_code(CPUState *env, TranslationBlock *tb,
-                 int *gen_code_size_ptr)
+int cpu_gen_code(CPUState *env, TranslationBlock *tb, int *gen_code_size_ptr)
 {
     TCGContext *s = &tcg_ctx;
@@ -111 +111 @@
 #ifdef VBOX
     RAWEx_ProfileStart(env, STATS_QEMU_COMPILATION);
+#endif
+
     tcg_func_start(s);
 
     gen_intermediate_code(env, tb);
-#else /* !VBOX */
-    tcg_func_start(s);
-
-    gen_intermediate_code(env, tb);
-#endif /* !VBOX */
 
     /* generate machine code */
@@ -129 +126 @@
     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;
@@ -141 +139 @@
     s->code_time -= profile_getclock();
 #endif
-
     gen_code_size = dyngen_code(s, gen_code_buf);
     *gen_code_size_ptr = gen_code_size;