Changeset 41675 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jun 12, 2012 8:27:37 PM (13 years ago)

Author:

vboxsync

Message:

DIS: The start of the scoping exercise... Fixed PREFIX_ADDRSIZE that I just busted in the previous commit.

Location:

trunk/src/VBox/Runtime/testcase

Files:

• tstLdr-2.cpp (modified) (1 diff)
• tstLdr-3.cpp (modified) (1 diff)
• tstLdrDisasmTest.cpp (modified) (2 diffs)
• tstLdrObj.cpp (modified) (1 diff)
• tstLdrObjR0.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/testcase/tstLdr-2.cpp

@@ -47 +47 @@
         char        szOutput[256];
         uint32_t    cbInstr;
-        if (RT_FAILURE(DISInstrToStr(pbCodeBlock + i, CPUMODE_32BIT, &Cpu, &cbInstr, szOutput, sizeof(szOutput))))
+        if (RT_FAILURE(DISInstrToStr(pbCodeBlock + i, DISCPUMODE_32BIT, &Cpu, &cbInstr, szOutput, sizeof(szOutput))))
             return false;
 

trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp

@@ -247 +247 @@
         memset(&Cpu, 0, sizeof(Cpu));
 #ifdef RT_ARCH_X86 /** @todo select according to the module type. */
-        Cpu.mode = CPUMODE_32BIT;
+        Cpu.mode = DISCPUMODE_32BIT;
 #else
-        Cpu.mode = CPUMODE_64BIT;
+        Cpu.mode = DISCPUMODE_64BIT;
 #endif
         uint8_t *pbCode = (uint8_t *)g_pvBits + (NearSym.aSyms[0].Value - g_uLoadAddr);

trunk/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp

@@ -105 +105 @@
 {
     uint32_t cb;
-    int rc = DISInstrWithReader(CodeIndex, CPUMODE_32BIT, DisasmTest1ReadCode, 0, pCpu, &cb);
+    int rc = DISInstrWithReader(CodeIndex, DISCPUMODE_32BIT, DisasmTest1ReadCode, 0, pCpu, &cb);
     *pcb = cb;
     MY_PRINTF(("DISCoreOneEx -> rc=%d cb=%d  Cpu: opcode=%#x pCurInstr=%p (42=%d)\n", \
@@ -122 +122 @@
 
     memset(&Cpu, 0, sizeof(Cpu));
-    Cpu.mode = CPUMODE_32BIT;
+    Cpu.mode = DISCPUMODE_32BIT;
 
 #define DISAS_AND_CHECK(cbInstr, enmOp) \

trunk/src/VBox/Runtime/testcase/tstLdrObj.cpp

@@ -98 +98 @@
     static unsigned cb;
     DISCPUSTATE Cpu;
-    DISInstr((void *)(uintptr_t)SomeExportFunction3, CPUMODE_32BIT, &Cpu, &cb);
+    DISInstr((void *)(uintptr_t)SomeExportFunction3, DISCPUMODE_32BIT, &Cpu, &cb);
     return (void *)(uintptr_t)&SomeExportFunction1;
 }

trunk/src/VBox/Runtime/testcase/tstLdrObjR0.cpp

@@ -96 +96 @@
 
     memset(&Cpu, 0, sizeof(Cpu));
-    Cpu.mode = CPUMODE_32BIT;
+    Cpu.mode = DISCPUMODE_32BIT;
 
-    DISInstr((void *)(uintptr_t)SomeExportFunction3, CPUMODE_32BIT, &Cpu, &cb);
+    DISInstr((void *)(uintptr_t)SomeExportFunction3, DISCPUMODE_32BIT, &Cpu, &cb);
     return (void *)(uintptr_t)&SomeExportFunction1;
 }