diff options
| author | Richard Henderson <rth@twiddle.net> | 2017-04-30 13:32:10 +0200 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2017-06-05 09:25:42 -0700 |
| commit | 6350001e831defb5ede5337baaa7dc4a730c1508 (patch) | |
| tree | dd05a1342d59dfa40bd0cbf956a36d493f4733b4 | |
| parent | 5786e0683c4f8170dd05a550814b8809d8ae6d86 (diff) | |
| download | focaccia-qemu-6350001e831defb5ede5337baaa7dc4a730c1508.tar.gz focaccia-qemu-6350001e831defb5ede5337baaa7dc4a730c1508.zip | |
target/s390: Use tcg_gen_lookup_and_goto_ptr
Tested-by: Aurelien Jarno <aurelien@aurel32.net> Reviewed-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | target/s390x/translate.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 4c48c593cd..628fb8685d 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -608,11 +608,16 @@ static void gen_op_calc_cc(DisasContext *s) set_cc_static(s); } -static int use_goto_tb(DisasContext *s, uint64_t dest) +static bool use_exit_tb(DisasContext *s) { - if (unlikely(s->singlestep_enabled) || - (s->tb->cflags & CF_LAST_IO) || - (s->tb->flags & FLAG_MASK_PER)) { + return (s->singlestep_enabled || + (s->tb->cflags & CF_LAST_IO) || + (s->tb->flags & FLAG_MASK_PER)); +} + +static bool use_goto_tb(DisasContext *s, uint64_t dest) +{ + if (unlikely(use_exit_tb(s))) { return false; } #ifndef CONFIG_USER_ONLY @@ -5461,8 +5466,10 @@ void gen_intermediate_code(CPUS390XState *env, struct TranslationBlock *tb) /* Exit the TB, either by raising a debug exception or by return. */ if (do_debug) { gen_exception(EXCP_DEBUG); - } else { + } else if (use_exit_tb(&dc)) { tcg_gen_exit_tb(0); + } else { + tcg_gen_lookup_and_goto_ptr(psw_addr); } break; default: |