From: Richard Henderson Date: Fri, 8 Mar 2019 18:49:57 +0000 (-0800) Subject: target/hppa: Check for page crossings in use_goto_tb X-Git-Tag: v4.0.0-rc0~27^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3b423ec6ee4123fedbb74db517262dd14fa4d73;p=thirdparty%2Fqemu.git target/hppa: Check for page crossings in use_goto_tb We got away with eliding this check when target/hppa was user-only, but missed adding this check when adding system support. Fixes an early crash in the HP-UX 11 installer. Reported-by: Sven Schnelle Signed-off-by: Richard Henderson --- diff --git a/target/hppa/translate.c b/target/hppa/translate.c index dc5636fe943..6c815e05c26 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -816,12 +816,10 @@ static bool gen_illegal(DisasContext *ctx) static bool use_goto_tb(DisasContext *ctx, target_ureg dest) { - /* Suppress goto_tb in the case of single-steping and IO. */ - if ((tb_cflags(ctx->base.tb) & CF_LAST_IO) - || ctx->base.singlestep_enabled) { - return false; - } - return true; + /* Suppress goto_tb for page crossing, IO, or single-steping. */ + return !(((ctx->base.pc_first ^ dest) & TARGET_PAGE_MASK) + || (tb_cflags(ctx->base.tb) & CF_LAST_IO) + || ctx->base.singlestep_enabled); } /* If the next insn is to be nullified, and it's on the same page,