diff options
| author | Peter Maydell | 2018-06-04 12:28:31 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-04 12:28:31 +0200 |
| commit | 163670542fa3b33dbf0332b1e5d47c8d16393d42 (patch) | |
| tree | 5e587cf0650eee6bed5a0f27a84088cca3db2270 /include | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | tcg: Pass tb and index to tcg_gen_exit_tb separately (diff) | |
| download | qemu-163670542fa3b33dbf0332b1e5d47c8d16393d42.tar.gz qemu-163670542fa3b33dbf0332b1e5d47c8d16393d42.tar.xz qemu-163670542fa3b33dbf0332b1e5d47c8d16393d42.zip | |
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 'include')
| -rw-r--r-- | include/exec/gen-icount.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index 54aaa61d65..24f7991781 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -52,7 +52,7 @@ static inline void gen_tb_end(TranslationBlock *tb, int num_insns) } gen_set_label(tcg_ctx->exitreq_label); - tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_REQUESTED); + tcg_gen_exit_tb(tb, TB_EXIT_REQUESTED); } static inline void gen_io_start(void) |