Commit 7fe48483 authored by Fabrice Bellard's avatar Fabrice Bellard
Browse files

monitor fixes 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1110 c046a42c-6fe2-441c-8c8c-71466251a162
parent 8e3a9fd2

cpu-all.h

+4 −4
Original line number Diff line number Diff line
@@ -570,7 +570,6 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size); 
#define cpu_exec cpu_x86_exec

#define cpu_gen_code cpu_x86_gen_code

#define cpu_signal_handler cpu_x86_signal_handler

#define cpu_dump_state cpu_x86_dump_state



#elif defined(TARGET_ARM)
@@ -579,7 +578,6 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size); 
#define cpu_exec cpu_arm_exec

#define cpu_gen_code cpu_arm_gen_code

#define cpu_signal_handler cpu_arm_signal_handler

#define cpu_dump_state cpu_arm_dump_state



#elif defined(TARGET_SPARC)
@@ -588,7 +586,6 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size); 
#define cpu_exec cpu_sparc_exec

#define cpu_gen_code cpu_sparc_gen_code

#define cpu_signal_handler cpu_sparc_signal_handler

#define cpu_dump_state cpu_sparc_dump_state



#elif defined(TARGET_PPC)
@@ -597,7 +594,6 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size); 
#define cpu_exec cpu_ppc_exec

#define cpu_gen_code cpu_ppc_gen_code

#define cpu_signal_handler cpu_ppc_signal_handler

#define cpu_dump_state cpu_ppc_dump_state



#else
@@ -607,6 +603,10 @@ void page_unprotect_range(uint8_t *data, unsigned long data_size); 


#endif /* SINGLE_CPU_DEFINES */



void cpu_dump_state(CPUState *env, FILE *f, 

                    int (*cpu_fprintf)(FILE *f, const char *fmt, ...),

                    int flags);



void cpu_abort(CPUState *env, const char *fmt, ...);

extern CPUState *cpu_single_env;

extern int code_copy_enabled;

cpu-exec.c

+4 −4
Original line number Diff line number Diff line
@@ -304,16 +304,16 @@ int cpu_exec(CPUState *env1) 
                    env->regs[R_EBP] = EBP;

                    env->regs[R_ESP] = ESP;

                    env->eflags = env->eflags | cc_table[CC_OP].compute_all() | (DF & DF_MASK);

                    cpu_x86_dump_state(env, logfile, X86_DUMP_CCOP);

                    cpu_dump_state(env, logfile, fprintf, X86_DUMP_CCOP);

                    env->eflags &= ~(DF_MASK | CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C);

#elif defined(TARGET_ARM)

                    env->cpsr = compute_cpsr();

                    cpu_arm_dump_state(env, logfile, 0);

                    cpu_dump_state(env, logfile, fprintf, 0);

                    env->cpsr &= ~0xf0000000;

#elif defined(TARGET_SPARC)

                    cpu_sparc_dump_state (env, logfile, 0);

                    cpu_dump_state (env, logfile, fprintf, 0);

#elif defined(TARGET_PPC)

                    cpu_ppc_dump_state(env, logfile, 0);

                    cpu_dump_state(env, logfile, fprintf, 0);

#else

#error unsupported target CPU 

#endif

disas.c

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ void monitor_disas(target_ulong pc, int nb_insn, int is_physical, int flags) 
#elif defined(TARGET_PPC)

    print_insn = print_insn_ppc;

#else

    fprintf(out, "Asm output not supported on this arch\n");

    term_printf("Asm output not supported on this arch\n");

    return;

#endif

exec.c

+3 −1
Original line number Diff line number Diff line
@@ -1255,7 +1255,9 @@ void cpu_abort(CPUState *env, const char *fmt, ...) 
    vfprintf(stderr, fmt, ap);

    fprintf(stderr, "\n");

#ifdef TARGET_I386

    cpu_x86_dump_state(env, stderr, X86_DUMP_FPU | X86_DUMP_CCOP);

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

#else

    cpu_dump_state(env, stderr, fprintf, 0);

#endif

    va_end(ap);

    abort();

linux-user/main.c

+3 −3
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ void cpu_loop(CPUARMState *env) 
        error:

            fprintf(stderr, "qemu: unhandled CPU exception 0x%x - aborting\n", 

                    trapnr);

            cpu_arm_dump_state(env, stderr, 0);

            cpu_dump_state(env, stderr, fprintf, 0);

            abort();

        }

        process_pending_signals(env);
@@ -499,7 +499,7 @@ void cpu_loop (CPUSPARCState *env) 
            break;

        default:

            printf ("Unhandled trap: 0x%x\n", trapnr);

            cpu_sparc_dump_state(env, stderr, 0);

            cpu_dump_state(env, stderr, fprintf, 0);

            exit (1);

        }

        process_pending_signals (env);
@@ -563,7 +563,7 @@ void cpu_loop(CPUPPCState *env) 
        if (trapnr != EXCP_SYSCALL_USER && trapnr != EXCP_BRANCH &&

            trapnr != EXCP_TRACE) {

            if (loglevel > 0) {

                cpu_ppc_dump_state(env, logfile, 0);

                cpu_dump_state(env, logfile, fprintf, 0);

            }

        }

        switch(trapnr) {