Commit a47dddd7 authored by Andreas Färber's avatar Andreas Färber
Browse files

exec: Change cpu_abort() argument to CPUState 



Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent bb0e627a

cputlb.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) 
        if (cc->do_unassigned_access) {

            cc->do_unassigned_access(cpu, addr, false, true, 0, 4);

        } else {

            cpu_abort(env1, "Trying to execute code outside RAM or ROM at 0x"

            cpu_abort(cpu, "Trying to execute code outside RAM or ROM at 0x"

                      TARGET_FMT_lx "\n", addr);

        }

    }

exec.c

+1 −2
Original line number Diff line number Diff line
@@ -709,9 +709,8 @@ void cpu_single_step(CPUState *cpu, int enabled) 
#endif

}



void cpu_abort(CPUArchState *env, const char *fmt, ...)

void cpu_abort(CPUState *cpu, const char *fmt, ...)

{

    CPUState *cpu = ENV_GET_CPU(env);

    va_list ap;

    va_list ap2;

include/exec/cpu-all.h

+0 −3
Original line number Diff line number Diff line
@@ -360,9 +360,6 @@ int page_check_range(target_ulong start, target_ulong len, int flags); 


CPUArchState *cpu_copy(CPUArchState *env);



void QEMU_NORETURN cpu_abort(CPUArchState *env, const char *fmt, ...)

    GCC_FMT_ATTR(2, 3);



/* Flags for use in ENV->INTERRUPT_PENDING.



   The numbers assigned here are non-sequential in order to preserve

include/qom/cpu.h

+3 −0
Original line number Diff line number Diff line
@@ -617,6 +617,9 @@ int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, 
void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint);

void cpu_watchpoint_remove_all(CPUState *cpu, int mask);



void QEMU_NORETURN cpu_abort(CPUState *cpu, const char *fmt, ...)

    GCC_FMT_ATTR(2, 3);



#ifdef CONFIG_SOFTMMU

extern const struct VMStateDescription vmstate_cpu_common;

#else

linux-user/m68k-sim.c

+2 −1
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static int translate_openflags(int flags) 
#define ARG(x) tswap32(args[x])

void do_m68k_simcall(CPUM68KState *env, int nr)

{

    M68kCPU *cpu = m68k_env_get_cpu(env);

    uint32_t *args;



    args = (uint32_t *)(unsigned long)(env->aregs[7] + 4);
@@ -165,6 +166,6 @@ void do_m68k_simcall(CPUM68KState *env, int nr) 
        check_err(env, lseek(ARG(0), (int32_t)ARG(1), ARG(2)));

        break;

    default:

        cpu_abort(env, "Unsupported m68k sim syscall %d\n", nr);

        cpu_abort(CPU(cpu), "Unsupported m68k sim syscall %d\n", nr);

    }

}