Changeset 102351 in vbox

Timestamp:

Nov 27, 2023 9:34:29 PM (12 months ago)

Author:

vboxsync

Message:

VMM/IEM: IEM_MC_FETCH_MEM_FLAT_U8, IEM_MC_FETCH_MEM_FLAT_U16, IEM_MC_FETCH_MEM_FLAT_U32 and IEM_MC_FETCH_MEM_FLAT_U64. bugref:10371

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAllN8vePython.py (modified) (2 diffs)
• IEMAllN8veRecompiler.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllN8vePython.py

@@ -117 +117 @@
     'IEM_MC_FETCH_MEM_FLAT_U16_SX_U32':                          (None, True,  False, ),
     'IEM_MC_FETCH_MEM_FLAT_U16_SX_U64':                          (None, True,  False, ),
-    'IEM_MC_FETCH_MEM_FLAT_U16':                                 (None, True,  False, ),
+    'IEM_MC_FETCH_MEM_FLAT_U16':                                 (None, True,  True,  ),
     'IEM_MC_FETCH_MEM_FLAT_U16_ZX_U32':                          (None, True,  False, ),
     'IEM_MC_FETCH_MEM_FLAT_U16_ZX_U64':                          (None, True,  False, ),
@@ -125 +125 @@
     'IEM_MC_FETCH_MEM_FLAT_U32_DISP':                            (None, True,  False, ),
     'IEM_MC_FETCH_MEM_FLAT_U32_SX_U64':                          (None, True,  False, ),
-    'IEM_MC_FETCH_MEM_FLAT_U32':                                 (None, True,  False, ),
+    'IEM_MC_FETCH_MEM_FLAT_U32':                                 (None, True,  True,  ),
     'IEM_MC_FETCH_MEM_FLAT_U32_ZX_U64':                          (None, True,  False, ),
-    'IEM_MC_FETCH_MEM_FLAT_U64':                                 (None, True,  False, ),
+    'IEM_MC_FETCH_MEM_FLAT_U64':                                 (None, True,  True,  ),
     'IEM_MC_FETCH_MEM_FLAT_U8_SX_U16':                           (None, True,  False, ),
     'IEM_MC_FETCH_MEM_FLAT_U8_SX_U32':                           (None, True,  False, ),
     'IEM_MC_FETCH_MEM_FLAT_U8_SX_U64':                           (None, True,  False, ),
-    'IEM_MC_FETCH_MEM_FLAT_U8':                                  (None, True,  False, ),
+    'IEM_MC_FETCH_MEM_FLAT_U8':                                  (None, True,  True,  ),
     'IEM_MC_FETCH_MEM_FLAT_U8_ZX_U16':                           (None, True,  False, ),
     'IEM_MC_FETCH_MEM_FLAT_U8_ZX_U32':                           (None, True,  False, ),

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

@@ -7533 +7533 @@
     off = iemNativeEmitMemFetchDataCommon(pReNative, off, pCallEntry->idxInstr, a_u64Dst, a_iSeg, a_GCPtrMem, sizeof(uint64_t))
 
-/** Emits code for IEM_MC_FETCH_MEM_U8/16/32/64. */
+
+#define IEM_MC_FETCH_MEM_FLAT_U8(a_u8Dst, a_GCPtrMem) \
+    off = iemNativeEmitMemFetchDataCommon(pReNative, off, pCallEntry->idxInstr, a_u8Dst, UINT8_MAX, a_GCPtrMem, sizeof(uint8_t))
+
+#define IEM_MC_FETCH_MEM_FLAT_U16(a_u16Dst, a_GCPtrMem) \
+    off = iemNativeEmitMemFetchDataCommon(pReNative, off, pCallEntry->idxInstr, a_u16Dst, UINT8_MAX, a_GCPtrMem, sizeof(uint16_t))
+
+#define IEM_MC_FETCH_MEM_FLAT_U32(a_u32Dst, a_GCPtrMem) \
+    off = iemNativeEmitMemFetchDataCommon(pReNative, off, pCallEntry->idxInstr, a_u32Dst, UINT8_MAX, a_GCPtrMem, sizeof(uint32_t))
+
+#define IEM_MC_FETCH_MEM_FLAT_U64(a_u64Dst, a_GCPtrMem) \
+    off = iemNativeEmitMemFetchDataCommon(pReNative, off, pCallEntry->idxInstr, a_u64Dst, UINT8_MAX, a_GCPtrMem, sizeof(uint64_t))
+
+
+/** Emits code for IEM_MC_FETCH_MEM_U8/16/32/64 and
+ *  IEM_MC_FETCH_MEM_FLAT_U8/16/32/64 (iSegReg = UINT8_MAX). */
 DECL_INLINE_THROW(uint32_t)
 iemNativeEmitMemFetchDataCommon(PIEMRECOMPILERSTATE pReNative, uint32_t off, uint8_t idxInstr,
@@ -7543 +7558 @@
                || pReNative->Core.aVars[idxVarGCPtrMem].enmKind == kIemNativeVarKind_Stack,
                IEMNATIVE_DO_LONGJMP(pReNative, VERR_IEM_VAR_UNEXPECTED_KIND));
-    Assert(iSegReg < 6);
+    Assert(iSegReg < 6 || iSegReg == UINT8_MAX);
     Assert(cbMem == 1 || cbMem == 2 || cbMem == 4 || cbMem == 8);
     RT_NOREF(idxInstr);
@@ -7600 +7615 @@
             || (pReNative->fExec & IEM_F_MODE_MASK) == IEM_F_MODE_X86_32BIT_PROT_FLAT
             || (pReNative->fExec & IEM_F_MODE_MASK) == IEM_F_MODE_X86_32BIT_FLAT)
-        && (   iSegReg == X86_SREG_DS
+        && (   iSegReg == UINT8_MAX
+            || iSegReg == X86_SREG_DS
             || iSegReg == X86_SREG_ES
             || iSegReg == X86_SREG_SS
@@ -7620 +7636 @@
     else
     {
+        AssertStmt(iSegReg < 6, IEMNATIVE_DO_LONGJMP(pReNative, VERR_IEM_EMIT_BAD_SEG_REG_NO));
         AssertCompile(IEMNATIVE_CALL_ARG_GREG_COUNT >= 3);
         switch (cbMem)