Changeset 101541 in vbox

Timestamp:

Oct 22, 2023 2:55:27 AM (19 months ago)

Author:

vboxsync

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

159618

Message:

DIS,VMM,DBGC,IPRT,++: Some disassembler tweaks and TB disassembly work. [build fix, missed bits] bugref:10371 bugref:9898

File:

• trunk/src/VBox/HostDrivers/Support/posix/SUPR3HardenedMain-posix.cpp (modified) (7 diffs)

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

@@ -247 +247 @@
     if (   RT_FAILURE(rc)
         || Dis.pCurInstr->uOpcode != OP_JMP
-        || !(Dis.x86.ModRM.Bits.Mod == 0 && Dis.arch.x86.ModRM.Bits.Rm == 5 /* wrt RIP */))
+        || !(Dis.x86.ModRM.Bits.Mod == 0 && Dis.x86.ModRM.Bits.Rm == 5 /* wrt RIP */))
         return NULL;
 
     /* Extract start address. */
-    pbSym = (pbSym + cbInstr + Dis.Param1.arch.x86.uDisp.i32);
+    pbSym = (pbSym + cbInstr + Dis.Param1.x86.uDisp.i32);
     pbSym = (uint8_t *)*((uintptr_t *)pbSym);
 # else
@@ -360 +360 @@
             || (   Dis.pCurInstr->fOpType & DISOPTYPE_CONTROLFLOW
                 && Dis.pCurInstr->uOpcode != OP_CALL)
-            || (   Dis.arch.x86.ModRM.Bits.Mod == 0
-                && Dis.arch.x86.ModRM.Bits.Rm  == 5 /* wrt RIP */
+            || (   Dis.x86.ModRM.Bits.Mod == 0
+                && Dis.x86.ModRM.Bits.Rm  == 5 /* wrt RIP */
                 && Dis.pCurInstr->uOpcode != OP_MOV))
             return VERR_SUPLIB_UNEXPECTED_INSTRUCTION;
 
-        if (Dis.arch.x86.ModRM.Bits.Mod == 0 && Dis.arch.x86.ModRM.Bits.Rm == 5 /* wrt RIP */)
+        if (Dis.x86.ModRM.Bits.Mod == 0 && Dis.x86.ModRM.Bits.Rm == 5 /* wrt RIP */)
             cRipRelMovs++;
         if (   Dis.pCurInstr->uOpcode == OP_CALL
@@ -418 +418 @@
             return VERR_SUPLIB_UNEXPECTED_INSTRUCTION;
 
-        if (   Dis.arch.x86.ModRM.Bits.Mod == 0
-            && Dis.arch.x86.ModRM.Bits.Rm  == 5 /* wrt RIP */
+        if (   Dis.x86.ModRM.Bits.Mod == 0
+            && Dis.x86.ModRM.Bits.Rm  == 5 /* wrt RIP */
             && Dis.pCurInstr->uOpcode == OP_MOV)
         {
@@ -427 +427 @@
                 return VERR_SUPLIB_UNEXPECTED_INSTRUCTION;
 
-            uintptr_t uAddr = (uintptr_t)&pbTarget[offInsn + cbInstr] + (intptr_t)Dis.Param2.arch.x86.uDisp.i32;
+            uintptr_t uAddr = (uintptr_t)&pbTarget[offInsn + cbInstr] + (intptr_t)Dis.Param2.x86.uDisp.i32;
 
             if (fConvRipRelMovs)
@@ -437 +437 @@
 
                 *pbPatchMem++ = 0x48;
-                *pbPatchMem++ = 0xb8 + Dis.Param1.arch.x86.Base.idxGenReg;
+                *pbPatchMem++ = 0xb8 + Dis.Param1.x86.Base.idxGenReg;
                 *(uintptr_t *)pbPatchMem = uAddr;
                 pbPatchMem   += sizeof(uintptr_t);
@@ -443 +443 @@
                 *pbPatchMem++ = 0x48;
                 *pbPatchMem++ = 0x8b;
-                *pbPatchMem++ = (Dis.Param1.arch.x86.Base.idxGenReg << X86_MODRM_REG_SHIFT) | Dis.Param1.arch.x86.Base.idxGenReg;
+                *pbPatchMem++ = (Dis.Param1.x86.Base.idxGenReg << X86_MODRM_REG_SHIFT) | Dis.Param1.x86.Base.idxGenReg;
             }
             else
@@ -453 +453 @@
                 *pbPatchMem++ = 0x48;
                 *pbPatchMem++ = 0x8b;
-                *pbPatchMem++ = (Dis.Param1.arch.x86.Base.idxGenReg << X86_MODRM_REG_SHIFT) | 5;
+                *pbPatchMem++ = (Dis.Param1.x86.Base.idxGenReg << X86_MODRM_REG_SHIFT) | 5;
                 *(int32_t *)pbPatchMem = (int32_t)iDispNew;
                 pbPatchMem   += sizeof(int32_t);