diff options
| author | Blue Swirl | 2012-04-15 21:56:06 +0200 |
|---|---|---|
| committer | Blue Swirl | 2012-04-15 21:56:06 +0200 |
| commit | e6f5d0be730a41bacb10edba19d1369ec2949486 (patch) | |
| tree | ecf6fded694c4409c16d953f36d6e68aca33de12 /cpu-exec.c | |
| parent | target-alpha: QOM'ify CPU init (diff) | |
| parent | w64: Fix time conversion for some versions of MinGW-w64 (diff) | |
| download | qemu-e6f5d0be730a41bacb10edba19d1369ec2949486.tar.gz qemu-e6f5d0be730a41bacb10edba19d1369ec2949486.tar.xz qemu-e6f5d0be730a41bacb10edba19d1369ec2949486.zip | |
Merge branch 'w64' of git://qemu.weilnetz.de/qemu
* 'w64' of git://qemu.weilnetz.de/qemu:
w64: Fix time conversion for some versions of MinGW-w64
nbd: Fix compiler warning (w64)
disas: Replace 'unsigned long' by 'uintptr_t'
cpu-exec: Remove non-portable type cast and fix format string
target-mips: Fix type cast for w64 (uintptr_t)
w64: Fix type cast in os_host_main_loop_wait
w64: Fix data types in softmmu*.h
w64: Use uintptr_t in exec.c
softmmu: Use uintptr_t for physaddr and rename it
w64: Fix struct CPUTLBEntry
w64: Fix definition of setjmp
w32: Move defines for socket specific errors to qemu-os-win32.h
w64: Use larger alignment for section with generated code
w64: Fix data types in cpu-all.h, exec.c
w64: Fix type casts used in some macros in cpu-all.h
tcg/i386: Add support for w64 ABI
tcg/i386: Use GDB JIT debugging interface only for hosts with ELF
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index d153f978e1..0344cd5c59 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -541,8 +541,8 @@ int cpu_exec(CPUArchState *env) tb_invalidated_flag = 0; } #ifdef CONFIG_DEBUG_EXEC - qemu_log_mask(CPU_LOG_EXEC, "Trace 0x%08lx [" TARGET_FMT_lx "] %s\n", - (long)tb->tc_ptr, tb->pc, + qemu_log_mask(CPU_LOG_EXEC, "Trace %p [" TARGET_FMT_lx "] %s\n", + tb->tc_ptr, tb->pc, lookup_symbol(tb->pc)); #endif /* see if we can patch the calling TB. When the TB |