From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ut1MH-0006jE-Il for qemu-devel@nongnu.org; Sat, 29 Jun 2013 16:02:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ut1MG-0005Rb-5n for qemu-devel@nongnu.org; Sat, 29 Jun 2013 16:02:57 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 29 Jun 2013 22:01:54 +0200 Message-Id: <1372536117-28167-39-git-send-email-afaerber@suse.de> In-Reply-To: <1372536117-28167-1-git-send-email-afaerber@suse.de> References: <1372536117-28167-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH RFC qom-cpu 38/41] gdbstub: Change gdb_register_coprocessor() argument to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , "open list:PowerPC" , Paul Brook , jan.kiszka@web.de, =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Andreas F=C3=A4rber --- gdbstub.c | 7 +++---- include/exec/gdbstub.h | 2 +- target-arm/helper.c | 7 ++++--- target-m68k/helper.c | 3 ++- target-ppc/translate_init.c | 15 ++++++++------- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index d862cca..4ebe9e0 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1906,11 +1906,10 @@ static int gdb_write_register(CPUState *cpu, uint= 8_t *mem_buf, int reg) gdb reading a CPU register, and set_reg is gdb modifying a CPU regist= er. */ =20 -void gdb_register_coprocessor(CPUArchState * env, - gdb_reg_cb get_reg, gdb_reg_cb set_reg, - int num_regs, const char *xml, int g_pos) +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 =3D ENV_GET_CPU(env); GDBRegisterState *s; GDBRegisterState **p; static int last_reg =3D NUM_CORE_REGS; diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 0f1ad9a..1bd00ae 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -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); =20 diff --git a/target-arm/helper.c b/target-arm/helper.c index da4d4a6..5045934 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1502,16 +1502,17 @@ ARMCPU *cpu_arm_init(const char *cpu_model) =20 void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) { + CPUState *cs =3D CPU(cpu); CPUARMState *env =3D &cpu->env; =20 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); } } diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 0a94ca7..871e5ef 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -121,10 +121,11 @@ M68kCPU *cpu_m68k_init(const char *cpu_model) =20 void m68k_cpu_init_gdb(M68kCPU *cpu) { + CPUState *cs =3D CPU(cpu); CPUM68KState *env =3D &cpu->env; =20 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. */ diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 815ce0c..24821f9 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7695,8 +7695,8 @@ static int ppc_fixup_cpu(PowerPCCPU *cpu) =20 static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) { + CPUState *cs =3D CPU(dev); PowerPCCPU *cpu =3D POWERPC_CPU(dev); - CPUPPCState *env =3D &cpu->env; PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); Error *local_err =3D NULL; #if !defined(CONFIG_USER_ONLY) @@ -7740,15 +7740,15 @@ static void ppc_cpu_realizefn(DeviceState *dev, E= rror **errp) init_ppc_proc(cpu); =20 if (pcc->insns_flags & PPC_FLOAT) { - gdb_register_coprocessor(env, gdb_get_float_reg, gdb_set_float_r= eg, + gdb_register_coprocessor(cs, gdb_get_float_reg, gdb_set_float_re= g, 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); } =20 @@ -7756,6 +7756,7 @@ static void ppc_cpu_realizefn(DeviceState *dev, Err= or **errp) =20 #if defined(PPC_DUMP_CPU) { + CPUPPCState *env =3D &cpu->env; const char *mmu_model, *excp_model, *bus_model; switch (env->mmu_model) { case POWERPC_MMU_32B: @@ -7907,10 +7908,10 @@ static void ppc_cpu_realizefn(DeviceState *dev, E= rror **errp) printf(" none\n"); printf(" Time-base/decrementer clock source: %s\n", env->flags & POWERPC_FLAG_RTC_CLK ? "RTC clock" : "bus cl= ock"); + dump_ppc_insns(env); + dump_ppc_sprs(env); + fflush(stdout); } - dump_ppc_insns(env); - dump_ppc_sprs(env); - fflush(stdout); #endif } =20 --=20 1.8.1.4