Changeset 15920 in vbox for trunk/src/recompiler_new

Timestamp:

Jan 13, 2009 4:38:55 PM (16 years ago)

Author:

vboxsync

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

41545

Message:

REM: logging changes, cleanup

Location:

trunk/src/recompiler_new

Files:

• VBoxRecompiler.c (modified) (7 diffs)
• target-i386/translate-copy.c (deleted)
• translate-all.c (modified) (1 diff)

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -3675 +3675 @@
  * @param   cb              Size of the code block.
  */
-void disas(FILE *phFileIgnored, void *pvCode, unsigned long cb)
-{
+void disas(FILE *phFile, void *pvCode, unsigned long cb)
+{
+#ifdef DEBUG_ALL_LOGGING
+#define DISAS_PRINTF(x...) fprintf(phFile, x)
+#else
+#define DISAS_PRINTF(x...) RTLogPrintf(x)
     if (LogIs2Enabled())
+#endif
     {
         unsigned        off = 0;
@@ -3690 +3695 @@
 #endif
 
-        RTLogPrintf("Recompiled Code: %p %#lx (%ld) bytes\n", pvCode, cb, cb);
+        DISAS_PRINTF("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)))
-                RTLogPrintf("%s", szOutput);
+                DISAS_PRINTF("%s", szOutput);
             else
             {
-                RTLogPrintf("disas error\n");
+                DISAS_PRINTF("disas error\n");
                 cbInstr = 1;
 #ifdef RT_ARCH_AMD64 /** @todo remove when DISInstr starts supporing 64-bit code. */
@@ -3707 +3712 @@
         }
     }
-    NOREF(phFileIgnored);
+
+#undef  DISAS_PRINTF
 }
 
@@ -3719 +3725 @@
  * @param   fFlags          Flags, probably something which tells if this is 16, 32 or 64 bit code.
  */
-void target_disas(FILE *phFileIgnored, target_ulong uCode, target_ulong cb, int fFlags)
-{
+void target_disas(FILE *phFile, target_ulong uCode, target_ulong cb, int fFlags)
+{
+#ifdef DEBUG_ALL_LOGGING
+#define DISAS_PRINTF(x...) fprintf(phFile, x)
+#else
+#define DISAS_PRINTF(x...) RTLogPrintf(x)
     if (LogIs2Enabled())
+#endif
     {
         PVM pVM = cpu_single_env->pVM;
@@ -3735 +3746 @@
          * Do the disassembling.
          */
-        RTLogPrintf("Guest Code: PC=%RGp %RGp bytes fFlags=%d\n", uCode, cb, fFlags);
+        DISAS_PRINTF("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;
@@ -3749 +3760 @@
                                         &cbInstr);
             if (RT_SUCCESS(rc))
-                RTLogPrintf("%RGp %s\n", uCode, szBuf);
+                DISAS_PRINTF("%llx %s\n", (uint64_t)uCode, szBuf);
             else
             {
-                RTLogPrintf("%RGp %04x:%RGp: %s\n", uCode, cs, eip, szBuf);
+                DISAS_PRINTF("%llx %04x:%llx: %s\n", (uint64_t)uCode, cs, (uint64_t)eip, szBuf);
                 cbInstr = 1;
             }
@@ -3764 +3775 @@
         }
     }
-    NOREF(phFileIgnored);
+#undef DISAS_PRINTF
 }
 

trunk/src/recompiler_new/translate-all.c

@@ -182 +182 @@
     tcg_func_start(s);
 
-#ifdef VBOX
     gen_intermediate_code_pc(env, tb);
-#else
-    gen_intermediate_code_pc(env, tb);
-#endif
 
     if (use_icount) {