Changeset 99210 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 29, 2023 2:18:33 PM (23 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 [build fix, missing file]

File:

• trunk/src/VBox/VMM/VMMR3/DBGFDisas.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFDisas.cpp

@@ -61 +61 @@
 {
     /** The core structure. */
-    DISCPUSTATE     Cpu;
+    DISSTATE        Dis;
     /** The cross context VM structure. */
     PVM             pVM;
@@ -155 +155 @@
                                 enmCpuMode,
                                 dbgfR3DisasInstrRead,
-                                &pState->Cpu,
-                                &pState->Cpu,
+                                &pState->Dis,
+                                &pState->Dis,
                                 &cbInstr);
     if (RT_SUCCESS(rc))
@@ -216 +216 @@
  *          DBGFDISASSTATE::GCPtrSegBase.
  */
-static DECLCALLBACK(int) dbgfR3DisasInstrRead(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
+static DECLCALLBACK(int) dbgfR3DisasInstrRead(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
 {
     PDBGFDISASSTATE pState = (PDBGFDISASSTATE)pDis;
@@ -287 +287 @@
  * @callback_method_impl{FNDISGETSYMBOL}
  */
-static DECLCALLBACK(int) dbgfR3DisasGetSymbol(PCDISCPUSTATE pDis, uint32_t u32Sel, RTUINTPTR uAddress,
+static DECLCALLBACK(int) dbgfR3DisasGetSymbol(PCDISSTATE pDis, uint32_t u32Sel, RTUINTPTR uAddress,
                                               char *pszBuf, size_t cchBuf, RTINTPTR *poff, void *pvUser)
 {
@@ -304 +304 @@
         rc = DBGFR3AddrFromSelInfoOff(pState->pVM->pUVM, &Addr, pSelInfo, uAddress);
     /* In long mode everything but FS and GS is easy. */
-    else if (   pState->Cpu.uCpuMode == DISCPUMODE_64BIT
+    else if (   pState->Dis.uCpuMode == DISCPUMODE_64BIT
              && DIS_FMT_SEL_IS_REG(u32Sel)
              && DIS_FMT_SEL_GET_REG(u32Sel) != DISSELREG_GS
@@ -520 +520 @@
     if (RT_FAILURE(rc))
     {
-        if (State.Cpu.cbCachedInstr)
-            RTStrPrintf(pszOutput, cbOutput, "Disas -> %Rrc; %.*Rhxs\n", rc, (size_t)State.Cpu.cbCachedInstr, State.Cpu.abInstr);
+        if (State.Dis.cbCachedInstr)
+            RTStrPrintf(pszOutput, cbOutput, "Disas -> %Rrc; %.*Rhxs\n", rc, (size_t)State.Dis.cbCachedInstr, State.Dis.abInstr);
         else
             RTStrPrintf(pszOutput, cbOutput, "Disas -> %Rrc\n", rc);
@@ -531 +531 @@
      */
     char szBuf[512];
-    DISFormatYasmEx(&State.Cpu, szBuf, sizeof(szBuf),
+    DISFormatYasmEx(&State.Dis, szBuf, sizeof(szBuf),
                     DIS_FMT_FLAGS_RELATIVE_BRANCH,
                     fFlags & DBGF_DISAS_FLAGS_NO_SYMBOLS ? NULL : dbgfR3DisasGetSymbol,
@@ -563 +563 @@
     else
     {
-        uint32_t        cbInstr  = State.Cpu.cbInstr;
-        uint8_t const  *pabInstr = State.Cpu.abInstr;
+        uint32_t        cbInstr  = State.Dis.cbInstr;
+        uint8_t const  *pabInstr = State.Dis.abInstr;
         if (fFlags & DBGF_DISAS_FLAGS_NO_ADDRESS)
             cch = RTStrPrintf(pszOutput, cbOutput, "%.*Rhxs%*s %s",
@@ -603 +603 @@
 
     if (pcbInstr)
-        *pcbInstr = State.Cpu.cbInstr;
+        *pcbInstr = State.Dis.cbInstr;
 
     if (pDisState)
     {
-        pDisState->pCurInstr = State.Cpu.pCurInstr;
-        pDisState->cbInstr   = State.Cpu.cbInstr;
-        pDisState->Param1    = State.Cpu.Param1;
-        pDisState->Param2    = State.Cpu.Param2;
-        pDisState->Param3    = State.Cpu.Param3;
-        pDisState->Param4    = State.Cpu.Param4;
+        pDisState->pCurInstr = State.Dis.pCurInstr;
+        pDisState->cbInstr   = State.Dis.cbInstr;
+        pDisState->Param1    = State.Dis.Param1;
+        pDisState->Param2    = State.Dis.Param2;
+        pDisState->Param3    = State.Dis.Param3;
+        pDisState->Param4    = State.Dis.Param4;
     }