mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-xtensa: fix cross-page jumps/calls at the end of TB

Browse Source 
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>
This commit is contained in:
Max Filippov 2014-05-20 14:48:45 +04:00
parent 178ac111bc
commit 433d33c555
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target-xtensa/translate.c
View File

@ -419,7 +419,7 @@ static void gen_jump(DisasContext *dc, TCGv dest)
static void gen_jumpi(DisasContext *dc, uint32_t dest, int slot) static void gen_jumpi(DisasContext *dc, uint32_t dest, int slot)
{ {
TCGv_i32 tmp = tcg_const_i32(dest); 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; slot = -1;
} }
gen_jump_slot(dc, tmp, slot); gen_jump_slot(dc, tmp, slot);
@ -447,7 +447,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) static void gen_callwi(DisasContext *dc, int callinc, uint32_t dest, int slot)
{ {
TCGv_i32 tmp = tcg_const_i32(dest); 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; slot = -1;
} }
gen_callw_slot(dc, callinc, tmp, slot); gen_callw_slot(dc, callinc, tmp, slot);