]> git.ipfire.org Git - thirdparty/qemu.git/commit
target/i386: Do not re-compute new pc with CF_PCREL
authorRichard Henderson <richard.henderson@linaro.org>
Mon, 1 Jan 2024 23:06:17 +0000 (10:06 +1100)
committerMichael Tokarev <mjt@tls.msk.ru>
Sat, 20 Jan 2024 09:24:14 +0000 (12:24 +0300)
commit99e32260ac203040ea1f9c1c2930298ab1dee9cf
tree54d5bf82cdc1d5ce980b518a6a7f0108bec2da8d
parent357b5990284107dfa36d234e3dcbf77e0e1367e0
target/i386: Do not re-compute new pc with CF_PCREL

With PCREL, we have a page-relative view of EIP, and an
approximation of PC = EIP+CSBASE that is good enough to
detect page crossings.  If we try to recompute PC after
masking EIP, we will mess up that approximation and write
a corrupt value to EIP.

We already handled masking properly for PCREL, so the
fix in b5e0d5d2 was only needed for the !PCREL path.

Cc: qemu-stable@nongnu.org
Fixes: b5e0d5d22fbf ("target/i386: Fix 32-bit wrapping of pc/eip computation")
Fixes: 5b2fd6cf3735 (b5e0d5d22fbf in 8.1.4)
Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240101230617.129349-1-richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit a58506b748b8988a95f4fa1a2420ac5c17038b30)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
target/i386/tcg/translate.c