Commit 046dbab9 authored by Aurelien Jarno's avatar Aurelien Jarno
Browse files

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
parents 048d3612 1273d9ca

cpu-all.h

+3 −0
Original line number Diff line number Diff line
@@ -356,6 +356,9 @@ CPUArchState *cpu_copy(CPUArchState *env); 
CPUArchState *qemu_get_cpu(int cpu);



#define CPU_DUMP_CODE 0x00010000

#define CPU_DUMP_FPU 0x00020000 /* dump FPU register state, not just integer */

/* dump info about TCG QEMU's condition code optimization state */

#define CPU_DUMP_CCOP 0x00040000



void cpu_dump_state(CPUArchState *env, FILE *f, fprintf_function cpu_fprintf,

                    int flags);

cpu-exec.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

cpus.c

+1 −5
Original line number Diff line number Diff line
@@ -395,11 +395,7 @@ void hw_error(const char *fmt, ...) 
    fprintf(stderr, "\n");

    for(env = first_cpu; env != NULL; env = env->next_cpu) {

        fprintf(stderr, "CPU #%d:\n", env->cpu_index);

#ifdef TARGET_I386

        cpu_dump_state(env, stderr, fprintf, X86_DUMP_FPU);

#else

        cpu_dump_state(env, stderr, fprintf, 0);

#endif

        cpu_dump_state(env, stderr, fprintf, CPU_DUMP_FPU);

    }

    va_end(ap);

    abort();

exec.c

+2 −10
Original line number Diff line number Diff line
@@ -1742,20 +1742,12 @@ void cpu_abort(CPUArchState *env, const char *fmt, ...) 
    fprintf(stderr, "qemu: fatal: ");

    vfprintf(stderr, fmt, ap);

    fprintf(stderr, "\n");

#ifdef TARGET_I386

    cpu_dump_state(env, stderr, fprintf, X86_DUMP_FPU | X86_DUMP_CCOP);

#else

    cpu_dump_state(env, stderr, fprintf, 0);

#endif

    cpu_dump_state(env, stderr, fprintf, CPU_DUMP_FPU | CPU_DUMP_CCOP);

    if (qemu_log_enabled()) {

        qemu_log("qemu: fatal: ");

        qemu_log_vprintf(fmt, ap2);

        qemu_log("\n");

#ifdef TARGET_I386

        log_cpu_state(env, X86_DUMP_FPU | X86_DUMP_CCOP);

#else

        log_cpu_state(env, 0);

#endif

        log_cpu_state(env, CPU_DUMP_FPU | CPU_DUMP_CCOP);

        qemu_log_flush();

        qemu_log_close();

    }

monitor.c

+1 −7
Original line number Diff line number Diff line
@@ -898,13 +898,7 @@ static void do_info_registers(Monitor *mon) 
{

    CPUArchState *env;

    env = mon_get_cpu();

#ifdef TARGET_I386

    cpu_dump_state(env, (FILE *)mon, monitor_fprintf,

                   X86_DUMP_FPU);

#else

    cpu_dump_state(env, (FILE *)mon, monitor_fprintf,

                   0);

#endif

    cpu_dump_state(env, (FILE *)mon, monitor_fprintf, CPU_DUMP_FPU);

}



static void do_info_jit(Monitor *mon)