Changeset 47324 in vbox for trunk/src/recompiler

Timestamp:

Jul 22, 2013 7:04:41 PM (11 years ago)

Author:

vboxsync

Message:

REM: NULL SS on iret change.

File:

• trunk/src/recompiler/target-i386/op_helper.c (modified) (2 diffs)

trunk/src/recompiler/target-i386/op_helper.c

@@ -3325 +3325 @@
 #ifdef TARGET_X86_64
             /* NULL ss is allowed in long mode if cpl != 3*/
+# ifndef VBOX
             /* XXX: test CS64 ? */
             if ((env->hflags & HF_LMA_MASK) && rpl != 3) {
-# ifdef VBOX
-                if (!(e2 & DESC_A_MASK))
-                    e2 = set_segment_accessed(new_cs, e2);
-# endif
                 cpu_x86_load_seg_cache(env, R_SS, new_ss,
                                        0, 0xffffffff,
@@ -3338 +3335 @@
                 ss_e2 = DESC_B_MASK; /* XXX: should not be needed ? */
             } else
+# else /* VBOX */
+            if ((env->hflags & HF_LMA_MASK) && rpl != 3 && (e2 & DESC_L_MASK)) {
+                if (!(e2 & DESC_A_MASK))
+                    e2 = set_segment_accessed(new_cs, e2);
+                cpu_x86_load_seg_cache(env, R_SS, new_ss,
+                                       0, 0xffffffff,
+                                       DESC_INTEL_UNUSABLE | (rpl << DESC_DPL_SHIFT) );
+                ss_e2 = DESC_B_MASK; /* not really used */
+            } else
+# endif
 #endif
             {