Changeset 105877 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Aug 27, 2024 11:17:09 PM (6 months ago)

Author:

vboxsync

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

164597

Message:

VMM/IEM: Don't flush PC prior to 64-bit relative jumps, flush it when in the #GP(0) code path. bugref:10720 bugref:10373

Location:

trunk/src/VBox/VMM/include

Files:

• IEMInternal.h (modified) (1 diff)
• IEMN8veRecompiler.h (modified) (2 diffs)
• IEMN8veRecompilerEmit.h (modified) (2 diffs)

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

@@ -1448 +1448 @@
         /* kIemTbDbgEntryType_DelayedPcUpdate. */
         uint32_t    uType         : 4;
+        /** Number of instructions skipped. */
+        uint32_t    cInstrSkipped : 8;
         /* The instruction offset added to the program counter. */
-        uint32_t    offPc         : 14;
-        /** Number of instructions skipped. */
-        uint32_t    cInstrSkipped : 14;
+        int32_t     offPc         : 20;
     } DelayedPcUpdate;
 #endif

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

@@ -1258 +1258 @@
      * as long as possible. */
     int64_t                     offPc;
-# if defined(IEMNATIVE_WITH_TB_DEBUG_INFO) || defined(VBOX_WITH_STATISTICS)
-    /** Statistics: The idxInstr+1 value at the last PC update. */
-    uint8_t                     idxInstrPlusOneOfLastPcUpdate;
-# endif
 # ifdef IEMNATIVE_WITH_DELAYED_PC_UPDATING_DEBUG
     /** Set after we've loaded PC into uPcUpdatingDebug at the first update. */
@@ -1463 +1459 @@
 #endif
 
+#if defined(IEMNATIVE_WITH_TB_DEBUG_INFO) || defined(VBOX_WITH_STATISTICS)
+    /** Statistics: The idxInstr+1 value at the last PC update. */
+    uint8_t                     idxInstrPlusOneOfLastPcUpdate;
+#endif
+
 #ifdef IEMNATIVE_WITH_TB_DEBUG_INFO
     /** Number of debug info entries allocated for pDbgInfo. */
     uint32_t                    cDbgInfoAlloc;
-    uint32_t                    uPadding;
     /** Debug info. */
     PIEMTBDBG                   pDbgInfo;

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

@@ -1059 +1059 @@
  */
 DECL_INLINE_THROW(uint32_t)
-iemNativeEmitStoreImmToVCpuU8(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint8_t bImm, uint32_t offVCpu)
+iemNativeEmitStoreImmToVCpuU8(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint8_t bImm, uint32_t offVCpu,
+                              uint8_t idxRegTmp = UINT8_MAX)
 {
 #ifdef RT_ARCH_AMD64
@@ -1068 +1069 @@
     pbCodeBuf[off++] = bImm;
     IEMNATIVE_ASSERT_INSTR_BUF_ENSURE(pReNative, off);
+    RT_NOREF(idxRegTmp);
 
 #elif defined(RT_ARCH_ARM64)
     /* Cannot use IEMNATIVE_REG_FIXED_TMP0 for the immediate as that's used by iemNativeEmitGprByVCpuLdSt. */
-    uint8_t const idxRegImm = iemNativeRegAllocTmpImm(pReNative, &off, bImm);
-    off = iemNativeEmitGprByVCpuLdSt(pReNative, off, idxRegImm, offVCpu, kArmv8A64InstrLdStType_St_Byte, sizeof(uint8_t));
-    iemNativeRegFreeTmpImm(pReNative, idxRegImm);
+    if (idxRegTmp != UINT8_MAX)
+    {
+        Assert(idxRegTmp != IEMNATIVE_REG_FIXED_TMP0);
+        off = iemNativeEmitLoadGprImm32(pReNative, off, idxRegTmp, bImm);
+        off = iemNativeEmitGprByVCpuLdSt(pReNative, off, idxRegTmp, offVCpu, kArmv8A64InstrLdStType_St_Byte, sizeof(uint8_t));
+    }
+    else
+    {
+        uint8_t const idxRegImm = iemNativeRegAllocTmpImm(pReNative, &off, bImm);
+        off = iemNativeEmitGprByVCpuLdSt(pReNative, off, idxRegImm, offVCpu, kArmv8A64InstrLdStType_St_Byte, sizeof(uint8_t));
+        iemNativeRegFreeTmpImm(pReNative, idxRegImm);
+    }
 
 #else