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

cpu: Move cpu_copy() into linux-user 



It is only used there and is deemed very fragile if not incorrect in its
current memcpy() form. Moving it into linux-user will allow to move
parts into target_cpu.h headers and only copy what the ABI mandates.

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

exec.c

+0 −32
Original line number Diff line number Diff line
@@ -625,38 +625,6 @@ void cpu_abort(CPUArchState *env, const char *fmt, ...) 
    abort();

}



CPUArchState *cpu_copy(CPUArchState *env)

{

    CPUArchState *new_env = cpu_init(env->cpu_model_str);

#if defined(TARGET_HAS_ICE)

    CPUBreakpoint *bp;

    CPUWatchpoint *wp;

#endif



    /* Reset non arch specific state */

    cpu_reset(ENV_GET_CPU(new_env));



    /* Copy arch specific state into the new CPU */

    memcpy(new_env, env, sizeof(CPUArchState));



    /* Clone all break/watchpoints.

       Note: Once we support ptrace with hw-debug register access, make sure

       BP_CPU break/watchpoints are handled correctly on clone. */

    QTAILQ_INIT(&env->breakpoints);

    QTAILQ_INIT(&env->watchpoints);

#if defined(TARGET_HAS_ICE)

    QTAILQ_FOREACH(bp, &env->breakpoints, entry) {

        cpu_breakpoint_insert(new_env, bp->pc, bp->flags, NULL);

    }

    QTAILQ_FOREACH(wp, &env->watchpoints, entry) {

        cpu_watchpoint_insert(new_env, wp->vaddr, (~wp->len_mask) + 1,

                              wp->flags, NULL);

    }

#endif



    return new_env;

}



#if !defined(CONFIG_USER_ONLY)

static void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t end,

                                      uintptr_t length)

linux-user/main.c

+31 −0
Original line number Diff line number Diff line
@@ -3285,6 +3285,37 @@ void init_task_state(TaskState *ts) 
    ts->sigqueue_table[i].next = NULL;

}



CPUArchState *cpu_copy(CPUArchState *env)

{

    CPUArchState *new_env = cpu_init(env->cpu_model_str);

#if defined(TARGET_HAS_ICE)

    CPUBreakpoint *bp;

    CPUWatchpoint *wp;

#endif



    /* Reset non arch specific state */

    cpu_reset(ENV_GET_CPU(new_env));



    memcpy(new_env, env, sizeof(CPUArchState));



    /* Clone all break/watchpoints.

       Note: Once we support ptrace with hw-debug register access, make sure

       BP_CPU break/watchpoints are handled correctly on clone. */

    QTAILQ_INIT(&env->breakpoints);

    QTAILQ_INIT(&env->watchpoints);

#if defined(TARGET_HAS_ICE)

    QTAILQ_FOREACH(bp, &env->breakpoints, entry) {

        cpu_breakpoint_insert(new_env, bp->pc, bp->flags, NULL);

    }

    QTAILQ_FOREACH(wp, &env->watchpoints, entry) {

        cpu_watchpoint_insert(new_env, wp->vaddr, (~wp->len_mask) + 1,

                              wp->flags, NULL);

    }

#endif



    return new_env;

}



static void handle_arg_help(const char *arg)

{

    usage();