Changeset 99221 in vbox for trunk

Timestamp:

Mar 30, 2023 12:48:09 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156594

Message:

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

Location:

trunk/src/VBox

Files:

• Disassembler/testcase/tstDisasm-1.cpp (modified) (1 diff)
• HostDrivers/Support/posix/SUPR3HardenedMain-posix.cpp (modified) (3 diffs)
• Runtime/testcase/tstLdrDisasmTest.cpp (modified) (3 diffs)

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

@@ -89 +89 @@
         DISSTATE        DisOnly;
         rc = DISInstrWithPrefetchedBytes((uintptr_t)&pabInstrs[off], enmDisCpuMode,  0 /*fFilter - none */,
-                                         Dis.abInstr, Dis.cbCachedInstr, NULL, NULL, &DisOnly, &cbOnly);
+                                         Dis.u.abInstr, Dis.cbCachedInstr, NULL, NULL, &DisOnly, &cbOnly);
 
         RTTESTI_CHECK_RC(rc, VINF_SUCCESS);

trunk/src/VBox/HostDrivers/Support/posix/SUPR3HardenedMain-posix.cpp

@@ -365 +365 @@
             return VERR_SUPLIB_UNEXPECTED_INSTRUCTION;
 
-        if (Dis.arch.x86.ModRM.Bits.Mod == 0 && Dis.ModRM.Bits.Rm == 5 /* wrt RIP */)
+        if (Dis.arch.x86.ModRM.Bits.Mod == 0 && Dis.arch.x86.ModRM.Bits.Rm == 5 /* wrt RIP */)
             cRipRelMovs++;
         if (   Dis.pCurInstr->uOpcode == OP_CALL
@@ -427 +427 @@
                 return VERR_SUPLIB_UNEXPECTED_INSTRUCTION;
 
-            uintptr_t uAddr = (uintptr_t)&pbTarget[offInsn + cbInstr] + (intptr_t)Dis.Param2.uDisp.i32;
+            uintptr_t uAddr = (uintptr_t)&pbTarget[offInsn + cbInstr] + (intptr_t)Dis.Param2.arch.x86.uDisp.i32;
 
             if (fConvRipRelMovs)
@@ -443 +443 @@
                 *pbPatchMem++ = 0x48;
                 *pbPatchMem++ = 0x8b;
-                *pbPatchMem++ = (Dis.Param1.Base.arch.x86.idxGenReg << X86_MODRM_REG_SHIFT) | Dis.Param1.Base.arch.x86.idxGenReg;
+                *pbPatchMem++ = (Dis.Param1.arch.x86.Base.idxGenReg << X86_MODRM_REG_SHIFT) | Dis.Param1.Base.arch.x86.idxGenReg;
             }
             else

trunk/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp

@@ -46 +46 @@
 *********************************************************************************************************************************/
 #include <VBox/dis.h>
-#include <VBox/disopcode.h>
 #include <VBox/sup.h>
 #include <iprt/string.h>
@@ -98 +97 @@
     if (cb + pDis->uInstrAddr + offInstr > sizeof(g_ab32BitCode))
         cb = cbMinRead;
-    memcpy(&pDis->abInstr[offInstr], &g_ab32BitCode[pDis->uInstrAddr + offInstr], cb);
+    memcpy(&pDis->u.abInstr[offInstr], &g_ab32BitCode[pDis->uInstrAddr + offInstr], cb);
     pDis->cbCachedInstr = offInstr + (uint8_t)cb;
     return VINF_SUCCESS;
@@ -113 +112 @@
     *pcb = cb;
     MY_PRINTF(("DISCoreOneEx -> rc=%d cb=%d  Cpu: bOpCode=%#x pCurInstr=%p (42=%d)\n", \
-               rc, cb, pDis->bOpCode, pDis->pCurInstr, 42)); \
+               rc, cb, pDis->arch.x86.bOpCode, pDis->pCurInstr, 42)); \
     return rc;
 }