ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/i386/tcg: use PUSHL/PUSHW for error code 

Do not pre-decrement esp, let the macros subtract the appropriate
operand size.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-06-18 09:28:22 +02:00
parent 0bd385e7e3
commit 312ef3243e
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/i386/tcg/seg_helper.c
View File

@ -670,22 +670,20 @@ static void do_interrupt_protected(CPUX86State *env, int intno, int is_int,
} }
shift = switch_tss(env, intno * 8, e1, e2, SWITCH_TSS_CALL, old_eip); shift = switch_tss(env, intno * 8, e1, e2, SWITCH_TSS_CALL, old_eip);
if (has_error_code) { if (has_error_code) {
uint32_t mask;
/* push the error code */ /* push the error code */
if (env->segs[R_SS].flags & DESC_B_MASK) { if (env->segs[R_SS].flags & DESC_B_MASK) {
mask = 0xffffffff; sp_mask = 0xffffffff;
} else { } else {
mask = 0xffff; sp_mask = 0xffff;
} }
esp = (env->regs[R_ESP] - (2 << shift)) & mask; esp = env->regs[R_ESP];
ssp = env->segs[R_SS].base + esp; ssp = env->segs[R_SS].base;
if (shift) { if (shift) {
cpu_stl_kernel(env, ssp, error_code); PUSHL(ssp, esp, sp_mask, error_code);
} else { } else {
cpu_stw_kernel(env, ssp, error_code); PUSHW(ssp, esp, sp_mask, error_code);
} }
SET_ESP(esp, mask); SET_ESP(esp, sp_mask);
} }
return; return;
} }