diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2018-10-06 09:05:30 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2018-10-18 18:58:10 -0700 |
| commit | d7f425fdea991f052241c6479acd9feae834063b (patch) | |
| tree | 02fecbecf11af94168af50acfd5ece68cb4abd54 /tcg/tcg-op.c | |
| parent | 77f7c747193662edfadeeb3118d63eed0eac51a6 (diff) | |
| download | qemu-d7f425fdea991f052241c6479acd9feae834063b.zip qemu-d7f425fdea991f052241c6479acd9feae834063b.tar.gz qemu-d7f425fdea991f052241c6479acd9feae834063b.tar.bz2 | |
tcg: Implement CPU_LOG_TB_NOCHAIN during expansion
Rather than test NOCHAIN before linking, do not emit the
goto_tb opcode at all. We already do this for goto_ptr.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'tcg/tcg-op.c')
| -rw-r--r-- | tcg/tcg-op.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index daa416a..7a8015c 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -2586,6 +2586,10 @@ void tcg_gen_exit_tb(TranslationBlock *tb, unsigned idx) seen this numbered exit before, via tcg_gen_goto_tb. */ tcg_debug_assert(tcg_ctx->goto_tb_issue_mask & (1 << idx)); #endif + /* When not chaining, exit without indicating a link. */ + if (qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { + val = 0; + } } else { /* This is an exit via the exitreq label. */ tcg_debug_assert(idx == TB_EXIT_REQUESTED); @@ -2603,7 +2607,10 @@ void tcg_gen_goto_tb(unsigned idx) tcg_debug_assert((tcg_ctx->goto_tb_issue_mask & (1 << idx)) == 0); tcg_ctx->goto_tb_issue_mask |= 1 << idx; #endif - tcg_gen_op1i(INDEX_op_goto_tb, idx); + /* When not chaining, we simply fall through to the "fallback" exit. */ + if (!qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { + tcg_gen_op1i(INDEX_op_goto_tb, idx); + } } void tcg_gen_lookup_and_goto_ptr(void) |