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

Timestamp:

Mar 30, 2023 12:40:46 PM (22 months ago)

Author:

vboxsync

Message:

Disassember,*: Start separating the disassembler into a architecture specific and common part, bugref:10394

File:

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

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

@@ -935 +935 @@
      *        modrm.reg != 0. Those encodings should be invalid AFAICT. */
 
-    if (   (   pDis->bOpCode  == 0x8f            /* group 1a */
-            || pDis->bOpCode  == 0xc7            /* group 11 */
-            || pDis->bOpCode  == 0xc6            /* group 11 - not verified */
+    if (   (   pDis->arch.x86.bOpCode  == 0x8f            /* group 1a */
+            || pDis->arch.x86.bOpCode  == 0xc7            /* group 11 */
+            || pDis->arch.x86.bOpCode  == 0xc6            /* group 11 - not verified */
            )
-        && pDis->ModRM.Bits.Reg != 0)
+        && pDis->arch.x86.ModRM.Bits.Reg != 0)
         fDifferent = true;
     /*
@@ -999 +999 @@
             cbToRead = g_cbImg - offBios;
     }
-    memcpy(&pDis->abInstr[offInstr], &g_pbImg[offBios], cbToRead);
+    memcpy(&pDis->u.abInstr[offInstr], &g_pbImg[offBios], cbToRead);
     pDis->cbCachedInstr = (uint8_t)(offInstr + cbToRead);
     return VINF_SUCCESS;
@@ -1138 +1138 @@
             unsigned cbInstr;
             DISSTATE Dis;
-            Dis.ModRM.Bits.Mod = 3;
+            Dis.arch.x86.ModRM.Bits.Mod = 3;
             int rc = DISInstrWithReader(uFlatAddr, fIs16Bit ? DISCPUMODE_16BIT : DISCPUMODE_32BIT,
                                         disReadOpcodeBytes, NULL, &Dis, &cbInstr);
@@ -1146 +1146 @@
                 && Dis.pCurInstr->uOpcode != OP_INVALID
                 && Dis.pCurInstr->uOpcode != OP_ILLUD2
-                && (   !(Dis.fPrefix & DISPREFIX_ADDRSIZE)
+                && (   !(Dis.arch.x86.fPrefix & DISPREFIX_ADDRSIZE)
                     || disAccessesMemory(&Dis)))
             {