Changeset 103622 in vbox for trunk/src/VBox/VMM/include/IEMN8veRecompilerEmit.h

Timestamp:

Mar 1, 2024 12:42:36 AM (11 months ago)

Author:

vboxsync

Message:

VMM/IEM: Obfuscate most variable indexes we pass around in strict builds so we easily catch register/variable index mixups. bugref:10371

File:

• trunk/src/VBox/VMM/include/IEMN8veRecompilerEmit.h (modified) (5 diffs)

trunk/src/VBox/VMM/include/IEMN8veRecompilerEmit.h

@@ -6720 +6720 @@
 {
     IEMNATIVE_ASSERT_VAR_IDX(pReNative, idxVar);
-    AssertStmt(pReNative->Core.aVars[idxVar].enmKind == kIemNativeVarKind_Stack,
-               IEMNATIVE_DO_LONGJMP(pReNative, VERR_IEM_VAR_UNEXPECTED_KIND));
-
-    uint8_t const idxRegVar = pReNative->Core.aVars[idxVar].idxReg;
+    PIEMNATIVEVAR const pVar = &pReNative->Core.aVars[IEMNATIVE_VAR_IDX_UNPACK(idxVar)];
+    AssertStmt(pVar->enmKind == kIemNativeVarKind_Stack, IEMNATIVE_DO_LONGJMP(pReNative, VERR_IEM_VAR_UNEXPECTED_KIND));
+
+    uint8_t const idxRegVar = pVar->idxReg;
     if (   idxRegVar < RT_ELEMENTS(pReNative->Core.aHstRegs)
         && (   (RT_BIT_32(idxRegVar) & (~IEMNATIVE_CALL_VOLATILE_GREG_MASK | fHstVolatileRegsAllowed))
@@ -6741 +6741 @@
     else
     {
-        uint8_t const idxStackSlot = pReNative->Core.aVars[idxVar].idxStackSlot;
+        uint8_t const idxStackSlot = pVar->idxStackSlot;
         AssertStmt(idxStackSlot != UINT8_MAX, IEMNATIVE_DO_LONGJMP(pReNative, VERR_IEM_VAR_NOT_INITIALIZED));
         off = iemNativeEmitLoadGprByBp(pReNative, off, idxRegArg, iemNativeStackCalcBpDisp(idxStackSlot));
@@ -6762 +6762 @@
 {
     IEMNATIVE_ASSERT_VAR_IDX(pReNative, idxVar);
-    if (pReNative->Core.aVars[idxVar].enmKind == kIemNativeVarKind_Immediate)
-        off = iemNativeEmitLoadGprImm64(pReNative, off, idxRegArg, pReNative->Core.aVars[idxVar].u.uValue + offAddend);
+    PIEMNATIVEVAR const pVar = &pReNative->Core.aVars[IEMNATIVE_VAR_IDX_UNPACK(idxVar)];
+    if (pVar->enmKind == kIemNativeVarKind_Immediate)
+        off = iemNativeEmitLoadGprImm64(pReNative, off, idxRegArg, pVar->u.uValue + offAddend);
     else
         off = iemNativeEmitLoadArgGregFromStackVar(pReNative, off, idxRegArg, idxVar, offAddend,
@@ -6781 +6782 @@
 {
     IEMNATIVE_ASSERT_VAR_IDX(pReNative, idxVar);
-    AssertStmt(   pReNative->Core.aVars[idxVar].enmKind == kIemNativeVarKind_Invalid
-               || pReNative->Core.aVars[idxVar].enmKind == kIemNativeVarKind_Stack,
+    PIEMNATIVEVAR const pVar = &pReNative->Core.aVars[IEMNATIVE_VAR_IDX_UNPACK(idxVar)];
+    AssertStmt(   pVar->enmKind == kIemNativeVarKind_Invalid
+               || pVar->enmKind == kIemNativeVarKind_Stack,
                IEMNATIVE_DO_LONGJMP(pReNative, VERR_IEM_VAR_UNEXPECTED_KIND));
 
@@ -6788 +6790 @@
     int32_t const offBpDisp      = iemNativeStackCalcBpDisp(idxStackSlot);
 
-    uint8_t const idxRegVar      = pReNative->Core.aVars[idxVar].idxReg;
+    uint8_t const idxRegVar      = pVar->idxReg;
     if (idxRegVar < RT_ELEMENTS(pReNative->Core.aHstRegs))
     {
         off = iemNativeEmitStoreGprByBp(pReNative, off, offBpDisp, idxRegVar);
         iemNativeRegFreeVar(pReNative, idxRegVar, fFlushShadows);
-        Assert(pReNative->Core.aVars[idxVar].idxReg == UINT8_MAX);
-    }
-    Assert(   pReNative->Core.aVars[idxVar].idxStackSlot != UINT8_MAX
-           && pReNative->Core.aVars[idxVar].idxReg       == UINT8_MAX);
+        Assert(pVar->idxReg == UINT8_MAX);
+    }
+    Assert(   pVar->idxStackSlot != UINT8_MAX
+           && pVar->idxReg       == UINT8_MAX);
 
     return iemNativeEmitLeaGprByBp(pReNative, off, idxRegArg, offBpDisp);