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

Timestamp:

Jul 28, 2023 10:22:22 PM (18 months ago)

Author:

vboxsync

Message:

VMM/IEM: More on recompiling branch instruction. bugref:10369

Location:

trunk/src/VBox/VMM/include

Files:

• IEMInternal.h (modified) (6 diffs)
• IEMMc.h (modified) (1 diff)
• IEMOpHlp.h (modified) (3 diffs)

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

@@ -81 +81 @@
  * Linux, but it should be quite a bit faster for normal code.
  */
-#if (defined(IEM_WITH_SETJMP) && defined(IN_RING3) && (defined(__GNUC__) || defined(_MSC_VER))) \
+#if (defined(__cplusplus) && defined(IEM_WITH_SETJMP) && defined(IN_RING3) && (defined(__GNUC__) || defined(_MSC_VER))) \
  || defined(DOXYGEN_RUNNING)
 # define IEM_WITH_THROW_CATCH
@@ -843 +843 @@
 typedef IEMTB const *PCIEMTB;
 
+/** @name IEMBRANCHED_F_XXX - Branched indicator (IEMCPU::fTbBranched).
+ *
+ * These flags parallels IEM_CIMPL_F_BRANCH_XXX.
+ *
+ * @{ */
+/** Value if no branching happened recently. */
+#define IEMBRANCHED_F_NO            UINT8_C(0x00)
+/** Flag set if direct branch, clear if absolute or indirect. */
+#define IEMBRANCHED_F_DIRECT        UINT8_C(0x01)
+/** Flag set if indirect branch, clear if direct or relative. */
+#define IEMBRANCHED_F_INDIRECT      UINT8_C(0x02)
+/** Flag set if relative branch, clear if absolute or indirect. */
+#define IEMBRANCHED_F_RELATIVE      UINT8_C(0x04)
+/** Flag set if conditional branch, clear if unconditional. */
+#define IEMBRANCHED_F_CONDITIONAL   UINT8_C(0x08)
+/** Flag set if it's a far branch. */
+#define IEMBRANCHED_F_FAR           UINT8_C(0x10)
+/** Flag set (by IEM_MC_REL_JMP_XXX) if it's a zero bytes relative jump. */
+#define IEMBRANCHED_F_ZERO          UINT8_C(0x20)
+/** @} */
+
 
 /**
@@ -1139 +1160 @@
      * This is set by a previous instruction if it modified memory or similar.  */
     bool                    fTbCheckOpcodes;
-    /** Whether we just branched and need to start a new opcode range and emit code
-     * to do a TLB load and check them again. */
-    bool                    fTbBranched;
+    /** Indicates whether and how we just branched - IEMBRANCHED_F_XXX. */
+    uint8_t                 fTbBranched;
     /** Set when GCPhysInstrBuf is updated because of a page crossing. */
     bool                    fTbCrossedPage;
@@ -1148 +1168 @@
     /** Spaced reserved for recompiler data / alignment. */
     bool                    afRecompilerStuff1[4];
+    /** Previous GCPhysInstrBuf value - only valid if fTbCrossedPage is set.   */
+    RTGCPHYS                GCPhysInstrBufPrev;
+    /** Copy of IEMCPU::GCPhysInstrBuf after decoding a branch instruction.
+     * This is used together with fTbBranched and GCVirtTbBranchSrcBuf to determin
+     * whether a branch instruction jumps to a new page or stays within the
+     * current one. */
+    RTGCPHYS                GCPhysTbBranchSrcBuf;
+    /** Copy of IEMCPU::uInstrBufPc after decoding a branch instruction.  */
+    uint64_t                GCVirtTbBranchSrcBuf;
+    /* Alignment. */
+    uint64_t                au64RecompilerStuff2[5];
     /** Threaded TB statistics: Number of instructions per TB. */
     STAMPROFILE             StatTbThreadedInstr;
@@ -4386 +4417 @@
 
 /**
- * Macro for calling iemCImplRaiseInvalidOpcode().
- *
- * This enables us to add/remove arguments and force different levels of
- * inlining as we wish.
+ * Macro for calling iemCImplRaiseInvalidOpcode() for decode/static \#UDs.
+ *
+ * This is for things that will _always_ decode to an \#UD, taking the
+ * recompiler into consideration and everything.
  *
  * @return  Strict VBox status code.
  */
 #define IEMOP_RAISE_INVALID_OPCODE_RET()    IEM_MC_DEFER_TO_CIMPL_0_RET(IEM_CIMPL_F_XCPT, iemCImplRaiseInvalidOpcode)
