diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2023-03-30 12:48:09 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2023-03-30 12:48:09 +0000 |
| commit | 68d7b5a1b2bd1b444ebbb2b18287c14510dfe240 (patch) | |
| tree | 0b15be2f19729e9c44ad4fae7f889de67c1f7730 /src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp | |
| parent | 04526c7106504aec35c28e2fe6d258547fa343db (diff) | |
| download | VirtualBox-svn-68d7b5a1b2bd1b444ebbb2b18287c14510dfe240.tar.gz | |
Disassember,*: Start separating the disassembler into a architecture specific and common part, bugref:10394 [build fixes]
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@99221 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp')
| -rw-r--r-- | src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp b/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp index 0226accea72..3bc86dc7309 100644 --- a/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp +++ b/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp @@ -45,7 +45,6 @@ * Header Files * *********************************************************************************************************************************/ #include <VBox/dis.h> -#include <VBox/disopcode.h> #include <VBox/sup.h> #include <iprt/string.h> @@ -97,7 +96,7 @@ static DECLCALLBACK(int) DisasmTest1ReadCode(PDISSTATE pDis, uint8_t offInstr, u size_t cb = cbMaxRead; 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; } @@ -112,7 +111,7 @@ inline int MyDisasm(uintptr_t CodeIndex, PDISSTATE pDis, uint32_t *pcb) int rc = DISInstrWithReader(CodeIndex, DISCPUMODE_32BIT, DisasmTest1ReadCode, 0, pDis, &cb); *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; } |