diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2018-05-30 18:06:23 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2018-06-01 15:15:27 -0700 |
| commit | 07ea28b41830f946de3841b0ac61a3413679feb9 (patch) | |
| tree | 42c4837f1a3f06b76291c9cf8412914d2c27c346 /target/s390x | |
| parent | 392fba9f583223786f844dce9b2e7f9a0ce0147a (diff) | |
| download | qemu-07ea28b41830f946de3841b0ac61a3413679feb9.zip qemu-07ea28b41830f946de3841b0ac61a3413679feb9.tar.gz qemu-07ea28b41830f946de3841b0ac61a3413679feb9.tar.bz2 | |
tcg: Pass tb and index to tcg_gen_exit_tb separately
Do the cast to uintptr_t within the helper, so that the compiler
can type check the pointer argument. We can also do some more
sanity checking of the index argument.
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/s390x')
| -rw-r--r-- | target/s390x/translate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 82309fa..fdfec7f 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1159,7 +1159,7 @@ static DisasJumpType help_goto_direct(DisasContext *s, uint64_t dest) per_breaking_event(s); tcg_gen_goto_tb(0); tcg_gen_movi_i64(psw_addr, dest); - tcg_gen_exit_tb((uintptr_t)s->base.tb); + tcg_gen_exit_tb(s->base.tb, 0); return DISAS_GOTO_TB; } else { tcg_gen_movi_i64(psw_addr, dest); @@ -1220,14 +1220,14 @@ static DisasJumpType help_branch(DisasContext *s, DisasCompare *c, /* Branch not taken. */ tcg_gen_goto_tb(0); tcg_gen_movi_i64(psw_addr, s->pc_tmp); - tcg_gen_exit_tb((uintptr_t)s->base.tb + 0); + tcg_gen_exit_tb(s->base.tb, 0); /* Branch taken. */ gen_set_label(lab); per_breaking_event(s); tcg_gen_goto_tb(1); tcg_gen_movi_i64(psw_addr, dest); - tcg_gen_exit_tb((uintptr_t)s->base.tb + 1); + tcg_gen_exit_tb(s->base.tb, 1); ret = DISAS_GOTO_TB; } else { @@ -1250,7 +1250,7 @@ static DisasJumpType help_branch(DisasContext *s, DisasCompare *c, update_cc_op(s); tcg_gen_goto_tb(0); tcg_gen_movi_i64(psw_addr, s->pc_tmp); - tcg_gen_exit_tb((uintptr_t)s->base.tb + 0); + tcg_gen_exit_tb(s->base.tb, 0); gen_set_label(lab); if (is_imm) { @@ -6240,7 +6240,7 @@ static void s390x_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) gen_exception(EXCP_DEBUG); } else if (use_exit_tb(dc) || dc->base.is_jmp == DISAS_PC_STALE_NOCHAIN) { - tcg_gen_exit_tb(0); + tcg_gen_exit_tb(NULL, 0); } else { tcg_gen_lookup_and_goto_ptr(); } |