target/i386: fix stack size when delivering real mode interrupts
The stack can be 32-bit even in real mode, and in this case the stack pointer must be updated in its entirety rather than just the bottom 16 bits. The same is true of real mode IRET, for which there was even a comment suggesting the right thing to do. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1506 Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
9c3afb9d9b
commit
106d766c9d
1 changed files with 2 additions and 2 deletions
|
|
@ -1161,7 +1161,7 @@ static void do_interrupt_real(CPUX86State *env, int intno, int is_int,
|
|||
sa.env = env;
|
||||
sa.ra = 0;
|
||||
sa.sp = env->regs[R_ESP];
|
||||
sa.sp_mask = 0xffff;
|
||||
sa.sp_mask = get_sp_mask(env->segs[R_SS].flags);
|
||||
sa.ss_base = env->segs[R_SS].base;
|
||||
sa.mmu_index = x86_mmu_index_pl(env, 0);
|
||||
|
||||
|
|
@ -1964,7 +1964,7 @@ void helper_iret_real(CPUX86State *env, int shift)
|
|||
sa.env = env;
|
||||
sa.ra = GETPC();
|
||||
sa.mmu_index = x86_mmu_index_pl(env, 0);
|
||||
sa.sp_mask = 0xffff; /* XXXX: use SS segment size? */
|
||||
sa.sp_mask = get_sp_mask(env->segs[R_SS].flags);
|
||||
sa.sp = env->regs[R_ESP];
|
||||
sa.ss_base = env->segs[R_SS].base;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue