From: Max Filippov Date: Tue, 20 May 2014 10:48:45 +0000 (+0400) Subject: target-xtensa: fix cross-page jumps/calls at the end of TB X-Git-Tag: v1.7.2~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26b51027f9b658f28c9f1c90f8b0eb342ca42ab4;p=thirdparty%2Fqemu.git 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 (cherry picked from commit 433d33c555deeed375996e338df1a9510df401c6) Signed-off-by: Michael Roth --- diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c index 2d2df33115f..7d34326417f 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);