Changeset 99208 in vbox for trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp

Timestamp:

Mar 29, 2023 2:13:56 PM (21 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

File:

• trunk/src/VBox/Runtime/testcase/tstLdr-3.cpp (modified) (5 diffs)

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