Changeset 99220 in vbox for trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp

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/Disassembler/testcase/tstDisasm-2.cpp (modified) (11 diffs)

trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp

@@ -149 +149 @@
         case OP_MOV_DR:
         case OP_MOV_TR:
-            if (pDis->ModRM.Bits.Mod != 3)
+            if (pDis->arch.x86.ModRM.Bits.Mod != 3)
                 return false;
             break;
@@ -155 +155 @@
          /* The 0x8f /0 variant of this instruction doesn't get its /r value verified. */
         case OP_POP:
-            if (    pDis->bOpCode == 0x8f
-                &&  pDis->ModRM.Bits.Reg != 0)
+            if (    pDis->arch.x86.bOpCode == 0x8f
+                &&  pDis->arch.x86.ModRM.Bits.Reg != 0)
                 return false;
             break;
@@ -162 +162 @@
         /* The 0xc6 /0 and 0xc7 /0 variants of this instruction don't get their /r values verified. */
         case OP_MOV:
-            if (    (   pDis->bOpCode == 0xc6
-                     || pDis->bOpCode == 0xc7)
-                &&  pDis->ModRM.Bits.Reg != 0)
+            if (    (   pDis->arch.x86.bOpCode == 0xc6
+                     || pDis->arch.x86.bOpCode == 0xc7)
+                &&  pDis->arch.x86.ModRM.Bits.Reg != 0)
                 return false;
             break;
@@ -192 +192 @@
         //size_t cbToRead    = cbMaxRead;
         size_t cbToRead    = cbMinRead;
-        memcpy(&pState->Dis.abInstr[offInstr], pState->pbNext, cbToRead);
+        memcpy(&pState->Dis.u.abInstr[offInstr], pState->pbNext, cbToRead);
         pState->Dis.cbCachedInstr = offInstr + (uint8_t)cbToRead;
         pState->pbNext    += cbToRead;
@@ -207 +207 @@
         if (pState->cbLeft > 0)
         {
-            memcpy(&pState->Dis.abInstr[offInstr], pState->pbNext, pState->cbLeft);
+            memcpy(&pState->Dis.u.abInstr[offInstr], pState->pbNext, pState->cbLeft);
             offInstr          += (uint8_t)pState->cbLeft;
             cbMinRead         -= (uint8_t)pState->cbLeft;
@@ -214 +214 @@
             pState->cbLeft     = 0;
         }
-        memset(&pState->Dis.abInstr[offInstr], 0xcc, cbMinRead);
+        memset(&pState->Dis.u.abInstr[offInstr], 0xcc, cbMinRead);
         pState->rc = VERR_EOF;
     }
@@ -223 +223 @@
          */
         RTStrmPrintf(g_pStdErr, "Reading before current instruction!\n");
-        memset(&pState->Dis.abInstr[offInstr], 0x90, cbMinRead);
+        memset(&pState->Dis.u.abInstr[offInstr], 0x90, cbMinRead);
         pState->rc = VERR_INTERNAL_ERROR;
     }
@@ -316 +316 @@
                 if (!State.cbInstr)
                 {
-                    State.Dis.abInstr[0] = 0;
+                    State.Dis.u.abInstr[0] = 0;
                     State.Dis.pfnReadBytes(&State.Dis, 0, 1, 1);
                     State.cbInstr = 1;
@@ -322 +322 @@
                 RTPrintf("    db");
                 for (unsigned off = 0; off < State.cbInstr; off++)
-                    RTPrintf(off ? ", %03xh" : " %03xh", State.Dis.abInstr[off]);
+                    RTPrintf(off ? ", %03xh" : " %03xh", State.Dis.u.abInstr[off]);
                 RTPrintf("    ; %s\n", State.szLine);
             }
@@ -345 +345 @@
                     RTPrintf("    db");
                     for (unsigned off = 0; off < State.cbInstr; off++)
-                        RTPrintf(off ? ", %03xh" : " %03xh", State.Dis.abInstr[off]);
+                        RTPrintf(off ? ", %03xh" : " %03xh", State.Dis.u.abInstr[off]);
                     RTPrintf(" ; ");
                 }
@@ -376 +376 @@
         {
             uint32_t cbInstrOnly = 32;
-            uint8_t  abInstr[sizeof(State.Dis.abInstr)];
-            memcpy(abInstr, State.Dis.abInstr, sizeof(State.Dis.abInstr));
+            uint8_t  abInstr[sizeof(State.Dis.u.abInstr)];
+            memcpy(abInstr, State.Dis.u.abInstr, sizeof(State.Dis.u.abInstr));
             int rcOnly = DISInstrWithPrefetchedBytes(State.uAddress, enmCpuMode, 0 /*fFilter - none */,
                                                      abInstr, State.Dis.cbCachedInstr, MyDisasInstrRead, &State,