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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Runtime/testcase

Files:

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

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

@@ -51 +51 @@
 bool MyDisBlock(uint8_t const *pbCodeBlock, int32_t cbMax)
 {
-    DISCPUSTATE Cpu;
+    DISSTATE Dis;
     int32_t i = 0;
     while (i < cbMax)
@@ -57 +57 @@
         char        szOutput[256];
         uint32_t    cbInstr;
-        if (RT_FAILURE(DISInstrToStr(pbCodeBlock + i, DISCPUMODE_32BIT, &Cpu, &cbInstr, szOutput, sizeof(szOutput))))
+        if (RT_FAILURE(DISInstrToStr(pbCodeBlock + i, DISCPUMODE_32BIT, &Dis, &cbInstr, szOutput, sizeof(szOutput))))
             return false;
 

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

@@ -137 +137 @@
 }
 
-static DECLCALLBACK(int) MyGetSymbol(PCDISCPUSTATE pCpu, uint32_t u32Sel, RTUINTPTR uAddress,
+static DECLCALLBACK(int) MyGetSymbol(PCDISSTATE pDis, uint32_t u32Sel, RTUINTPTR uAddress,
                                      char *pszBuf, size_t cchBuf, RTINTPTR *poff,
                                      void *pvUser)
 {
-    RT_NOREF3(pCpu, u32Sel, pvUser);
+    RT_NOREF3(pDis, u32Sel, pvUser);
 
     if (   uAddress > RTLdrSize(g_hLdrMod) + g_uLoadAddr
@@ -161 +161 @@
  * @callback_method_impl{FNDISREADBYTES}
  */
-static DECLCALLBACK(int) MyReadBytes(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
+static DECLCALLBACK(int) MyReadBytes(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
 {
     RT_NOREF1(cbMaxRead);
@@ -174 +174 @@
                        RTUINTPTR uNearAddr, RTUINTPTR uSearchAddr)
 {
-    DISCPUSTATE Cpu;
-    int32_t     i = 0;
+    DISSTATE Dis;
+    int32_t  i = 0;
     while (i < cbMax)
     {
@@ -184 +184 @@
         int rc = DISInstrWithReader(uNearAddr + i, enmCpuMode,
                                     MyReadBytes, (uint8_t *)pvCodeBlock - (uintptr_t)uNearAddr,
-                                    &Cpu, &cbInstr);
+                                    &Dis, &cbInstr);
         RTAssertSetMayPanic(fMayPanic);
         RTAssertSetQuiet(fQuiet);
@@ -195 +195 @@
             RTPrintf("%s:\n", NearSym.aSyms[0].szName);
 
-        DISFormatYasmEx(&Cpu, szOutput, sizeof(szOutput),
+        DISFormatYasmEx(&Dis, szOutput, sizeof(szOutput),
                         DIS_FMT_FLAGS_RELATIVE_BRANCH | DIS_FMT_FLAGS_BYTES_RIGHT | DIS_FMT_FLAGS_ADDR_LEFT  | DIS_FMT_FLAGS_BYTES_SPACED,
                         MyGetSymbol, NULL);

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)) \

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

@@ -103 +103 @@
 {
     static unsigned cb;
-    DISCPUSTATE Cpu;
+    DISSTATE Dis;
 
-    memset(&Cpu, 0, sizeof(Cpu));
+    memset(&Dis, 0, sizeof(Dis));
 
-    DISInstr((void *)(uintptr_t)SomeExportFunction3, DISCPUMODE_32BIT, &Cpu, &cb);
+    DISInstr((void *)(uintptr_t)SomeExportFunction3, DISCPUMODE_32BIT, &Dis, &cb);
     return (void *)(uintptr_t)&SomeExportFunction1;
 }