diff options
| author | Richard Henderson <rth@twiddle.net> | 2015-09-16 15:33:53 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@twiddle.net> | 2015-10-19 11:04:39 -1000 |
| commit | 89a82cd4b6a90fe117fa715e2abe51d5c607560c (patch) | |
| tree | 8918e2af85a3241d228a299e5825a34a8ff20963 | |
| parent | 137d63902faf4960081856db9242cbaf234a23af (diff) | |
| download | focaccia-qemu-89a82cd4b6a90fe117fa715e2abe51d5c607560c.tar.gz focaccia-qemu-89a82cd4b6a90fe117fa715e2abe51d5c607560c.zip | |
cpu-exec: Add "nochain" debug flag
Respect it to avoid linking TBs together. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | cpu-exec.c | 3 | ||||
| -rw-r--r-- | include/qemu/log.h | 1 | ||||
| -rw-r--r-- | qemu-log.c | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 8fd56a69e0..7eef0830fe 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 f880e66dbc..7de45001f2 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 13f3813f68..efd07c81ea 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 }, }; |