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/helper.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/helper.c')
| -rw-r--r-- | target-i386/helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index c635667d60..2ee7c6d1b1 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -284,7 +284,7 @@ void cpu_dump_state(CPUX86State *env, FILE *f, fprintf_function cpu_fprintf, cpu_fprintf(f, "\nDR6=" TARGET_FMT_lx " DR7=" TARGET_FMT_lx "\n", env->dr[6], env->dr[7]); } - if (flags & X86_DUMP_CCOP) { + if (flags & CPU_DUMP_CCOP) { if ((unsigned)env->cc_op < CC_OP_NB) snprintf(cc_op_name, sizeof(cc_op_name), "%s", cc_op_str[env->cc_op]); else @@ -303,7 +303,7 @@ void cpu_dump_state(CPUX86State *env, FILE *f, fprintf_function cpu_fprintf, } } cpu_fprintf(f, "EFER=%016" PRIx64 "\n", env->efer); - if (flags & X86_DUMP_FPU) { + if (flags & CPU_DUMP_FPU) { int fptag; fptag = 0; for(i = 0; i < 8; i++) { |