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

gdbstub: Change gdb_register_coprocessor() argument to CPUState 



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

gdbstub.c

+3 −4
Original line number Diff line number Diff line
@@ -1906,11 +1906,10 @@ static int gdb_write_register(CPUState *cpu, uint8_t *mem_buf, int reg) 
   gdb reading a CPU register, and set_reg is gdb modifying a CPU register.

 */



void gdb_register_coprocessor(CPUArchState * env,

void gdb_register_coprocessor(CPUState *cpu,

                              gdb_reg_cb get_reg, gdb_reg_cb set_reg,

                              int num_regs, const char *xml, int g_pos)

{

    CPUState *cpu = ENV_GET_CPU(env);

    GDBRegisterState *s;

    GDBRegisterState **p;

    static int last_reg = NUM_CORE_REGS;

include/exec/gdbstub.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ void gdbserver_fork(CPUArchState *); 
#endif

/* Get or set a register.  Returns the size of the register.  */

typedef int (*gdb_reg_cb)(CPUArchState *env, uint8_t *buf, int reg);

void gdb_register_coprocessor(CPUArchState *env,

void gdb_register_coprocessor(CPUState *cpu,

                              gdb_reg_cb get_reg, gdb_reg_cb set_reg,

                              int num_regs, const char *xml, int g_pos);

target-arm/helper.c

+4 −3
Original line number Diff line number Diff line
@@ -1513,16 +1513,17 @@ ARMCPU *cpu_arm_init(const char *cpu_model) 


void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)

{

    CPUState *cs = CPU(cpu);

    CPUARMState *env = &cpu->env;



    if (arm_feature(env, ARM_FEATURE_NEON)) {

        gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,

        gdb_register_coprocessor(cs, vfp_gdb_get_reg, vfp_gdb_set_reg,

                                 51, "arm-neon.xml", 0);

    } else if (arm_feature(env, ARM_FEATURE_VFP3)) {

        gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,

        gdb_register_coprocessor(cs, vfp_gdb_get_reg, vfp_gdb_set_reg,

                                 35, "arm-vfp3.xml", 0);

    } else if (arm_feature(env, ARM_FEATURE_VFP)) {

        gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,

        gdb_register_coprocessor(cs, vfp_gdb_get_reg, vfp_gdb_set_reg,

                                 19, "arm-vfp.xml", 0);

    }

}

target-m68k/helper.c

+2 −1
Original line number Diff line number Diff line
@@ -121,10 +121,11 @@ M68kCPU *cpu_m68k_init(const char *cpu_model) 


void m68k_cpu_init_gdb(M68kCPU *cpu)

{

    CPUState *cs = CPU(cpu);

    CPUM68KState *env = &cpu->env;



    if (m68k_feature(env, M68K_FEATURE_CF_FPU)) {

        gdb_register_coprocessor(env, fpu_gdb_get_reg, fpu_gdb_set_reg,

        gdb_register_coprocessor(cs, fpu_gdb_get_reg, fpu_gdb_set_reg,

                                 11, "cf-fp.xml", 18);

    }

    /* TODO: Add [E]MAC registers.  */

target-ppc/translate_init.c

+8 −7
Original line number Diff line number Diff line
@@ -7804,8 +7804,8 @@ static int ppc_fixup_cpu(PowerPCCPU *cpu) 


static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)

{

    CPUState *cs = CPU(dev);

    PowerPCCPU *cpu = POWERPC_CPU(dev);

    CPUPPCState *env = &cpu->env;

    PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);

    Error *local_err = NULL;

#if !defined(CONFIG_USER_ONLY)
@@ -7849,15 +7849,15 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) 
    init_ppc_proc(cpu);



    if (pcc->insns_flags & PPC_FLOAT) {

        gdb_register_coprocessor(env, gdb_get_float_reg, gdb_set_float_reg,

        gdb_register_coprocessor(cs, gdb_get_float_reg, gdb_set_float_reg,

                                 33, "power-fpu.xml", 0);

    }

    if (pcc->insns_flags & PPC_ALTIVEC) {

        gdb_register_coprocessor(env, gdb_get_avr_reg, gdb_set_avr_reg,

        gdb_register_coprocessor(cs, gdb_get_avr_reg, gdb_set_avr_reg,

                                 34, "power-altivec.xml", 0);

    }

    if (pcc->insns_flags & PPC_SPE) {

        gdb_register_coprocessor(env, gdb_get_spe_reg, gdb_set_spe_reg,

        gdb_register_coprocessor(cs, gdb_get_spe_reg, gdb_set_spe_reg,

                                 34, "power-spe.xml", 0);

    }
@@ -7865,6 +7865,7 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) 


#if defined(PPC_DUMP_CPU)

    {

        CPUPPCState *env = &cpu->env;

        const char *mmu_model, *excp_model, *bus_model;

        switch (env->mmu_model) {

        case POWERPC_MMU_32B:
@@ -8016,10 +8017,10 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) 
            printf("                        none\n");

        printf("    Time-base/decrementer clock source: %s\n",

               env->flags & POWERPC_FLAG_RTC_CLK ? "RTC clock" : "bus clock");

    }

        dump_ppc_insns(env);

        dump_ppc_sprs(env);

        fflush(stdout);

    }

#endif

}