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

Timestamp:

Dec 3, 2023 12:06:50 PM (16 months ago)

Author:

vboxsync

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

160582

Message:

VMM/IEM: Simplified mem segmentation assertions as they didn't take address prefix bytes into account and would fire incorrectly during syslinux and such. bugref:10371

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllN8veRecompiler.cpp (modified) (2 diffs)

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

@@ -8204 +8204 @@
     AssertCompile(IEMNATIVE_CALL_ARG_GREG_COUNT >= 4);
 #ifdef VBOX_STRICT
-    if (   (   (pReNative->fExec & IEM_F_MODE_MASK) == IEM_F_MODE_X86_64BIT
-            || (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 == UINT8_MAX
-            || iSegReg == X86_SREG_DS
-            || iSegReg == X86_SREG_ES
-            || iSegReg == X86_SREG_SS
-            || (iSegReg == X86_SREG_CS && (pReNative->fExec & IEM_F_MODE_MASK) == IEM_F_MODE_X86_64BIT) ))
-    {
-        Assert(iSegReg == UINT8_MAX);
+    if (iSegReg == UINT8_MAX)
+    {
+        Assert(   (pReNative->fExec & IEM_F_MODE_MASK) == IEM_F_MODE_X86_64BIT
+               || (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);
         switch (cbMem)
         {
@@ -8762 +8757 @@
          ? (uintptr_t)RT_CONCAT(a_fnBase,Ro) : (uintptr_t)RT_CONCAT(a_fnBase,Wo) )
 
-    if (   (   (pReNative->fExec & IEM_F_MODE_MASK) == IEM_F_MODE_X86_64BIT
-            || (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 == UINT8_MAX
-            || iSegReg == X86_SREG_DS
-            || iSegReg == X86_SREG_ES
-            || iSegReg == X86_SREG_SS
-            || (iSegReg == X86_SREG_CS && (pReNative->fExec & IEM_F_MODE_MASK) == IEM_F_MODE_X86_64BIT) ))
-    {
-        Assert(iSegReg == UINT8_MAX);
+    if (iSegReg == UINT8_MAX)
+    {
+        Assert(   (pReNative->fExec & IEM_F_MODE_MASK) == IEM_F_MODE_X86_64BIT
+               || (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);
         switch (cbMem)
         {