+
+/**
+ * Macro for calling iemCImplRaiseInvalidOpcode() for runtime-style \#UDs.
+ *
+ * Using this macro means you've got _buggy_ _code_ and are doing things that
+ * belongs exclusively in IEMAllCImpl.cpp during decoding.
+ *
+ * @return  Strict VBox status code.
+ * @see     IEMOP_RAISE_INVALID_OPCODE_RET
+ */
+#define IEMOP_RAISE_INVALID_OPCODE_RUNTIME_RET()   IEM_MC_DEFER_TO_CIMPL_0_RET(IEM_CIMPL_F_XCPT, iemCImplRaiseInvalidOpcode)
+
 /** @} */
 
@@ -4899 +4942 @@
 
 void            iemThreadedTbObsolete(PVMCPUCC pVCpu, PIEMTB pTb);
+
 IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckMode,
                     (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
 IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckCsLim,
                     (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
+
 IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckCsLimAndOpcodes,
-                    (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
-IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckCsLimAndOpcodesAcrossPageLoadingTlb,
-                    (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
-IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckCsLimAndOpcodesLoadingTlb,
-                    (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
-IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckCsLimAndOpcodesOnNextPageLoadingTlb,
                     (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
 IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckOpcodes,
                     (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
-IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckOpcodesAcrossPageLoadingTlb,
+
+/* Branching: */
+IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckCsLimAndPcAndOpcodes,
+                    (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
+IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckPcAndOpcodes,
+                    (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
+
+IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckCsLimAndOpcodesLoadingTlb,
                     (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
 IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckOpcodesLoadingTlb,
                     (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
+
+/* Natural page crossing: */
+IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckCsLimAndOpcodesAcrossPageLoadingTlb,
+                    (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
+IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckOpcodesAcrossPageLoadingTlb,
+                    (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
+
+IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckCsLimAndOpcodesOnNextPageLoadingTlb,
+                    (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
 IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckOpcodesOnNextPageLoadingTlb,
                     (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
 
+IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckCsLimAndOpcodesOnNewPageLoadingTlb,
+                    (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
+IEM_DECL_IMPL_PROTO(VBOXSTRICTRC, iemThreadedFunc_BltIn_CheckOpcodesOnNewPageLoadingTlb,
+                    (PVMCPU pVCpu, uint64_t uParam0, uint64_t uParam1, uint64_t uParam2));
+
+
 
 extern const PFNIEMOP g_apfnIemInterpretOnlyOneByteMap[256];

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

@@ -1240 +1240 @@
  *
  * @{ */
+/** Flag set if direct branch, clear if absolute or indirect. */
+#define IEM_CIMPL_F_BRANCH_DIRECT        RT_BIT_32(0)
+/** Flag set if indirect branch, clear if direct or relative.
+ * This is also used for all system control transfers (SYSCALL, SYSRET, INT, ++)
+ * as well as for return instructions (RET, IRET, RETF). */
+#define IEM_CIMPL_F_BRANCH_INDIRECT      RT_BIT_32(1)
+/** Flag set if relative branch, clear if absolute or indirect. */
+#define IEM_CIMPL_F_BRANCH_RELATIVE      RT_BIT_32(2)
+/** Flag set if conditional branch, clear if unconditional. */
+#define IEM_CIMPL_F_BRANCH_CONDITIONAL   RT_BIT_32(3)
+/** Flag set if it's a far branch (changes CS). */
+#define IEM_CIMPL_F_BRANCH_FAR           RT_BIT_32(4)
+/** Convenience: Testing any kind of branch. */
+#define IEM_CIMPL_F_BRANCH_ANY          (IEM_CIMPL_F_BRANCH_DIRECT | IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_RELATIVE)
+
 /** Execution flags may change (IEMCPU::fExec). */
-#define IEM_CIMPL_F_MODE            RT_BIT_32(0)
-/** Unconditional direct branches (changes RIP, maybe CS). */
-#define IEM_CIMPL_F_BRANCH_UNCOND   RT_BIT_32(1)
-/** Conditional direct branch (may change RIP, maybe CS). */
-#define IEM_CIMPL_F_BRANCH_COND     RT_BIT_32(2)
-/** Indirect unconditional branch (changes RIP, maybe CS).
- *
- * This is used for all system control transfers (SYSCALL, SYSRET, INT, ++) as
- * well as for return instructions (RET, IRET, RETF).
- *
- * Since the INTO instruction is currently the only indirect branch instruction
- * that is conditional (depends on the overflow flag), that instruction will
- * have both IEM_CIMPL_F_BRANCH_INDIR and IEM_CIMPL_F_BRANCH_COND set.  All
- * other branch instructions will have exactly one of the branch flags set. */
-#define IEM_CIMPL_F_BRANCH_INDIR    RT_BIT_32(3)
+#define IEM_CIMPL_F_MODE                RT_BIT_32(5)
 /** May change significant portions of RFLAGS. */
-#define IEM_CIMPL_F_RFLAGS          RT_BIT_32(4)
+#define IEM_CIMPL_F_RFLAGS              RT_BIT_32(6)
 /** May change the status bits (X86_EFL_STATUS_BITS) in RFLAGS . */
-#define IEM_CIMPL_F_STATUS_FLAGS    RT_BIT_32(5)
+#define IEM_CIMPL_F_STATUS_FLAGS        RT_BIT_32(7)
 /** May trigger a VM exit. */
-#define IEM_CIMPL_F_VMEXIT          RT_BIT_32(6)
+#define IEM_CIMPL_F_VMEXIT              RT_BIT_32(8)
 /** May modify FPU state. */
-#define IEM_CIMPL_F_FPU             RT_BIT_32(7)
+#define IEM_CIMPL_F_FPU                 RT_BIT_32(9)
 /** REP prefixed instruction which may yield before updating PC. */
-#define IEM_CIMPL_F_REP             RT_BIT_32(8)
+#define IEM_CIMPL_F_REP                 RT_BIT_32(10)
 /** Force end of TB after the instruction.    */
-#define IEM_CIMPL_F_END_TB          RT_BIT_32(9)
+#define IEM_CIMPL_F_END_TB              RT_BIT_32(11)
 /** Convenience: Raise exception (technically unnecessary, since it shouldn't return VINF_SUCCESS). */
-#define IEM_CIMPL_F_XCPT            (IEM_CIMPL_F_MODE | IEM_CIMPL_F_BRANCH_UNCOND | IEM_CIMPL_F_RFLAGS | IEM_CIMPL_F_VMEXIT)
-/** Convenience: Testing any kind of branch. */
-#define IEM_CIMPL_F_BRANCH_ANY      (IEM_CIMPL_F_BRANCH_UNCOND | IEM_CIMPL_F_BRANCH_COND | IEM_CIMPL_F_BRANCH_INDIR)
+#define IEM_CIMPL_F_XCPT \
+    (IEM_CIMPL_F_BRANCH_INDIRECT | IEM_CIMPL_F_BRANCH_FAR | IEM_CIMPL_F_MODE | IEM_CIMPL_F_RFLAGS | IEM_CIMPL_F_VMEXIT)
 /** @} */
 

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

@@ -296 +296 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
 /** This instruction raises an \#UD in real and V8086 mode or when not using a
- *  64-bit code segment when in long mode (applicable to all VMX instructions
- *  except VMCALL).
- */
-#define IEMOP_HLP_VMX_INSTR(a_szInstr, a_InsDiagPrefix) \
+ * 64-bit code segment when in long mode (applicable to all VMX instructions
+ * except VMCALL).
+ *
+ * @todo r=bird: This is not recompiler friendly. The scenario with
+ *       16-bit/32-bit code running in long mode doesn't fit at all.
+ */
+# define IEMOP_HLP_VMX_INSTR(a_szInstr, a_InsDiagPrefix) \
     do \
     { \
@@ -318 +321 @@
                 pVCpu->cpum.GstCtx.hwvirt.vmx.enmDiag = a_InsDiagPrefix##_LongModeCS; \
                 Log5((a_szInstr ": Long mode without 64-bit code segment -> #UD\n")); \
-                IEMOP_RAISE_INVALID_OPCODE_RET(); \
+                IEMOP_RAISE_INVALID_OPCODE_RUNTIME_RET(); /** @todo This doesn't work. */ \
             } \
         } \
@@ -340 +343 @@
             pVCpu->cpum.GstCtx.hwvirt.vmx.enmDiag = a_InsDiagPrefix##_VmxRoot; \
             Log5((a_szInstr ": Not in VMX operation (root mode) -> #UD\n")); \
-            IEMOP_RAISE_INVALID_OPCODE_RET(); \
+            IEMOP_RAISE_INVALID_OPCODE_RUNTIME_RET(); /** @todo This doesn't work. */ \
         } \
     } while (0)