diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2014-05-20 14:48:45 +0400 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2014-07-03 16:31:29 -0500 |
| commit | 26b51027f9b658f28c9f1c90f8b0eb342ca42ab4 (patch) | |
| tree | c4cea3dafa16101a81388d99b8ba170b6850f498 | |
| parent | 44564f82264447979f774039f73b9343fb505127 (diff) | |
| download | qemu-26b51027f9b658f28c9f1c90f8b0eb342ca42ab4.zip qemu-26b51027f9b658f28c9f1c90f8b0eb342ca42ab4.tar.gz qemu-26b51027f9b658f28c9f1c90f8b0eb342ca42ab4.tar.bz2 | |
target-xtensa: fix cross-page jumps/calls at the end of TB
Use tb->pc instead of dc->pc to check for cross-page jumps.
When TB translation stops at the page boundary dc->pc points to the next
page allowing chaining to TBs in it, which is wrong.
Cc: qemu-stable@nongnu.org
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
(cherry picked from commit 433d33c555deeed375996e338df1a9510df401c6)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | target-xtensa/translate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 2d2df33..7d34326 100644 --- a/target-xtensa/translate.c +++ b/target-xtensa/translate.c @@ -414,7 +414,7 @@ static void gen_jump(DisasContext *dc, TCGv dest) static void gen_jumpi(DisasContext *dc, uint32_t dest, int slot) { TCGv_i32 tmp = tcg_const_i32(dest); - if (((dc->pc ^ dest) & TARGET_PAGE_MASK) != 0) { + if (((dc->tb->pc ^ dest) & TARGET_PAGE_MASK) != 0) { slot = -1; } gen_jump_slot(dc, tmp, slot); @@ -442,7 +442,7 @@ static void gen_callw(DisasContext *dc, int callinc, TCGv_i32 dest) static void gen_callwi(DisasContext *dc, int callinc, uint32_t dest, int slot) { TCGv_i32 tmp = tcg_const_i32(dest); - if (((dc->pc ^ dest) & TARGET_PAGE_MASK) != 0) { + if (((dc->tb->pc ^ dest) & TARGET_PAGE_MASK) != 0) { slot = -1; } gen_callw_slot(dc, callinc, tmp, slot); |