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

Timestamp:

Jun 12, 2012 3:22:43 PM (13 years ago)

Author:

vboxsync

Message:

DISInstr* -> DISInstrToStr + cbOutput argument.

File:

• trunk/src/VBox/Runtime/testcase/tstLdr-2.cpp (modified) (4 diffs)

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

@@ -39 +39 @@
 
 
-bool MyDisBlock(PDISCPUSTATE pCpu, RTHCUINTPTR pvCodeBlock, int32_t cbMax, RTUINTPTR off)
+bool MyDisBlock(uint8_t const *pbCodeBlock, int32_t cbMax)
 {
+    DISCPUSTATE Cpu;
     int32_t i = 0;
     while (i < cbMax)
@@ -46 +47 @@
         char        szOutput[256];
         uint32_t    cbInstr;
-        if (RT_FAILURE(DISInstrWithOff(pCpu, pvCodeBlock + i, off, &cbInstr, szOutput)))
+        if (RT_FAILURE(DISInstrToStr(pbCodeBlock + i, CPUMODE_32BIT, &Cpu, &cbInstr, szOutput, sizeof(szOutput))))
             return false;
 
@@ -118 +119 @@
                     if (off < cb)
                     {
-                        DISCPUSTATE Cpu;
-
-                        memset(&Cpu, 0, sizeof(Cpu));
-                        Cpu.mode = CPUMODE_32BIT;
-                        if (MyDisBlock(&Cpu, (uintptr_t)pvBits + off, 200, Addr - (uintptr_t)pvBits))
+                        if (MyDisBlock((uint8_t *)pvBits + off, Addr - (uintptr_t)pvBits))
                         {
                             RTUINTPTR Addr2 = 0xd0000000;
@@ -128 +125 @@
                             if (RT_SUCCESS(rc))
                             {
-                                if (MyDisBlock(&Cpu, (uintptr_t)pvBits + off, 200, Addr2 - (uintptr_t)pvBits))
+                                if (MyDisBlock((uint8_t *)pvBits + off, Addr2 - (uintptr_t)pvBits))
                                     rcRet = 0;
                                 else