From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zp1Ay-0001FP-JR for qemu-devel@nongnu.org; Wed, 21 Oct 2015 17:44:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zp1Ax-0001QO-HD for qemu-devel@nongnu.org; Wed, 21 Oct 2015 17:44:04 -0400 Received: from mail-qg0-x22b.google.com ([2607:f8b0:400d:c04::22b]:36846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zp1Ax-0001QE-6G for qemu-devel@nongnu.org; Wed, 21 Oct 2015 17:44:03 -0400 Received: by qgad10 with SMTP id d10so40185010qga.3 for ; Wed, 21 Oct 2015 14:44:03 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Wed, 21 Oct 2015 11:42:59 -1000 Message-Id: <1445463779-5823-11-git-send-email-rth@twiddle.net> In-Reply-To: <1445463779-5823-1-git-send-email-rth@twiddle.net> References: <1445463779-5823-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 10/10] cpu-exec: Add "nochain" debug flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Respect it to avoid linking TBs together. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- cpu-exec.c | 3 ++- include/qemu/log.h | 1 + qemu-log.c | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cpu-exec.c b/cpu-exec.c index 8fd56a6..7eef083 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -477,7 +477,8 @@ int cpu_exec(CPUState *cpu) /* see if we can patch the calling TB. When the TB spans two pages, we cannot safely do a direct jump. */ - if (next_tb != 0 && tb->page_addr[1] == -1) { + if (next_tb != 0 && tb->page_addr[1] == -1 + && !qemu_loglevel_mask(CPU_LOG_TB_NOCHAIN)) { tb_add_jump((TranslationBlock *)(next_tb & ~TB_EXIT_MASK), next_tb & TB_EXIT_MASK, tb); } diff --git a/include/qemu/log.h b/include/qemu/log.h index f880e66..7de4500 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -41,6 +41,7 @@ static inline bool qemu_log_enabled(void) #define LOG_UNIMP (1 << 10) #define LOG_GUEST_ERROR (1 << 11) #define CPU_LOG_MMU (1 << 12) +#define CPU_LOG_TB_NOCHAIN (1 << 13) /* Returns true if a bit is set in the current loglevel mask */ diff --git a/qemu-log.c b/qemu-log.c index 13f3813..efd07c8 100644 --- a/qemu-log.c +++ b/qemu-log.c @@ -119,6 +119,9 @@ const QEMULogItem qemu_log_items[] = { { LOG_GUEST_ERROR, "guest_errors", "log when the guest OS does something invalid (eg accessing a\n" "non-existent register)" }, + { CPU_LOG_TB_NOCHAIN, "nochain", + "do not chain compiled TBs so that \"exec\" and \"cpu\" show\n" + "complete traces" }, { 0, NULL, NULL }, }; -- 2.4.3