diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-04 11:28:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-04 11:28:31 +0100 |
| commit | 163670542fa3b33dbf0332b1e5d47c8d16393d42 (patch) | |
| tree | 5e587cf0650eee6bed5a0f27a84088cca3db2270 /target/mips/translate.c | |
| parent | f67c9b693ae3d03305162623a043ba4067a3c00c (diff) | |
| parent | 07ea28b41830f946de3841b0ac61a3413679feb9 (diff) | |
| download | qemu-163670542fa3b33dbf0332b1e5d47c8d16393d42.zip qemu-163670542fa3b33dbf0332b1e5d47c8d16393d42.tar.gz qemu-163670542fa3b33dbf0332b1e5d47c8d16393d42.tar.bz2 | |
Merge remote-tracking branch 'remotes/rth/tags/tcg-next-pull-request' into staging
tcg-next queue
# gpg: Signature made Sat 02 Jun 2018 00:12:42 BST
# gpg: using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/tcg-next-pull-request:
tcg: Pass tb and index to tcg_gen_exit_tb separately
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/mips/translate.c')
| -rw-r--r-- | target/mips/translate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/mips/translate.c b/target/mips/translate.c index e88f983..e57d71e 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -4291,7 +4291,7 @@ static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest) if (use_goto_tb(ctx, dest)) { tcg_gen_goto_tb(n); gen_save_pc(dest); - tcg_gen_exit_tb((uintptr_t)ctx->base.tb + n); + tcg_gen_exit_tb(ctx->base.tb, n); } else { gen_save_pc(dest); if (ctx->base.singlestep_enabled) { @@ -20344,7 +20344,7 @@ static void mips_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) gen_goto_tb(ctx, 0, ctx->base.pc_next); break; case DISAS_EXIT: - tcg_gen_exit_tb(0); + tcg_gen_exit_tb(NULL, 0); break; case DISAS_NORETURN: break; |