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

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• posix/SUPR3HardenedMain-posix.cpp (modified) (5 diffs)
• win/SUPR3HardenedMain-win.cpp (modified) (2 diffs)

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

@@ -360 +360 @@
             || (   Dis.pCurInstr->fOpType & DISOPTYPE_CONTROLFLOW
                 && Dis.pCurInstr->uOpcode != OP_CALL)
-            || (   Dis.ModRM.Bits.Mod == 0
-                && Dis.ModRM.Bits.Rm  == 5 /* wrt RIP */
+            || (   Dis.arch.x86.ModRM.Bits.Mod == 0
+                && Dis.arch.x86.ModRM.Bits.Rm  == 5 /* wrt RIP */
                 && Dis.pCurInstr->uOpcode != OP_MOV))
             return VERR_SUPLIB_UNEXPECTED_INSTRUCTION;
 
-        if (Dis.ModRM.Bits.Mod == 0 && Dis.ModRM.Bits.Rm == 5 /* wrt RIP */)
+        if (Dis.arch.x86.ModRM.Bits.Mod == 0 && Dis.ModRM.Bits.Rm == 5 /* wrt RIP */)
             cRipRelMovs++;
         if (   Dis.pCurInstr->uOpcode == OP_CALL
@@ -418 +418 @@
             return VERR_SUPLIB_UNEXPECTED_INSTRUCTION;
 
-        if (   Dis.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 */
             && Dis.pCurInstr->uOpcode == OP_MOV)
         {
@@ -437 +437 @@
 
                 *pbPatchMem++ = 0x48;
-                *pbPatchMem++ = 0xb8 + Dis.Param1.Base.idxGenReg;
+                *pbPatchMem++ = 0xb8 + Dis.Param1.arch.x86.Base.idxGenReg;
                 *(uintptr_t *)pbPatchMem = uAddr;
                 pbPatchMem   += sizeof(uintptr_t);
@@ -443 +443 @@
                 *pbPatchMem++ = 0x48;
                 *pbPatchMem++ = 0x8b;
-                *pbPatchMem++ = (Dis.Param1.Base.idxGenReg << X86_MODRM_REG_SHIFT) | Dis.Param1.Base.idxGenReg;
+                *pbPatchMem++ = (Dis.Param1.Base.arch.x86.idxGenReg << X86_MODRM_REG_SHIFT) | Dis.Param1.Base.arch.x86.idxGenReg;
             }
             else
@@ -453 +453 @@
                 *pbPatchMem++ = 0x48;
                 *pbPatchMem++ = 0x8b;
-                *pbPatchMem++ = (Dis.Param1.Base.idxGenReg << X86_MODRM_REG_SHIFT) | 5;
+                *pbPatchMem++ = (Dis.Param1.arch.x86.Base.idxGenReg << X86_MODRM_REG_SHIFT) | 5;
                 *(int32_t *)pbPatchMem = (int32_t)iDispNew;
                 pbPatchMem   += sizeof(int32_t);

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

@@ -3077 +3077 @@
         if (   RT_FAILURE(rc)
             || (Dis.pCurInstr->fOpType & (DISOPTYPE_CONTROLFLOW))
-            || (Dis.ModRM.Bits.Mod == 0 && Dis.ModRM.Bits.Rm == 5 /* wrt RIP */) )
+            || (Dis.arch.x86.ModRM.Bits.Mod == 0 && Dis.arch.x86.ModRM.Bits.Rm == 5 /* wrt RIP */) )
             supR3HardenedWinHookFailed("LdrLoadDll", pbLdrLoadDll);
         offJmpBack += cbInstr;
@@ -3164 +3164 @@
         if (   RT_FAILURE(rc)
             || (Dis.pCurInstr->fOpType & (DISOPTYPE_CONTROLFLOW))
-            || (Dis.ModRM.Bits.Mod == 0 && Dis.ModRM.Bits.Rm == 5 /* wrt RIP */) )
+            || (Dis.arch.x86.ModRM.Bits.Mod == 0 && Dis.arch.x86.ModRM.Bits.Rm == 5 /* wrt RIP */) )
             supR3HardenedWinHookFailed("KiUserApcDispatcher", pbKiUserApcDispatcher);
         offJmpBack += cbInstr;