Changeset 102846 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jan 11, 2024 2:23:53 PM (11 months ago)

Author:

vboxsync

Message:

VMM/IEM: Preserve variable and shadow register state across code TLB load calls. bugref:10371

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllN8veRecompBltIn.cpp (modified) (5 diffs)
• IEMAllN8veRecompiler.cpp (modified) (2 diffs)

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

@@ -1187 +1187 @@
 
     /*
-     * Move/spill/flush stuff out of call-volatile registers.
-     * This is the easy way out. We could contain this to the tlb-miss branch
-     * by saving and restoring active stuff here.
-     */
-    /** @todo save+restore active registers and maybe guest shadows in tlb-miss.  */
-    off = iemNativeRegMoveAndFreeAndFlushAtCall(pReNative, off, 0 /* vacate all non-volatile regs */);
-
-    /*
      * Define labels and allocate the register for holding the GCPhys of the new page.
      */
@@ -1212 +1204 @@
     iemNativeLabelDefine(pReNative, idxLabelTlbMiss, off);
 
+    /* Save variables in volatile registers. */
+    uint32_t const fHstRegsNotToSave = /*TlbState.getRegsNotToSave() | */ RT_BIT_32(idxRegGCPhys);
+    off = iemNativeVarSaveVolatileRegsPreHlpCall(pReNative, off, fHstRegsNotToSave);
+
     /* IEMNATIVE_CALL_ARG1_GREG = offInstr */
     off = iemNativeEmitLoadGpr8Imm(pReNative, off, IEMNATIVE_CALL_ARG1_GREG, offInstr);
@@ -1224 +1220 @@
     if (idxRegGCPhys != IEMNATIVE_CALL_RET_GREG)
         off = iemNativeEmitLoadGprFromGpr(pReNative, off, idxRegGCPhys, IEMNATIVE_CALL_RET_GREG);
+
+    /* Restore variables and guest shadow registers to volatile registers. */
+    off = iemNativeVarRestoreVolatileRegsPostHlpCall(pReNative, off, fHstRegsNotToSave);
+    off = iemNativeRegRestoreGuestShadowsInVolatileRegs(pReNative, off, 0 /*TlbState.getActiveRegsWithShadows()*/);
 
     iemNativeLabelDefine(pReNative, idxLabelTlbDone, off);
@@ -1505 +1505 @@
     iemNativeLabelDefine(pReNative, idxLabelTlbMiss, off);
 
+    /* Save variables in volatile registers. */
+    uint32_t const fHstRegsNotToSave = /*TlbState.getRegsNotToSave() | */ RT_BIT_32(idxRegTmp) | RT_BIT_32(idxRegTmp);
+    off = iemNativeVarSaveVolatileRegsPreHlpCall(pReNative, off, fHstRegsNotToSave);
+
     /* IEMNATIVE_CALL_ARG0_GREG = pVCpu */
     off = iemNativeEmitLoadGprFromGpr(pReNative, off, IEMNATIVE_CALL_ARG0_GREG, IEMNATIVE_REG_FIXED_PVMCPU);
@@ -1510 +1514 @@
     /* Done setting up parameters, make the call. */
     off = iemNativeEmitCallImm(pReNative, off, (uintptr_t)iemNativeHlpMemCodeNewPageTlbMiss);
+
+    /* Restore variables and guest shadow registers to volatile registers. */
+    off = iemNativeVarRestoreVolatileRegsPostHlpCall(pReNative, off, fHstRegsNotToSave);
+    off = iemNativeRegRestoreGuestShadowsInVolatileRegs(pReNative, off, 0 /*TlbState.getActiveRegsWithShadows()*/);
 
     /* Jmp back to the start and redo the checks. */

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

@@ -7448 +7448 @@
  * @param   fHstRegsNotToSave   Set of registers not to save & restore.
  */
-DECL_INLINE_THROW(uint32_t)
+DECL_HIDDEN_THROW(uint32_t)
 iemNativeVarSaveVolatileRegsPreHlpCall(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint32_t fHstRegsNotToSave)
 {
@@ -7521 +7521 @@
  *          iemNativeRegRestoreGuestShadowsInVolatileRegs()
  */
-DECL_INLINE_THROW(uint32_t)
+DECL_HIDDEN_THROW(uint32_t)
 iemNativeVarRestoreVolatileRegsPostHlpCall(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint32_t fHstRegsNotToSave)
 {