diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-06 18:54:46 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-10-06 18:54:46 +0200 |
| commit | 046dbab95f33e007428190610d638d2fcaf37fdf (patch) | |
| tree | 6110b604ea1eaa50406e5ece905cfa0700110d31 /cpu-exec.c | |
| parent | 048d3612a51b3da45081091b734f93428925ebf8 (diff) | |
| parent | 1273d9ca09e91bb290d10f704055f6abec363dd6 (diff) | |
| download | focaccia-qemu-046dbab95f33e007428190610d638d2fcaf37fdf.tar.gz focaccia-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 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 134b3c4fcf..252da86882 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -552,7 +552,7 @@ int cpu_exec(CPUArchState *env) #if defined(TARGET_I386) env->eflags = env->eflags | cpu_cc_compute_all(env, CC_OP) | (DF & DF_MASK); - log_cpu_state(env, X86_DUMP_CCOP); + log_cpu_state(env, CPU_DUMP_CCOP); env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C); #elif defined(TARGET_M68K) cpu_m68k_flush_flags(env, env->cc_op); |