Changeset 104210 in vbox for trunk

Timestamp:

Apr 6, 2024 12:38:26 AM (10 months ago)

Author:

vboxsync

Message:

VMM/IEM: Made iemNativeVarRegisterAcquire automatically convert from immediate to stack so that IEM_MC_ADD_LOCAL_S16_TO_EFF_ADDR and friends works with absolute addresses. bugref:10370

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp

@@ -6973 +6973 @@
     {
         Assert(idxStackSlot == UINT8_MAX);
-        AssertStmt(!fInitialized, IEMNATIVE_DO_LONGJMP(pReNative, VERR_IEM_VAR_NOT_INITIALIZED));
-    }
+        if (pVar->enmKind != kIemNativeVarKind_Immediate)
+            AssertStmt(!fInitialized, IEMNATIVE_DO_LONGJMP(pReNative, VERR_IEM_VAR_NOT_INITIALIZED));
+        else
+        {
+            /*
+             * Convert from immediate to stack/register.  This is currently only
+             * required by IEM_MC_ADD_LOCAL_S16_TO_EFF_ADDR, IEM_MC_ADD_LOCAL_S32_TO_EFF_ADDR
+             * and IEM_MC_ADD_LOCAL_S64_TO_EFF_ADDR in connection with BT, BTS, BTR, and BTC.
+             */
+            AssertStmt(fInitialized, IEMNATIVE_DO_LONGJMP(pReNative, VERR_IEM_VAR_NOT_INITIALIZED));
+            Log11(("iemNativeVarRegisterAcquire: idxVar=%#x idxReg=%u uValue=%RX64 converting from immediate to stack\n",
+                   idxVar, idxReg, pVar->u.uValue));
+            *poff = iemNativeEmitLoadGprImm64(pReNative, *poff, idxReg, pVar->u.uValue);
+            pVar->enmKind = kIemNativeVarKind_Stack;
+        }
+    }
+
     pVar->fRegAcquired = true;
     return idxReg;