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

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

File:

• trunk/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp

@@ -910 +910 @@
 
 
-static bool disAccessesMemory(PCDISCPUSTATE pCpuState)
-{
-    PCDISOPCODE pCurInstr = pCpuState->pCurInstr;
-    return disIsMemoryParameter(&pCpuState->Param1, pCurInstr->fParam1)
-        || disIsMemoryParameter(&pCpuState->Param2, pCurInstr->fParam2)
-        || disIsMemoryParameter(&pCpuState->Param3, pCurInstr->fParam3)
-        || disIsMemoryParameter(&pCpuState->Param4, pCurInstr->fParam4);
+static bool disAccessesMemory(PCDISSTATE pDis)
+{
+    PCDISOPCODE pCurInstr = pDis->pCurInstr;
+    return disIsMemoryParameter(&pDis->Param1, pCurInstr->fParam1)
+        || disIsMemoryParameter(&pDis->Param2, pCurInstr->fParam2)
+        || disIsMemoryParameter(&pDis->Param3, pCurInstr->fParam3)
+        || disIsMemoryParameter(&pDis->Param4, pCurInstr->fParam4);
 }
 
@@ -923 +923 @@
  * Deals with instructions that YASM will assemble differently than WASM/WCC.
  */
-static size_t disHandleYasmDifferences(PDISCPUSTATE pCpuState, uint32_t uFlatAddr, uint32_t cbInstr,
+static size_t disHandleYasmDifferences(PDISSTATE pDis, uint32_t uFlatAddr, uint32_t cbInstr,
                                        char *pszBuf, size_t cbBuf, size_t cchUsed)
 {
-    bool fDifferent = DISFormatYasmIsOddEncoding(pCpuState);
+    bool fDifferent = DISFormatYasmIsOddEncoding(pDis);
     uint8_t const  *pb = &g_pbImg[uFlatAddr - g_uBiosFlatBase];
 
@@ -935 +935 @@
      *        modrm.reg != 0. Those encodings should be invalid AFAICT. */
 
-    if (   (   pCpuState->bOpCode  == 0x8f            /* group 1a */
-            || pCpuState->bOpCode  == 0xc7            /* group 11 */
-            || pCpuState->bOpCode  == 0xc6            /* group 11 - not verified */
+    if (   (   pDis->bOpCode  == 0x8f            /* group 1a */
+            || pDis->bOpCode  == 0xc7            /* group 11 */
+            || pDis->bOpCode  == 0xc6            /* group 11 - not verified */
            )
-        && pCpuState->ModRM.Bits.Reg != 0)
+        && pDis->ModRM.Bits.Reg != 0)
         fDifferent = true;
     /*
@@ -986 +986 @@
  * @remarks @a uSrcAddr is the flat address.
  */
-static DECLCALLBACK(int) disReadOpcodeBytes(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
+static DECLCALLBACK(int) disReadOpcodeBytes(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
 {
     RT_NOREF_PV(cbMinRead);
@@ -1136 +1136 @@
         else
         {
-            unsigned    cbInstr;
-            DISCPUSTATE CpuState;
-            CpuState.ModRM.Bits.Mod = 3;
+            unsigned cbInstr;
+            DISSTATE Dis;
+            Dis.ModRM.Bits.Mod = 3;
             int rc = DISInstrWithReader(uFlatAddr, fIs16Bit ? DISCPUMODE_16BIT : DISCPUMODE_32BIT,
-                                        disReadOpcodeBytes, NULL, &CpuState, &cbInstr);
+                                        disReadOpcodeBytes, NULL, &Dis, &cbInstr);
             if (   RT_SUCCESS(rc)
                 && cbInstr <= cb
-                && CpuState.pCurInstr
-                && CpuState.pCurInstr->uOpcode != OP_INVALID
-                && CpuState.pCurInstr->uOpcode != OP_ILLUD2
-                && (   !(CpuState.fPrefix & DISPREFIX_ADDRSIZE)
-                    || disAccessesMemory(&CpuState)))
+                && Dis.pCurInstr
+                && Dis.pCurInstr->uOpcode != OP_INVALID
+                && Dis.pCurInstr->uOpcode != OP_ILLUD2
+                && (   !(Dis.fPrefix & DISPREFIX_ADDRSIZE)
+                    || disAccessesMemory(&Dis)))
             {
                 char szTmp[4096];
-                size_t cch = DISFormatYasmEx(&CpuState, szTmp, sizeof(szTmp),
+                size_t cch = DISFormatYasmEx(&Dis, szTmp, sizeof(szTmp),
                                              DIS_FMT_FLAGS_STRICT
                                              | DIS_FMT_FLAGS_BYTES_RIGHT | DIS_FMT_FLAGS_BYTES_COMMENT | DIS_FMT_FLAGS_BYTES_SPACED,
                                              NULL, NULL);
-                cch = disHandleYasmDifferences(&CpuState, uFlatAddr, cbInstr, szTmp, sizeof(szTmp), cch);
+                cch = disHandleYasmDifferences(&Dis, uFlatAddr, cbInstr, szTmp, sizeof(szTmp), cch);
                 Assert(cch < sizeof(szTmp));