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

Timestamp:

Mar 29, 2023 2:13:56 PM (2 years ago)

Author:

vboxsync

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

156581

Message:

Disassembler,VMM,Runtime: Get rid of deprecated DISCPUSTATE types (preparation for architecture specific separation in order to support ARMv8), bugref:10394

File:

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

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

@@ -93 +93 @@
  * @callback_method_impl{FNDISREADBYTES}
  */
-static DECLCALLBACK(int) DisasmTest1ReadCode(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
+static DECLCALLBACK(int) DisasmTest1ReadCode(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
 {
     size_t cb = cbMaxRead;
@@ -107 +107 @@
  * Use an inline function here just to test '__textcoal_nt' sections on darwin.
  */
-inline int MyDisasm(uintptr_t CodeIndex, PDISCPUSTATE pCpu, uint32_t *pcb)
+inline int MyDisasm(uintptr_t CodeIndex, PDISSTATE pDis, uint32_t *pcb)
 {
     uint32_t cb;
-    int rc = DISInstrWithReader(CodeIndex, DISCPUMODE_32BIT, DisasmTest1ReadCode, 0, pCpu, &cb);
+    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, pCpu->bOpCode, pCpu->pCurInstr, 42)); \
+               rc, cb, pDis->bOpCode, pDis->pCurInstr, 42)); \
     return rc;
 }
@@ -120 +120 @@
 extern "C" DECLEXPORT(int) DisasmTest1(void)
 {
-    DISCPUSTATE Cpu;
+    DISSTATE  Dis;
     uintptr_t CodeIndex = 0;
     uint32_t cb;
@@ -140 +140 @@
 #endif
 
-    memset(&Cpu, 0, sizeof(Cpu));
+    memset(&Dis, 0, sizeof(Dis));
 
 #define DISAS_AND_CHECK(cbInstr, enmOp) \
         do { \
-            rc = MyDisasm(CodeIndex, &Cpu, &cb); \
+            rc = MyDisasm(CodeIndex, &Dis, &cb); \
             if (RT_FAILURE(rc)) \
                 return CodeIndex | 0xf000; \
-            if (Cpu.pCurInstr->uOpcode != (enmOp)) \
+            if (Dis.pCurInstr->uOpcode != (enmOp)) \
                 return CodeIndex| 0xe000; \
             if (cb != (cbInstr)) \