Commit d7f425fd authored by Richard Henderson's avatar Richard Henderson
Browse files

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: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 77f7c747

accel/tcg/cpu-exec.c

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static inline TranslationBlock *tb_find(CPUState *cpu, 
    }

#endif

    /* See if we can patch the calling TB. */

    if (last_tb && !qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) {

    if (last_tb) {

        tb_add_jump(last_tb, tb_exit, tb);

    }

    return tb;

tcg/tcg-op.c

+8 −1
Original line number Diff line number Diff line
@@ -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,8 +2607,11 @@ 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

    /* 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)

{