Changeset 37675 in vbox for trunk/src/recompiler/VBoxRecompiler.c

Timestamp:

Jun 29, 2011 7:07:14 AM (13 years ago)

Author:

vboxsync

Message:

rem: Synced with v0.12.5.

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (15 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -310 +310 @@
     CPUMGetGuestCpuId(pVCpu, 0x80000001, &u32Dummy, &u32Dummy, &pVM->rem.s.Env.cpuid_ext3_features, &pVM->rem.s.Env.cpuid_ext2_features);
 
+    cpu_reset(&pVM->rem.s.Env);
+
     /* allocate code buffer for single instruction emulation. */
     pVM->rem.s.Env.cbCodeBuffer = 4096;
@@ -315 +317 @@
     AssertMsgReturn(pVM->rem.s.Env.pvCodeBuffer, ("Failed to allocate code buffer!\n"), VERR_NO_MEMORY);
 
-    /* finally, set the cpu_single_env global. */
+    /* Finally, set the cpu_single_env global. */
     cpu_single_env = &pVM->rem.s.Env;
 
@@ -416 +418 @@
 #ifdef DEBUG_ALL_LOGGING
     loglevel = ~0;
-# ifdef DEBUG_TMP_LOGGING
-    logfile = fopen("/tmp/vbox-qemu.log", "w");
-# endif
-#endif
+#endif
+//loglevel = CPU_LOG_EXEC | CPU_LOG_INT | CPU_LOG_PCALL | CPU_LOG_TB_CPU; /// DONT COMMIT ME
 
     /*
@@ -999 +999 @@
                     CPUBreakpoint  *pBP;
                     RTGCPTR         GCPtrPC = pVM->rem.s.Env.eip + pVM->rem.s.Env.segs[R_CS].base;
-                    TAILQ_FOREACH(pBP, &pVM->rem.s.Env.breakpoints, entry)
+                    QTAILQ_FOREACH(pBP, &pVM->rem.s.Env.breakpoints, entry)
                         if (pBP->pc == GCPtrPC)
                             break;
@@ -1182 +1182 @@
                     CPUBreakpoint  *pBP;
                     RTGCPTR         GCPtrPC = pVM->rem.s.Env.eip + pVM->rem.s.Env.segs[R_CS].base;
-                    TAILQ_FOREACH(pBP, &pVM->rem.s.Env.breakpoints, entry)
+                    QTAILQ_FOREACH(pBP, &pVM->rem.s.Env.breakpoints, entry)
                         if (pBP->pc == GCPtrPC)
                             break;
@@ -1340 +1340 @@
                 CPUBreakpoint  *pBP;
                 RTGCPTR         GCPtrPC = pVM->rem.s.Env.eip + pVM->rem.s.Env.segs[R_CS].base;
-                TAILQ_FOREACH(pBP, &pVM->rem.s.Env.breakpoints, entry)
+                QTAILQ_FOREACH(pBP, &pVM->rem.s.Env.breakpoints, entry)
                     if (pBP->pc == GCPtrPC)
                         break;
@@ -1531 +1531 @@
     }
 
-    if (!TAILQ_EMPTY(&env->breakpoints))
+    if (!QTAILQ_EMPTY(&env->breakpoints))
     {
         //Log2(("raw mode refused: Breakpoints\n"));
@@ -1537 +1537 @@
     }
 
-    if (!TAILQ_EMPTY(&env->watchpoints))
+    if (!QTAILQ_EMPTY(&env->watchpoints))
     {
         //Log2(("raw mode refused: Watchpoints\n"));
@@ -4002 +4002 @@
 void disas(FILE *phFile, void *pvCode, unsigned long cb)
 {
-#ifdef DEBUG_TMP_LOGGING
-# define DISAS_PRINTF(x...) fprintf(phFile, x)
-#else
-# define DISAS_PRINTF(x...) RTLogPrintf(x)
     if (LogIs2Enabled())
-#endif
     {
         unsigned        off = 0;
@@ -4020 +4015 @@
 #endif
 
-        DISAS_PRINTF("Recompiled Code: %p %#lx (%ld) bytes\n", pvCode, cb, cb);
+        RTLogPrintf("Recompiled Code: %p %#lx (%ld) bytes\n", pvCode, cb, cb);
         while (off < cb)
         {
             uint32_t cbInstr;
             if (RT_SUCCESS(DISInstr(&Cpu, (uintptr_t)pvCode + off, 0, &cbInstr, szOutput)))
-                DISAS_PRINTF("%s", szOutput);
+                RTLogPrintf("%s", szOutput);
             else
             {
-                DISAS_PRINTF("disas error\n");
+                RTLogPrintf("disas error\n");
                 cbInstr = 1;
 #ifdef RT_ARCH_AMD64 /** @todo remove when DISInstr starts supporting 64-bit code. */
@@ -4037 +4032 @@
         }
     }
-
-#undef  DISAS_PRINTF
 }
 
@@ -4052 +4045 @@
 void target_disas(FILE *phFile, target_ulong uCode, target_ulong cb, int fFlags)
 {
-#ifdef DEBUG_TMP_LOGGING
-# define DISAS_PRINTF(x...) fprintf(phFile, x)
-#else
-# define DISAS_PRINTF(x...) RTLogPrintf(x)
     if (LogIs2Enabled())
-#endif
     {
         PVM         pVM = cpu_single_env->pVM;
@@ -4074 +4062 @@
          * Do the disassembling.
          */
-        DISAS_PRINTF("Guest Code: PC=%llx %llx bytes fFlags=%d\n", (uint64_t)uCode, (uint64_t)cb, fFlags);
+        RTLogPrintf("Guest Code: PC=%llx %llx bytes fFlags=%d\n", (uint64_t)uCode, (uint64_t)cb, fFlags);
         cs = cpu_single_env->segs[R_CS].selector;
         eip = uCode - cpu_single_env->segs[R_CS].base;
@@ -4089 +4077 @@
                                         &cbInstr);
             if (RT_SUCCESS(rc))
-                DISAS_PRINTF("%llx %s\n", (uint64_t)uCode, szBuf);
+                RTLogPrintf("%llx %s\n", (uint64_t)uCode, szBuf);
             else
             {
-                DISAS_PRINTF("%llx %04x:%llx: %s\n", (uint64_t)uCode, cs, (uint64_t)eip, szBuf);
+                RTLogPrintf("%llx %04x:%llx: %s\n", (uint64_t)uCode, cs, (uint64_t)eip, szBuf);
                 cbInstr = 1;
             }
@@ -4104 +4092 @@
         }
     }
-#undef DISAS_PRINTF
 }