diff options
| -rw-r--r-- | cpu-all.h | 1 | ||||
| -rw-r--r-- | exec.c | 2 | ||||
| -rw-r--r-- | target-arm/helper.c | 6 | ||||
| -rw-r--r-- | target-cris/translate.c | 5 | ||||
| -rw-r--r-- | target-i386/helper.c | 5 | ||||
| -rw-r--r-- | target-m68k/helper.c | 5 | ||||
| -rw-r--r-- | target-mips/translate.c | 5 | ||||
| -rw-r--r-- | target-ppc/helper.c | 8 | ||||
| -rw-r--r-- | target-sh4/translate.c | 5 | ||||
| -rw-r--r-- | target-sparc/helper.c | 5 |
10 files changed, 45 insertions, 2 deletions
@@ -816,6 +816,7 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr); #define CPU_LOG_PCALL (1 << 6) #define CPU_LOG_IOPORT (1 << 7) #define CPU_LOG_TB_CPU (1 << 8) +#define CPU_LOG_RESET (1 << 9) /* define log items */ typedef struct CPULogItem { @@ -1569,6 +1569,8 @@ const CPULogItem cpu_log_items[] = { #ifdef TARGET_I386 { CPU_LOG_PCALL, "pcall", "show protected mode far calls/returns/exceptions" }, + { CPU_LOG_RESET, "cpu_reset", + "show CPU state before CPU resets" }, #endif #ifdef DEBUG_IOPORT { CPU_LOG_IOPORT, "ioport", diff --git a/target-arm/helper.c b/target-arm/helper.c index 81663c8f3b..26fd6d017a 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -159,6 +159,12 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) void cpu_reset(CPUARMState *env) { uint32_t id; + + if (qemu_loglevel_mask(CPU_LOG_RESET)) { + qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); + log_cpu_state(env, 0); + } + id = env->cp15.c0_cpuid; memset(env, 0, offsetof(CPUARMState, breakpoints)); if (id) diff --git a/target-cris/translate.c b/target-cris/translate.c index 2ff6fe2d32..b6b987a2ce 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3458,6 +3458,11 @@ CPUCRISState *cpu_cris_init (const char *cpu_model) void cpu_reset (CPUCRISState *env) { + if (qemu_loglevel_mask(CPU_LOG_RESET)) { + qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); + log_cpu_state(env, 0); + } + memset(env, 0, offsetof(CPUCRISState, breakpoints)); tlb_flush(env, 1); diff --git a/target-i386/helper.c b/target-i386/helper.c index a28ab935a9..c2da7670d7 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -418,6 +418,11 @@ void cpu_reset(CPUX86State *env) { int i; + 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); + } + memset(env, 0, offsetof(CPUX86State, breakpoints)); tlb_flush(env, 1); diff --git a/target-m68k/helper.c b/target-m68k/helper.c index ce56693467..076ea353c8 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -143,6 +143,11 @@ static int cpu_m68k_set_model(CPUM68KState *env, const char *name) void cpu_reset(CPUM68KState *env) { + if (qemu_loglevel_mask(CPU_LOG_RESET)) { + qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); + log_cpu_state(env, 0); + } + memset(env, 0, offsetof(CPUM68KState, breakpoints)); #if !defined (CONFIG_USER_ONLY) env->sr = 0x2700; diff --git a/target-mips/translate.c b/target-mips/translate.c index 692ea6dc07..b447b983f6 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -8489,6 +8489,11 @@ CPUMIPSState *cpu_mips_init (const char *cpu_model) void cpu_reset (CPUMIPSState *env) { + if (qemu_loglevel_mask(CPU_LOG_RESET)) { + qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); + log_cpu_state(env, 0); + } + memset(env, 0, offsetof(CPUMIPSState, breakpoints)); tlb_flush(env, 1); diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 2bf7650929..3bd1d45c8a 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -2709,10 +2709,14 @@ void cpu_dump_rfi (target_ulong RA, target_ulong msr) void cpu_ppc_reset (void *opaque) { - CPUPPCState *env; + CPUPPCState *env = opaque; target_ulong msr; - env = opaque; + if (qemu_loglevel_mask(CPU_LOG_RESET)) { + qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); + log_cpu_state(env, 0); + } + msr = (target_ulong)0; if (0) { /* XXX: find a suitable condition to enable the hypervisor mode */ diff --git a/target-sh4/translate.c b/target-sh4/translate.c index 9137e38014..6c9dff591a 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -184,6 +184,11 @@ void cpu_dump_state(CPUState * env, FILE * f, static void cpu_sh4_reset(CPUSH4State * env) { + if (qemu_loglevel_mask(CPU_LOG_RESET)) { + qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); + log_cpu_state(env, 0); + } + #if defined(CONFIG_USER_ONLY) env->sr = 0; #else diff --git a/target-sparc/helper.c b/target-sparc/helper.c index d34b837637..a275880851 100644 --- a/target-sparc/helper.c +++ b/target-sparc/helper.c @@ -639,6 +639,11 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState *env, target_ulong addr) void cpu_reset(CPUSPARCState *env) { + if (qemu_loglevel_mask(CPU_LOG_RESET)) { + qemu_log("CPU Reset (CPU %d)\n", env->cpu_index); + log_cpu_state(env, 0); + } + tlb_flush(env, 1); env->cwp = 0; env->wim = 1; |