Changeset 99221 in vbox for trunk/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp

Timestamp:

Mar 30, 2023 12:48:09 PM (23 months ago)

Author:

vboxsync

Message:

Disassember,*: Start separating the disassembler into a architecture specific and common part, bugref:10394 [build fixes]

File:

• trunk/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp (modified) (3 diffs)

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

@@ -46 +46 @@
 *********************************************************************************************************************************/
 #include <VBox/dis.h>
-#include <VBox/disopcode.h>
 #include <VBox/sup.h>
 #include <iprt/string.h>
@@ -98 +97 @@
     if (cb + pDis->uInstrAddr + offInstr > sizeof(g_ab32BitCode))
         cb = cbMinRead;
-    memcpy(&pDis->abInstr[offInstr], &g_ab32BitCode[pDis->uInstrAddr + offInstr], cb);
+    memcpy(&pDis->u.abInstr[offInstr], &g_ab32BitCode[pDis->uInstrAddr + offInstr], cb);
     pDis->cbCachedInstr = offInstr + (uint8_t)cb;
     return VINF_SUCCESS;
@@ -113 +112 @@
     *pcb = cb;
     MY_PRINTF(("DISCoreOneEx -> rc=%d cb=%d  Cpu: bOpCode=%#x pCurInstr=%p (42=%d)\n", \
-               rc, cb, pDis->bOpCode, pDis->pCurInstr, 42)); \
+               rc, cb, pDis->arch.x86.bOpCode, pDis->pCurInstr, 42)); \
     return rc;
 }