diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2024-06-06 10:53:19 +0100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2024-06-11 10:02:23 +0300 |
| commit | afb890bf17b89f48285fac518a5d2bc849409c95 (patch) | |
| tree | f26f20c278595f862f5324bef82e6e178bb26098 | |
| parent | f48ba9b0859a18ded28335b772cc7da4c2e08d12 (diff) | |
| download | qemu-afb890bf17b89f48285fac518a5d2bc849409c95.zip qemu-afb890bf17b89f48285fac518a5d2bc849409c95.tar.gz qemu-afb890bf17b89f48285fac518a5d2bc849409c95.tar.bz2 | |
target/i386: fix size of EBP writeback in gen_enter()
The calculation of FrameTemp is done using the size indicated by mo_pushpop()
before being written back to EBP, but the final writeback to EBP is done using
the size indicated by mo_stacksize().
In the case where mo_pushpop() is MO_32 and mo_stacksize() is MO_16 then the
final writeback to EBP is done using MO_16 which can leave junk in the top
16-bits of EBP after executing ENTER.
Change the writeback of EBP to use the same size indicated by mo_pushpop() to
ensure that the full value is written back.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2198
Message-ID: <20240606095319.229650-5-mark.cave-ayland@ilande.co.uk>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 3973615e7fbaeef1deeaa067577e373781ced70a)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | target/i386/tcg/translate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 417bc26..8eb6a97 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2696,7 +2696,7 @@ static void gen_enter(DisasContext *s, int esp_addend, int level) } /* Copy the FrameTemp value to EBP. */ - gen_op_mov_reg_v(s, a_ot, R_EBP, s->T1); + gen_op_mov_reg_v(s, d_ot, R_EBP, s->T1); /* Compute the final value of ESP. */ tcg_gen_subi_tl(s->T1, s->T1, esp_addend + size * level); |