Changeset 100810 in vbox for trunk/src/VBox/VMM/include/IEMInline.h

Timestamp:

Aug 5, 2023 9:38:20 AM (16 months ago)

Author:

vboxsync

Message:

VMM/IEM: Corrected flat-32-bit mode detection. Clear rcPassUp at the end of iemExecStatusCodeFiddling. bugref:10369

File:

• trunk/src/VBox/VMM/include/IEMInline.h (modified) (3 diffs)

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

@@ -123 +123 @@
     }
 
+    /* Just clear it here as well. */
+    pVCpu->iem.s.rcPassUp = VINF_SUCCESS;
+
     return rcStrict;
 }
@@ -184 +187 @@
 {
     AssertCompile(X86_SEL_TYPE_DOWN == X86_SEL_TYPE_CONF);
-    return (  (  pVCpu->cpum.GstCtx.es.Attr.u
+    return (  (    pVCpu->cpum.GstCtx.es.Attr.u
                  | pVCpu->cpum.GstCtx.cs.Attr.u
                  | pVCpu->cpum.GstCtx.ss.Attr.u
                  | pVCpu->cpum.GstCtx.ds.Attr.u)
-              & (X86_SEL_TYPE_ACCESSED | X86_SEL_TYPE_DOWN | X86DESCATTR_UNUSABLE | X86DESCATTR_G | X86DESCATTR_D | X86DESCATTR_P))
-           ==   (X86_SEL_TYPE_ACCESSED | X86_SEL_TYPE_DOWN | X86DESCATTR_UNUSABLE | X86DESCATTR_G | X86DESCATTR_D | X86DESCATTR_P)
+              & (X86_SEL_TYPE_ACCESSED | X86DESCATTR_G | X86DESCATTR_D | X86DESCATTR_P | X86_SEL_TYPE_DOWN | X86DESCATTR_UNUSABLE))
+           ==   (X86_SEL_TYPE_ACCESSED | X86DESCATTR_G | X86DESCATTR_D | X86DESCATTR_P)
         &&    (  (pVCpu->cpum.GstCtx.es.u32Limit + 1)
                | (pVCpu->cpum.GstCtx.cs.u32Limit + 1)
@@ -219 +222 @@
 {
     AssertCompile(X86_SEL_TYPE_DOWN == X86_SEL_TYPE_CONF);
-    return (  (  pVCpu->cpum.GstCtx.es.Attr.u
+    return (  (    pVCpu->cpum.GstCtx.es.Attr.u
                  | pVCpu->cpum.GstCtx.ds.Attr.u)
-              & (X86_SEL_TYPE_ACCESSED | X86_SEL_TYPE_DOWN | X86DESCATTR_UNUSABLE | X86DESCATTR_G | X86DESCATTR_D | X86DESCATTR_P))
-           ==   (X86_SEL_TYPE_ACCESSED | X86_SEL_TYPE_DOWN | X86DESCATTR_UNUSABLE | X86DESCATTR_G | X86DESCATTR_D | X86DESCATTR_P)
+              & (X86_SEL_TYPE_ACCESSED | X86DESCATTR_G | X86DESCATTR_D | X86DESCATTR_P | X86_SEL_TYPE_DOWN | X86DESCATTR_UNUSABLE))
+           ==   (X86_SEL_TYPE_ACCESSED | X86DESCATTR_G | X86DESCATTR_D | X86DESCATTR_P)
         &&    (  (pVCpu->cpum.GstCtx.es.u32Limit + 1)
                | (pVCpu->cpum.GstCtx.ds.u32Limit + 1))