diff options
| author | Aurelien Jarno | 2012-10-06 18:54:46 +0200 |
|---|---|---|
| committer | Aurelien Jarno | 2012-10-06 18:54:46 +0200 |
| commit | 046dbab95f33e007428190610d638d2fcaf37fdf (patch) | |
| tree | 6110b604ea1eaa50406e5ece905cfa0700110d31 /target-i386/cpu.c | |
| parent | Merge branch 'trivial-patches' of git://github.com/stefanha/qemu (diff) | |
| parent | target-arm: Drop unused DECODE_CPREG_CRN macro (diff) | |
| download | qemu-046dbab95f33e007428190610d638d2fcaf37fdf.tar.gz qemu-046dbab95f33e007428190610d638d2fcaf37fdf.tar.xz qemu-046dbab95f33e007428190610d638d2fcaf37fdf.zip | |
Merge branch 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
* 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
target-arm: Drop unused DECODE_CPREG_CRN macro
target-arm: use deposit instead of hardcoded version
target-arm: mark a few integer helpers const and pure
target-arm: convert sar, shl and shr helpers to TCG
target-arm: convert add_cc and sub_cc helpers to TCG
target-arm: use globals for CC flags
target-arm: Reinstate display of VFP registers in cpu_dump_state
cpu_dump_state: move DUMP_FPU and DUMP_CCOP flags from x86-only to generic
Diffstat (limited to 'target-i386/cpu.c')
| -rw-r--r-- | target-i386/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index bb1e44eb01..f3708e63b7 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1759,7 +1759,7 @@ static void x86_cpu_reset(CPUState *s) if (qemu_loglevel_mask(CPU_LOG_RESET)) { qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); - log_cpu_state(env, X86_DUMP_FPU | X86_DUMP_CCOP); + log_cpu_state(env, CPU_DUMP_FPU | CPU_DUMP_CCOP); } xcc->parent_reset(s); |