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/tilegx | |
| parent | f67c9b693ae3d03305162623a043ba4067a3c00c (diff) | |
| parent | 07ea28b41830f946de3841b0ac61a3413679feb9 (diff) | |
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/tilegx')
| -rw-r--r-- | target/tilegx/translate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/tilegx/translate.c b/target/tilegx/translate.c index 6c53c5e767..f201150fc7 100644 --- a/target/tilegx/translate.c +++ b/target/tilegx/translate.c @@ -2362,7 +2362,7 @@ static void translate_one_bundle(DisasContext *dc, uint64_t bundle) tcg_temp_free_i64(next); } tcg_temp_free_i64(dc->jmp.dest); - tcg_gen_exit_tb(0); + tcg_gen_exit_tb(NULL, 0); dc->exit_tb = true; } else if (dc->atomic_excp != TILEGX_EXCP_NONE) { gen_exception(dc, dc->atomic_excp); @@ -2419,7 +2419,7 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb) || tcg_op_buf_full()) { /* Ending the TB due to TB size or page boundary. Set PC. */ tcg_gen_movi_tl(cpu_pc, dc->pc); - tcg_gen_exit_tb(0); + tcg_gen_exit_tb(NULL, 0); break; } } |