Changeset 105724 in vbox for trunk/src/VBox/HostDrivers/Support/posix/SUPR3HardenedMain-posix.cpp

Timestamp:

Aug 19, 2024 1:27:44 PM (9 months ago)

Author:

vboxsync

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

164428

Message:

Disassembler,VMM,HostDrivers,Debugger,MakeAlternativeSource: Convert DISSTATE::Param1,...,DISSTATE::Param4 to DISSTATE::aParams[4] for easier indexing, bugref:10394

File:

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

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

@@ -251 +251 @@
 
     /* Extract start address. */
-    pbSym = (pbSym + cbInstr + Dis.Param1.x86.uDisp.i32);
+    pbSym = (pbSym + cbInstr + Dis.aParams[0].x86.uDisp.i32);
     pbSym = (uint8_t *)*((uintptr_t *)pbSym);
 # else
@@ -423 +423 @@
         {
             /* Deduce destination register and write out new instruction. */
-            if (RT_UNLIKELY(!(   (Dis.Param1.fUse & (DISUSE_BASE | DISUSE_REG_GEN64))
-                              && (Dis.Param2.fUse & DISUSE_RIPDISPLACEMENT32))))
+            if (RT_UNLIKELY(!(   (Dis.aParams[0].fUse & (DISUSE_BASE | DISUSE_REG_GEN64))
+                              && (Dis.aParams[1].fUse & DISUSE_RIPDISPLACEMENT32))))
                 return VERR_SUPLIB_UNEXPECTED_INSTRUCTION;
 
-            uintptr_t uAddr = (uintptr_t)&pbTarget[offInsn + cbInstr] + (intptr_t)Dis.Param2.x86.uDisp.i32;
+            uintptr_t uAddr = (uintptr_t)&pbTarget[offInsn + cbInstr] + (intptr_t)Dis.aParams[1].x86.uDisp.i32;
 
             if (fConvRipRelMovs)
@@ -437 +437 @@
 
                 *pbPatchMem++ = 0x48;
-                *pbPatchMem++ = 0xb8 + Dis.Param1.x86.Base.idxGenReg;
+                *pbPatchMem++ = 0xb8 + Dis.aParams[0].x86.Base.idxGenReg;
                 *(uintptr_t *)pbPatchMem = uAddr;
                 pbPatchMem   += sizeof(uintptr_t);
@@ -443 +443 @@
                 *pbPatchMem++ = 0x48;
                 *pbPatchMem++ = 0x8b;
-                *pbPatchMem++ = (Dis.Param1.x86.Base.idxGenReg << X86_MODRM_REG_SHIFT) | Dis.Param1.x86.Base.idxGenReg;
+                *pbPatchMem++ = (Dis.aParams[0].x86.Base.idxGenReg << X86_MODRM_REG_SHIFT) | Dis.aParams[0].x86.Base.idxGenReg;
             }
             else
@@ -453 +453 @@
                 *pbPatchMem++ = 0x48;
                 *pbPatchMem++ = 0x8b;
-                *pbPatchMem++ = (Dis.Param1.x86.Base.idxGenReg << X86_MODRM_REG_SHIFT) | 5;
+                *pbPatchMem++ = (Dis.aParams[0].x86.Base.idxGenReg << X86_MODRM_REG_SHIFT) | 5;
                 *(int32_t *)pbPatchMem = (int32_t)iDispNew;
                 pbPatchMem   += sizeof(int32_t);
@@ -462 +462 @@
         {
             /* Convert to absolute jump. */
-            uintptr_t uAddr = (uintptr_t)&pbTarget[offInsn + cbInstr] + (intptr_t)Dis.Param1.uValue;
+            uintptr_t uAddr = (uintptr_t)&pbTarget[offInsn + cbInstr] + (intptr_t)Dis.aParams[0].uValue;
 
             /* Skip the push instructions till the return address is known. */
@@ -575 +575 @@
 
             /* jmp rel32 to the call target */
-            uintptr_t const uAddr      = uAddrReturn + (int32_t)Dis.Param1.uValue;
+            uintptr_t const uAddr      = uAddrReturn + (int32_t)Dis.aParams[0].uValue;
             int32_t   const i32DispNew = uAddr - (uintptr_t)&pbPatchMem[5];