summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target-i386/helper.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c
index fd04430461..c41cbb7278 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -2012,7 +2012,6 @@ static inline void helper_ret_protected(int shift, int is_iret, int addend)
#endif
sp_mask = get_sp_mask(env->segs[R_SS].flags);
sp = ESP;
- /* XXX: ssp is zero in 64 bit ? */
ssp = env->segs[R_SS].base;
new_eflags = 0; /* avoid warning */
#ifdef TARGET_X86_64
@@ -2145,7 +2144,7 @@ static inline void helper_ret_protected(int shift, int is_iret, int addend)
cpu_x86_set_cpl(env, rpl);
sp = new_esp;
#ifdef TARGET_X86_64
- if (shift == 2)
+ if (env->hflags & HF_CS64_MASK)
sp_mask = -1;
else
#endif