[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/13] target/i386/tcg: use PUSHL/PUSHW for error code
From: |
Paolo Bonzini |
Subject: |
[PULL 04/13] target/i386/tcg: use PUSHL/PUSHW for error code |
Date: |
Sun, 14 Jul 2024 13:10:34 +0200 |
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>
---
target/i386/tcg/seg_helper.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c
index 224e73e9ed0..b985382d704 100644
--- a/target/i386/tcg/seg_helper.c
+++ b/target/i386/tcg/seg_helper.c
@@ -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);
if (has_error_code) {
- uint32_t mask;
-
/* push the error code */
if (env->segs[R_SS].flags & DESC_B_MASK) {
- mask = 0xffffffff;
+ sp_mask = 0xffffffff;
} else {
- mask = 0xffff;
+ sp_mask = 0xffff;
}
- esp = (env->regs[R_ESP] - (2 << shift)) & mask;
- ssp = env->segs[R_SS].base + esp;
+ esp = env->regs[R_ESP];
+ ssp = env->segs[R_SS].base;
if (shift) {
- cpu_stl_kernel(env, ssp, error_code);
+ PUSHL(ssp, esp, sp_mask, error_code);
} 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;
}
--
2.45.2
- [PULL 00/13] target/i386 changes for 2024-07-12, Paolo Bonzini, 2024/07/14
- [PULL 03/13] target/i386/tcg: Allow IRET from user mode to user mode with SMAP, Paolo Bonzini, 2024/07/14
- [PULL 01/13] target/i386/tcg: fix POP to memory in long mode, Paolo Bonzini, 2024/07/14
- [PULL 02/13] target/i386/tcg: Remove SEG_ADDL, Paolo Bonzini, 2024/07/14
- [PULL 04/13] target/i386/tcg: use PUSHL/PUSHW for error code,
Paolo Bonzini <=
- [PULL 05/13] target/i386/tcg: Reorg push/pop within seg_helper.c, Paolo Bonzini, 2024/07/14
- [PULL 06/13] target/i386/tcg: Introduce x86_mmu_index_{kernel_,}pl, Paolo Bonzini, 2024/07/14
- [PULL 07/13] target/i386/tcg: Compute MMU index once, Paolo Bonzini, 2024/07/14
- [PULL 08/13] target/i386/tcg: Use DPL-level accesses for interrupts and call gates, Paolo Bonzini, 2024/07/14
- [PULL 09/13] target/i386/tcg: check for correct busy state before switching to a new task, Paolo Bonzini, 2024/07/14
- [PULL 10/13] target/i386/tcg: use X86Access for TSS access, Paolo Bonzini, 2024/07/14
- [PULL 11/13] target/i386/tcg: save current task state before loading new one, Paolo Bonzini, 2024/07/14
- [PULL 13/13] Revert "qemu-char: do not operate on sources from finalize callbacks", Paolo Bonzini, 2024/07/14
- [PULL 12/13] i386/sev: Don't allow automatic fallback to legacy KVM_SEV*_INIT, Paolo Bonzini, 2024/07/14
- Re: [PULL 00/13] target/i386 changes for 2024-07-12, Richard Henderson, 2024/07/14