Changeset 41658 in vbox for trunk/src/recompiler

Timestamp:

Jun 11, 2012 10:21:44 PM (13 years ago)

Author:

vboxsync

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

78464

Message:

DIS,VMM,REM,IPRT: Disassembler API adjustments.

Location:

trunk/src/recompiler

Files:

• VBoxREMWrapper.cpp (modified) (1 diff)
• VBoxRecompiler.c (modified) (2 diffs)

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -654 +654 @@
 static const REMPARMDESC g_aArgsDISInstr[] =
 {
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM),                NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(RTUINTPTR),          NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t),           NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(DISCPUMODE),         NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PDISCPUSTATE),       NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t *),         NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(char *),             NULL }

trunk/src/recompiler/VBoxRecompiler.c

@@ -4071 +4071 @@
         char            szOutput[256];
         DISCPUSTATE     Cpu;
-
-        memset(&Cpu, 0, sizeof(Cpu));
 #ifdef RT_ARCH_X86
-        Cpu.mode = CPUMODE_32BIT;
+        DISCPUMODE      enmCpuMode = CPUMODE_32BIT;
 #else
-        Cpu.mode = CPUMODE_64BIT;
+        DISCPUMODE      enmCpuMode = CPUMODE_64BIT;
 #endif
 
@@ -4083 +4081 @@
         {
             uint32_t cbInstr;
-            if (RT_SUCCESS(DISInstr(&Cpu, (uintptr_t)pvCode + off, 0, &cbInstr, szOutput)))
+            int rc = DISInstr((uintptr_t)pvCode + off, enmCpuMode, &Cpu, &cbInstr, szOutput);
+            if (RT_SUCCESS(rc))
                 RTLogPrintf("%s", szOutput);
             else
             {
-                RTLogPrintf("disas error\n");
+                RTLogPrintf("disas error %Rrc\n", rc);
                 cbInstr = 1;
-#ifdef RT_ARCH_AMD64 /** @todo remove when DISInstr starts supporting 64-bit code. */
-                break;
-#endif
             }
             off += cbInstr;