vbox的更動 37675 路徑 trunk/src/recompiler/tcg/tcg.c

時間撮記:

2011-6-29 上午07:07:14 (14 年 以前)

作者:

vboxsync

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

72535

訊息:

rem: Synced with v0.12.5.

檔案:

• trunk/src/recompiler/tcg/tcg.c (修改) (10 筆差異)

trunk/src/recompiler/tcg/tcg.c

@@ -28 +28 @@
 #include "config.h"
 
-#ifndef DEBUG_TCG
+#ifndef CONFIG_DEBUG_TCG
 /* define it to suppress various consistency checks (faster) */
 #define NDEBUG
@@ -52 +52 @@
 #include "qemu-common.h"
 #include "cache-utils.h"
+#include "host-utils.h"
 
 /* Note: the long term plan is to reduce the dependancies on the QEMU
@@ -63 +64 @@
 #include "elf.h"
 
+#if defined(CONFIG_USE_GUEST_BASE) && !defined(TCG_TARGET_HAS_GUEST_BASE)
+#error GUEST_BASE not supported on this host.
+#endif
 
 #ifdef VBOX
@@ -74 +78 @@
 #  undef USE_LIVENESS_ANALYSIS
 # endif
+///* With 0.12.5 the liveness analysis does not work well even when targeting
+//   32-bit guest cpus.  Just disable it wholesale to be on the safe side.  */
+//#undef USE_LIVENESS_ANALYSIS
 #endif /* VBOX */
 
@@ -82 +89 @@
 #define DEF(s, n, copy_size) { #s, 0, 0, n, n, 0, copy_size },
 #ifndef VBOX
-#define DEF2(s, iargs, oargs, cargs, flags) { #s, iargs, oargs, cargs, iargs + oargs + cargs, flags, 0 },
+#define DEF2(s, oargs, iargs, cargs, flags) { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags, 0 },
 #else  /* VBOX */
-# define DEF2(s, iargs, oargs, cargs, flags) { #s, iargs, oargs, cargs, iargs + oargs + cargs, flags, 0, 0, 0 },
+# define DEF2(s, oargs, iargs, cargs, flags) { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags, 0, 0, 0 },
 #endif /* VBOX */
 #include "tcg-opc.h"
@@ -1117 +1124 @@
     nb_ops = gen_opc_ptr - gen_opc_buf;
 
-    /* XXX: make it really dynamic */
-    s->op_dead_iargs = tcg_malloc(OPC_BUF_SIZE * sizeof(uint16_t));
+    s->op_dead_iargs = tcg_malloc(nb_ops * sizeof(uint16_t));
 
     dead_temps = tcg_malloc(s->nb_temps);
@@ -1901 +1907 @@
 static int64_t tcg_table_op_count[NB_OPS];
 
-void dump_op_count(void)
+static void dump_op_count(void)
 {
     int i;
@@ -1939 +1945 @@
 
 #ifdef DEBUG_DISAS
+# ifdef USE_LIVENESS_ANALYSIS /* vbox */
     if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_OPT))) {
-        qemu_log("OP after la:\n");
+        qemu_log("OP after liveness analysis:\n");
         tcg_dump_ops(s, logfile);
         qemu_log("\n");
     }
+# endif /* USE_LIVENESS_ANALYSIS - vbox */
 #endif
 
@@ -1981 +1989 @@
         case INDEX_op_debug_insn_start:
             /* debug instruction */
+//#ifdef VBOX /* HACK ALERT: GROSS HACK to work around registister allocation bugs in v0.12.5 */
+//            save_globals(s, s->reserved_regs);
+//#endif
             break;
         case INDEX_op_nop:
@@ -2109 +2120 @@
     cpu_fprintf(f, "  avg cycles        %0.1f\n",
                 s->restore_count ? (double)s->restore_time / s->restore_count : 0);
-    {
-        extern void dump_op_count(void);
-        dump_op_count();
-    }
+
+    dump_op_count();
 }
 #else