From: Alistair Francis <alistair23@gmail.com>
To: Akihiko Odaki <akihiko.odaki@daynix.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Bin Meng" <bin.meng@windriver.com>,
"Weiwei Li" <liwei1518@gmail.com>,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Brian Cain" <bcain@quicinc.com>,
"Song Gao" <gaosong@loongson.cn>,
"Laurent Vivier" <laurent@vivier.eu>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"David Hildenbrand" <david@redhat.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Michael Rolnik" <mrolnik@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>,
"John Snow" <jsnow@redhat.com>, "Cleber Rosa" <crosa@redhat.com>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Mikhail Tyutin" <m.tyutin@yadro.com>,
"Aleksandr Anenkov" <a.anenkov@yadro.com>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
qemu-riscv@nongnu.org, qemu-s390x@nongnu.org,
20231213-riscv-v7-0-a760156a337f@daynix.com
Subject: Re: [PATCH v17 06/14] gdbstub: Change gdb_get_reg_cb and gdb_set_reg_cb
Date: Mon, 18 Dec 2023 10:15:22 +1000 [thread overview]
Message-ID: <CAKmqyKONQ_FQnx8ts0ZKG1s5zu56vr=86_4P0UhR1c9-+mJTWw@mail.gmail.com> (raw)
In-Reply-To: <20231213-gdb-v17-6-777047380591@daynix.com>
On Wed, Dec 13, 2023 at 5:47 PM Akihiko Odaki <akihiko.odaki@daynix.com> wrote:
>
> Align the parameters of gdb_get_reg_cb and gdb_set_reg_cb with the
> gdb_read_register and gdb_write_register members of CPUClass to allow
> to unify the logic to access registers of the core and coprocessors
> in the future.
>
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> include/exec/gdbstub.h | 4 +--
> target/arm/internals.h | 12 +++----
> target/hexagon/internal.h | 4 +--
> target/microblaze/cpu.h | 4 +--
> gdbstub/gdbstub.c | 6 ++--
> target/arm/gdbstub.c | 51 +++++++++++++++++++++---------
> target/arm/gdbstub64.c | 27 +++++++++++-----
> target/hexagon/gdbstub.c | 10 ++++--
> target/loongarch/gdbstub.c | 11 ++++---
> target/m68k/helper.c | 20 +++++++++---
> target/microblaze/gdbstub.c | 9 ++++--
> target/ppc/gdbstub.c | 46 +++++++++++++++++++++------
> target/riscv/gdbstub.c | 46 ++++++++++++++++++++-------
> target/s390x/gdbstub.c | 77 ++++++++++++++++++++++++++++++++++-----------
> 14 files changed, 236 insertions(+), 91 deletions(-)
>
> diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h
> index ac6fce99a64e..bcaab1bc750e 100644
> --- a/include/exec/gdbstub.h
> +++ b/include/exec/gdbstub.h
> @@ -24,8 +24,8 @@ typedef struct GDBFeatureBuilder {
>
>
> /* Get or set a register. Returns the size of the register. */
> -typedef int (*gdb_get_reg_cb)(CPUArchState *env, GByteArray *buf, int reg);
> -typedef int (*gdb_set_reg_cb)(CPUArchState *env, uint8_t *buf, int reg);
> +typedef int (*gdb_get_reg_cb)(CPUState *cpu, GByteArray *buf, int reg);
> +typedef int (*gdb_set_reg_cb)(CPUState *cpu, uint8_t *buf, int reg);
>
> /**
> * gdb_register_coprocessor() - register a supplemental set of registers
> diff --git a/target/arm/internals.h b/target/arm/internals.h
> index 1136710741f0..a08f461f444b 100644
> --- a/target/arm/internals.h
> +++ b/target/arm/internals.h
> @@ -1447,12 +1447,12 @@ static inline uint64_t pmu_counter_mask(CPUARMState *env)
>
> #ifdef TARGET_AARCH64
> GDBFeature *arm_gen_dynamic_svereg_feature(CPUState *cpu, int base_reg);
> -int aarch64_gdb_get_sve_reg(CPUARMState *env, GByteArray *buf, int reg);
> -int aarch64_gdb_set_sve_reg(CPUARMState *env, uint8_t *buf, int reg);
> -int aarch64_gdb_get_fpu_reg(CPUARMState *env, GByteArray *buf, int reg);
> -int aarch64_gdb_set_fpu_reg(CPUARMState *env, uint8_t *buf, int reg);
> -int aarch64_gdb_get_pauth_reg(CPUARMState *env, GByteArray *buf, int reg);
> -int aarch64_gdb_set_pauth_reg(CPUARMState *env, uint8_t *buf, int reg);
> +int aarch64_gdb_get_sve_reg(CPUState *cs, GByteArray *buf, int reg);
> +int aarch64_gdb_set_sve_reg(CPUState *cs, uint8_t *buf, int reg);
> +int aarch64_gdb_get_fpu_reg(CPUState *cs, GByteArray *buf, int reg);
> +int aarch64_gdb_set_fpu_reg(CPUState *cs, uint8_t *buf, int reg);
> +int aarch64_gdb_get_pauth_reg(CPUState *cs, GByteArray *buf, int reg);
> +int aarch64_gdb_set_pauth_reg(CPUState *cs, uint8_t *buf, int reg);
> void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp);
> void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp);
> void arm_cpu_pauth_finalize(ARMCPU *cpu, Error **errp);
> diff --git a/target/hexagon/internal.h b/target/hexagon/internal.h
> index d732b6bb3c73..beb08cb7e382 100644
> --- a/target/hexagon/internal.h
> +++ b/target/hexagon/internal.h
> @@ -33,8 +33,8 @@
>
> int hexagon_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
> int hexagon_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
> -int hexagon_hvx_gdb_read_register(CPUHexagonState *env, GByteArray *mem_buf, int n);
> -int hexagon_hvx_gdb_write_register(CPUHexagonState *env, uint8_t *mem_buf, int n);
> +int hexagon_hvx_gdb_read_register(CPUState *env, GByteArray *mem_buf, int n);
> +int hexagon_hvx_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n);
>
> void hexagon_debug_vreg(CPUHexagonState *env, int regnum);
> void hexagon_debug_qreg(CPUHexagonState *env, int regnum);
> diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h
> index b5374365f5f5..1906d8f266af 100644
> --- a/target/microblaze/cpu.h
> +++ b/target/microblaze/cpu.h
> @@ -381,8 +381,8 @@ G_NORETURN void mb_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,
> void mb_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
> int mb_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
> int mb_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
> -int mb_cpu_gdb_read_stack_protect(CPUArchState *cpu, GByteArray *buf, int reg);
> -int mb_cpu_gdb_write_stack_protect(CPUArchState *cpu, uint8_t *buf, int reg);
> +int mb_cpu_gdb_read_stack_protect(CPUState *cs, GByteArray *buf, int reg);
> +int mb_cpu_gdb_write_stack_protect(CPUState *cs, uint8_t *buf, int reg);
>
> static inline uint32_t mb_cpu_read_msr(const CPUMBState *env)
> {
> diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c
> index a80729436b66..21fea7fffae8 100644
> --- a/gdbstub/gdbstub.c
> +++ b/gdbstub/gdbstub.c
> @@ -502,7 +502,6 @@ const GDBFeature *gdb_find_static_feature(const char *xmlname)
> static int gdb_read_register(CPUState *cpu, GByteArray *buf, int reg)
> {
> CPUClass *cc = CPU_GET_CLASS(cpu);
> - CPUArchState *env = cpu_env(cpu);
> GDBRegisterState *r;
>
> if (reg < cc->gdb_num_core_regs) {
> @@ -513,7 +512,7 @@ static int gdb_read_register(CPUState *cpu, GByteArray *buf, int reg)
> for (guint i = 0; i < cpu->gdb_regs->len; i++) {
> r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i);
> if (r->base_reg <= reg && reg < r->base_reg + r->feature->num_regs) {
> - return r->get_reg(env, buf, reg - r->base_reg);
> + return r->get_reg(cpu, buf, reg - r->base_reg);
> }
> }
> }
> @@ -523,7 +522,6 @@ static int gdb_read_register(CPUState *cpu, GByteArray *buf, int reg)
> static int gdb_write_register(CPUState *cpu, uint8_t *mem_buf, int reg)
> {
> CPUClass *cc = CPU_GET_CLASS(cpu);
> - CPUArchState *env = cpu_env(cpu);
> GDBRegisterState *r;
>
> if (reg < cc->gdb_num_core_regs) {
> @@ -534,7 +532,7 @@ static int gdb_write_register(CPUState *cpu, uint8_t *mem_buf, int reg)
> for (guint i = 0; i < cpu->gdb_regs->len; i++) {
> r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i);
> if (r->base_reg <= reg && reg < r->base_reg + r->feature->num_regs) {
> - return r->set_reg(env, mem_buf, reg - r->base_reg);
> + return r->set_reg(cpu, mem_buf, reg - r->base_reg);
> }
> }
> }
> diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c
> index f2b201d31254..059d84f98e52 100644
> --- a/target/arm/gdbstub.c
> +++ b/target/arm/gdbstub.c
> @@ -106,9 +106,10 @@ int arm_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
> return 0;
> }
>
> -static int vfp_gdb_get_reg(CPUARMState *env, GByteArray *buf, int reg)
> +static int vfp_gdb_get_reg(CPUState *cs, GByteArray *buf, int reg)
> {
> - ARMCPU *cpu = env_archcpu(env);
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> int nregs = cpu_isar_feature(aa32_simd_r32, cpu) ? 32 : 16;
>
> /* VFP data registers are always little-endian. */
> @@ -130,9 +131,10 @@ static int vfp_gdb_get_reg(CPUARMState *env, GByteArray *buf, int reg)
> return 0;
> }
>
> -static int vfp_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg)
> +static int vfp_gdb_set_reg(CPUState *cs, uint8_t *buf, int reg)
> {
> - ARMCPU *cpu = env_archcpu(env);
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> int nregs = cpu_isar_feature(aa32_simd_r32, cpu) ? 32 : 16;
>
> if (reg < nregs) {
> @@ -156,8 +158,11 @@ static int vfp_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg)
> return 0;
> }
>
> -static int vfp_gdb_get_sysreg(CPUARMState *env, GByteArray *buf, int reg)
> +static int vfp_gdb_get_sysreg(CPUState *cs, GByteArray *buf, int reg)
> {
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> +
> switch (reg) {
> case 0:
> return gdb_get_reg32(buf, env->vfp.xregs[ARM_VFP_FPSID]);
> @@ -167,8 +172,11 @@ static int vfp_gdb_get_sysreg(CPUARMState *env, GByteArray *buf, int reg)
> return 0;
> }
>
> -static int vfp_gdb_set_sysreg(CPUARMState *env, uint8_t *buf, int reg)
> +static int vfp_gdb_set_sysreg(CPUState *cs, uint8_t *buf, int reg)
> {
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> +
> switch (reg) {
> case 0:
> env->vfp.xregs[ARM_VFP_FPSID] = ldl_p(buf);
> @@ -180,8 +188,11 @@ static int vfp_gdb_set_sysreg(CPUARMState *env, uint8_t *buf, int reg)
> return 0;
> }
>
> -static int mve_gdb_get_reg(CPUARMState *env, GByteArray *buf, int reg)
> +static int mve_gdb_get_reg(CPUState *cs, GByteArray *buf, int reg)
> {
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> +
> switch (reg) {
> case 0:
> return gdb_get_reg32(buf, env->v7m.vpr);
> @@ -190,8 +201,11 @@ static int mve_gdb_get_reg(CPUARMState *env, GByteArray *buf, int reg)
> }
> }
>
> -static int mve_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg)
> +static int mve_gdb_set_reg(CPUState *cs, uint8_t *buf, int reg)
> {
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> +
> switch (reg) {
> case 0:
> env->v7m.vpr = ldl_p(buf);
> @@ -210,9 +224,10 @@ static int mve_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg)
> * We return the number of bytes copied
> */
>
> -static int arm_gdb_get_sysreg(CPUARMState *env, GByteArray *buf, int reg)
> +static int arm_gdb_get_sysreg(CPUState *cs, GByteArray *buf, int reg)
> {
> - ARMCPU *cpu = env_archcpu(env);
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> const ARMCPRegInfo *ri;
> uint32_t key;
>
> @@ -228,7 +243,7 @@ static int arm_gdb_get_sysreg(CPUARMState *env, GByteArray *buf, int reg)
> return 0;
> }
>
> -static int arm_gdb_set_sysreg(CPUARMState *env, uint8_t *buf, int reg)
> +static int arm_gdb_set_sysreg(CPUState *cs, uint8_t *buf, int reg)
> {
> return 0;
> }
> @@ -367,8 +382,11 @@ static int m_sysreg_get(CPUARMState *env, GByteArray *buf,
> return gdb_get_reg32(buf, *ptr);
> }
>
> -static int arm_gdb_get_m_systemreg(CPUARMState *env, GByteArray *buf, int reg)
> +static int arm_gdb_get_m_systemreg(CPUState *cs, GByteArray *buf, int reg)
> {
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> +
> /*
> * Here, we emulate MRS instruction, where CONTROL has a mix of
> * banked and non-banked bits.
> @@ -379,7 +397,7 @@ static int arm_gdb_get_m_systemreg(CPUARMState *env, GByteArray *buf, int reg)
> return m_sysreg_get(env, buf, reg, env->v7m.secure);
> }
>
> -static int arm_gdb_set_m_systemreg(CPUARMState *env, uint8_t *buf, int reg)
> +static int arm_gdb_set_m_systemreg(CPUState *cs, uint8_t *buf, int reg)
> {
> return 0; /* TODO */
> }
> @@ -414,12 +432,15 @@ static GDBFeature *arm_gen_dynamic_m_systemreg_feature(CPUState *cs,
> * For user-only, we see the non-secure registers via m_systemreg above.
> * For secext, encode the non-secure view as even and secure view as odd.
> */
> -static int arm_gdb_get_m_secextreg(CPUARMState *env, GByteArray *buf, int reg)
> +static int arm_gdb_get_m_secextreg(CPUState *cs, GByteArray *buf, int reg)
> {
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> +
> return m_sysreg_get(env, buf, reg >> 1, reg & 1);
> }
>
> -static int arm_gdb_set_m_secextreg(CPUARMState *env, uint8_t *buf, int reg)
> +static int arm_gdb_set_m_secextreg(CPUState *cs, uint8_t *buf, int reg)
> {
> return 0; /* TODO */
> }
> diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c
> index 5286d5c6043f..caa31ff3fa11 100644
> --- a/target/arm/gdbstub64.c
> +++ b/target/arm/gdbstub64.c
> @@ -72,8 +72,11 @@ int aarch64_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
> return 0;
> }
>
> -int aarch64_gdb_get_fpu_reg(CPUARMState *env, GByteArray *buf, int reg)
> +int aarch64_gdb_get_fpu_reg(CPUState *cs, GByteArray *buf, int reg)
> {
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> +
> switch (reg) {
> case 0 ... 31:
> {
> @@ -92,8 +95,11 @@ int aarch64_gdb_get_fpu_reg(CPUARMState *env, GByteArray *buf, int reg)
> }
> }
>
> -int aarch64_gdb_set_fpu_reg(CPUARMState *env, uint8_t *buf, int reg)
> +int aarch64_gdb_set_fpu_reg(CPUState *cs, uint8_t *buf, int reg)
> {
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> +
> switch (reg) {
> case 0 ... 31:
> /* 128 bit FP register */
> @@ -116,9 +122,10 @@ int aarch64_gdb_set_fpu_reg(CPUARMState *env, uint8_t *buf, int reg)
> }
> }
>
> -int aarch64_gdb_get_sve_reg(CPUARMState *env, GByteArray *buf, int reg)
> +int aarch64_gdb_get_sve_reg(CPUState *cs, GByteArray *buf, int reg)
> {
> - ARMCPU *cpu = env_archcpu(env);
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
>
> switch (reg) {
> /* The first 32 registers are the zregs */
> @@ -164,9 +171,10 @@ int aarch64_gdb_get_sve_reg(CPUARMState *env, GByteArray *buf, int reg)
> return 0;
> }
>
> -int aarch64_gdb_set_sve_reg(CPUARMState *env, uint8_t *buf, int reg)
> +int aarch64_gdb_set_sve_reg(CPUState *cs, uint8_t *buf, int reg)
> {
> - ARMCPU *cpu = env_archcpu(env);
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
>
> /* The first 32 registers are the zregs */
> switch (reg) {
> @@ -210,8 +218,11 @@ int aarch64_gdb_set_sve_reg(CPUARMState *env, uint8_t *buf, int reg)
> return 0;
> }
>
> -int aarch64_gdb_get_pauth_reg(CPUARMState *env, GByteArray *buf, int reg)
> +int aarch64_gdb_get_pauth_reg(CPUState *cs, GByteArray *buf, int reg)
> {
> + ARMCPU *cpu = ARM_CPU(cs);
> + CPUARMState *env = &cpu->env;
> +
> switch (reg) {
> case 0: /* pauth_dmask */
> case 1: /* pauth_cmask */
> @@ -241,7 +252,7 @@ int aarch64_gdb_get_pauth_reg(CPUARMState *env, GByteArray *buf, int reg)
> }
> }
>
> -int aarch64_gdb_set_pauth_reg(CPUARMState *env, uint8_t *buf, int reg)
> +int aarch64_gdb_set_pauth_reg(CPUState *cs, uint8_t *buf, int reg)
> {
> /* All pseudo registers are read-only. */
> return 0;
> diff --git a/target/hexagon/gdbstub.c b/target/hexagon/gdbstub.c
> index 54d37e006e03..6007e6462b99 100644
> --- a/target/hexagon/gdbstub.c
> +++ b/target/hexagon/gdbstub.c
> @@ -81,8 +81,11 @@ static int gdb_get_qreg(CPUHexagonState *env, GByteArray *mem_buf, int n)
> return total;
> }
>
> -int hexagon_hvx_gdb_read_register(CPUHexagonState *env, GByteArray *mem_buf, int n)
> +int hexagon_hvx_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
> {
> + HexagonCPU *cpu = HEXAGON_CPU(cs);
> + CPUHexagonState *env = &cpu->env;
> +
> if (n < NUM_VREGS) {
> return gdb_get_vreg(env, mem_buf, n);
> }
> @@ -115,8 +118,11 @@ static int gdb_put_qreg(CPUHexagonState *env, uint8_t *mem_buf, int n)
> return MAX_VEC_SIZE_BYTES / 8;
> }
>
> -int hexagon_hvx_gdb_write_register(CPUHexagonState *env, uint8_t *mem_buf, int n)
> +int hexagon_hvx_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + HexagonCPU *cpu = HEXAGON_CPU(cs);
> + CPUHexagonState *env = &cpu->env;
> +
> if (n < NUM_VREGS) {
> return gdb_put_vreg(env, mem_buf, n);
> }
> diff --git a/target/loongarch/gdbstub.c b/target/loongarch/gdbstub.c
> index 843a869450ee..22c6889011e6 100644
> --- a/target/loongarch/gdbstub.c
> +++ b/target/loongarch/gdbstub.c
> @@ -84,9 +84,11 @@ int loongarch_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
> return length;
> }
>
> -static int loongarch_gdb_get_fpu(CPULoongArchState *env,
> - GByteArray *mem_buf, int n)
> +static int loongarch_gdb_get_fpu(CPUState *cs, GByteArray *mem_buf, int n)
> {
> + LoongArchCPU *cpu = LOONGARCH_CPU(cs);
> + CPULoongArchState *env = &cpu->env;
> +
> if (0 <= n && n < 32) {
> return gdb_get_reg64(mem_buf, env->fpr[n].vreg.D(0));
> } else if (32 <= n && n < 40) {
> @@ -97,9 +99,10 @@ static int loongarch_gdb_get_fpu(CPULoongArchState *env,
> return 0;
> }
>
> -static int loongarch_gdb_set_fpu(CPULoongArchState *env,
> - uint8_t *mem_buf, int n)
> +static int loongarch_gdb_set_fpu(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + LoongArchCPU *cpu = LOONGARCH_CPU(cs);
> + CPULoongArchState *env = &cpu->env;
> int length = 0;
>
> if (0 <= n && n < 32) {
> diff --git a/target/m68k/helper.c b/target/m68k/helper.c
> index 675f2dcd5ad4..a5ee4d87e325 100644
> --- a/target/m68k/helper.c
> +++ b/target/m68k/helper.c
> @@ -69,8 +69,11 @@ void m68k_cpu_list(void)
> g_slist_free(list);
> }
>
> -static int cf_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n)
> +static int cf_fpu_gdb_get_reg(CPUState *cs, GByteArray *mem_buf, int n)
> {
> + M68kCPU *cpu = M68K_CPU(cs);
> + CPUM68KState *env = &cpu->env;
> +
> if (n < 8) {
> float_status s;
> return gdb_get_reg64(mem_buf, floatx80_to_float64(env->fregs[n].d, &s));
> @@ -86,8 +89,11 @@ static int cf_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n)
> return 0;
> }
>
> -static int cf_fpu_gdb_set_reg(CPUM68KState *env, uint8_t *mem_buf, int n)
> +static int cf_fpu_gdb_set_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + M68kCPU *cpu = M68K_CPU(cs);
> + CPUM68KState *env = &cpu->env;
> +
> if (n < 8) {
> float_status s;
> env->fregs[n].d = float64_to_floatx80(ldq_p(mem_buf), &s);
> @@ -106,8 +112,11 @@ static int cf_fpu_gdb_set_reg(CPUM68KState *env, uint8_t *mem_buf, int n)
> return 0;
> }
>
> -static int m68k_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n)
> +static int m68k_fpu_gdb_get_reg(CPUState *cs, GByteArray *mem_buf, int n)
> {
> + M68kCPU *cpu = M68K_CPU(cs);
> + CPUM68KState *env = &cpu->env;
> +
> if (n < 8) {
> int len = gdb_get_reg16(mem_buf, env->fregs[n].l.upper);
> len += gdb_get_reg16(mem_buf, 0);
> @@ -125,8 +134,11 @@ static int m68k_fpu_gdb_get_reg(CPUM68KState *env, GByteArray *mem_buf, int n)
> return 0;
> }
>
> -static int m68k_fpu_gdb_set_reg(CPUM68KState *env, uint8_t *mem_buf, int n)
> +static int m68k_fpu_gdb_set_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + M68kCPU *cpu = M68K_CPU(cs);
> + CPUM68KState *env = &cpu->env;
> +
> if (n < 8) {
> env->fregs[n].l.upper = lduw_be_p(mem_buf);
> env->fregs[n].l.lower = ldq_be_p(mem_buf + 4);
> diff --git a/target/microblaze/gdbstub.c b/target/microblaze/gdbstub.c
> index 29ac6e9c0f72..6ffc5ad0752c 100644
> --- a/target/microblaze/gdbstub.c
> +++ b/target/microblaze/gdbstub.c
> @@ -94,8 +94,10 @@ int mb_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
> return gdb_get_reg32(mem_buf, val);
> }
>
> -int mb_cpu_gdb_read_stack_protect(CPUMBState *env, GByteArray *mem_buf, int n)
> +int mb_cpu_gdb_read_stack_protect(CPUState *cs, GByteArray *mem_buf, int n)
> {
> + MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs);
> + CPUMBState *env = &cpu->env;
> uint32_t val;
>
> switch (n) {
> @@ -153,8 +155,11 @@ int mb_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
> return 4;
> }
>
> -int mb_cpu_gdb_write_stack_protect(CPUMBState *env, uint8_t *mem_buf, int n)
> +int mb_cpu_gdb_write_stack_protect(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs);
> + CPUMBState *env = &cpu->env;
> +
> switch (n) {
> case GDB_SP_SHL:
> env->slr = ldl_p(mem_buf);
> diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c
> index 09b852464f38..8ca37b6bf952 100644
> --- a/target/ppc/gdbstub.c
> +++ b/target/ppc/gdbstub.c
> @@ -369,8 +369,10 @@ static int gdb_find_spr_idx(CPUPPCState *env, int n)
> return -1;
> }
>
> -static int gdb_get_spr_reg(CPUPPCState *env, GByteArray *buf, int n)
> +static int gdb_get_spr_reg(CPUState *cs, GByteArray *buf, int n)
> {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
> int reg;
> int len;
>
> @@ -385,8 +387,10 @@ static int gdb_get_spr_reg(CPUPPCState *env, GByteArray *buf, int n)
> return len;
> }
>
> -static int gdb_set_spr_reg(CPUPPCState *env, uint8_t *mem_buf, int n)
> +static int gdb_set_spr_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
> int reg;
> int len;
>
> @@ -403,8 +407,10 @@ static int gdb_set_spr_reg(CPUPPCState *env, uint8_t *mem_buf, int n)
> }
> #endif
>
> -static int gdb_get_float_reg(CPUPPCState *env, GByteArray *buf, int n)
> +static int gdb_get_float_reg(CPUState *cs, GByteArray *buf, int n)
> {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
> uint8_t *mem_buf;
> if (n < 32) {
> gdb_get_reg64(buf, *cpu_fpr_ptr(env, n));
> @@ -421,8 +427,11 @@ static int gdb_get_float_reg(CPUPPCState *env, GByteArray *buf, int n)
> return 0;
> }
>
> -static int gdb_set_float_reg(CPUPPCState *env, uint8_t *mem_buf, int n)
> +static int gdb_set_float_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
> +
> if (n < 32) {
> ppc_maybe_bswap_register(env, mem_buf, 8);
> *cpu_fpr_ptr(env, n) = ldq_p(mem_buf);
> @@ -436,8 +445,10 @@ static int gdb_set_float_reg(CPUPPCState *env, uint8_t *mem_buf, int n)
> return 0;
> }
>
> -static int gdb_get_avr_reg(CPUPPCState *env, GByteArray *buf, int n)
> +static int gdb_get_avr_reg(CPUState *cs, GByteArray *buf, int n)
> {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
> uint8_t *mem_buf;
>
> if (n < 32) {
> @@ -462,8 +473,11 @@ static int gdb_get_avr_reg(CPUPPCState *env, GByteArray *buf, int n)
> return 0;
> }
>
> -static int gdb_set_avr_reg(CPUPPCState *env, uint8_t *mem_buf, int n)
> +static int gdb_set_avr_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
> +
> if (n < 32) {
> ppc_avr_t *avr = cpu_avr_ptr(env, n);
> ppc_maybe_bswap_register(env, mem_buf, 16);
> @@ -484,8 +498,11 @@ static int gdb_set_avr_reg(CPUPPCState *env, uint8_t *mem_buf, int n)
> return 0;
> }
>
> -static int gdb_get_spe_reg(CPUPPCState *env, GByteArray *buf, int n)
> +static int gdb_get_spe_reg(CPUState *cs, GByteArray *buf, int n)
> {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
> +
> if (n < 32) {
> #if defined(TARGET_PPC64)
> gdb_get_reg32(buf, env->gpr[n] >> 32);
> @@ -508,8 +525,11 @@ static int gdb_get_spe_reg(CPUPPCState *env, GByteArray *buf, int n)
> return 0;
> }
>
> -static int gdb_set_spe_reg(CPUPPCState *env, uint8_t *mem_buf, int n)
> +static int gdb_set_spe_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
> +
> if (n < 32) {
> #if defined(TARGET_PPC64)
> target_ulong lo = (uint32_t)env->gpr[n];
> @@ -537,8 +557,11 @@ static int gdb_set_spe_reg(CPUPPCState *env, uint8_t *mem_buf, int n)
> return 0;
> }
>
> -static int gdb_get_vsx_reg(CPUPPCState *env, GByteArray *buf, int n)
> +static int gdb_get_vsx_reg(CPUState *cs, GByteArray *buf, int n)
> {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
> +
> if (n < 32) {
> gdb_get_reg64(buf, *cpu_vsrl_ptr(env, n));
> ppc_maybe_bswap_register(env, gdb_get_reg_ptr(buf, 8), 8);
> @@ -547,8 +570,11 @@ static int gdb_get_vsx_reg(CPUPPCState *env, GByteArray *buf, int n)
> return 0;
> }
>
> -static int gdb_set_vsx_reg(CPUPPCState *env, uint8_t *mem_buf, int n)
> +static int gdb_set_vsx_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + PowerPCCPU *cpu = POWERPC_CPU(cs);
> + CPUPPCState *env = &cpu->env;
> +
> if (n < 32) {
> ppc_maybe_bswap_register(env, mem_buf, 8);
> *cpu_vsrl_ptr(env, n) = ldq_p(mem_buf);
> diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c
> index a879869fa1aa..68d0fdc1fd6c 100644
> --- a/target/riscv/gdbstub.c
> +++ b/target/riscv/gdbstub.c
> @@ -108,8 +108,11 @@ int riscv_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
> return length;
> }
>
> -static int riscv_gdb_get_fpu(CPURISCVState *env, GByteArray *buf, int n)
> +static int riscv_gdb_get_fpu(CPUState *cs, GByteArray *buf, int n)
> {
> + RISCVCPU *cpu = RISCV_CPU(cs);
> + CPURISCVState *env = &cpu->env;
> +
> if (n < 32) {
> if (env->misa_ext & RVD) {
> return gdb_get_reg64(buf, env->fpr[n]);
> @@ -121,8 +124,11 @@ static int riscv_gdb_get_fpu(CPURISCVState *env, GByteArray *buf, int n)
> return 0;
> }
>
> -static int riscv_gdb_set_fpu(CPURISCVState *env, uint8_t *mem_buf, int n)
> +static int riscv_gdb_set_fpu(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + RISCVCPU *cpu = RISCV_CPU(cs);
> + CPURISCVState *env = &cpu->env;
> +
> if (n < 32) {
> env->fpr[n] = ldq_p(mem_buf); /* always 64-bit */
> return sizeof(uint64_t);
> @@ -130,8 +136,10 @@ static int riscv_gdb_set_fpu(CPURISCVState *env, uint8_t *mem_buf, int n)
> return 0;
> }
>
> -static int riscv_gdb_get_vector(CPURISCVState *env, GByteArray *buf, int n)
> +static int riscv_gdb_get_vector(CPUState *cs, GByteArray *buf, int n)
> {
> + RISCVCPU *cpu = RISCV_CPU(cs);
> + CPURISCVState *env = &cpu->env;
> uint16_t vlenb = riscv_cpu_cfg(env)->vlen >> 3;
> if (n < 32) {
> int i;
> @@ -146,8 +154,10 @@ static int riscv_gdb_get_vector(CPURISCVState *env, GByteArray *buf, int n)
> return 0;
> }
>
> -static int riscv_gdb_set_vector(CPURISCVState *env, uint8_t *mem_buf, int n)
> +static int riscv_gdb_set_vector(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + RISCVCPU *cpu = RISCV_CPU(cs);
> + CPURISCVState *env = &cpu->env;
> uint16_t vlenb = riscv_cpu_cfg(env)->vlen >> 3;
> if (n < 32) {
> int i;
> @@ -160,8 +170,11 @@ static int riscv_gdb_set_vector(CPURISCVState *env, uint8_t *mem_buf, int n)
> return 0;
> }
>
> -static int riscv_gdb_get_csr(CPURISCVState *env, GByteArray *buf, int n)
> +static int riscv_gdb_get_csr(CPUState *cs, GByteArray *buf, int n)
> {
> + RISCVCPU *cpu = RISCV_CPU(cs);
> + CPURISCVState *env = &cpu->env;
> +
> if (n < CSR_TABLE_SIZE) {
> target_ulong val = 0;
> int result;
> @@ -174,8 +187,11 @@ static int riscv_gdb_get_csr(CPURISCVState *env, GByteArray *buf, int n)
> return 0;
> }
>
> -static int riscv_gdb_set_csr(CPURISCVState *env, uint8_t *mem_buf, int n)
> +static int riscv_gdb_set_csr(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + RISCVCPU *cpu = RISCV_CPU(cs);
> + CPURISCVState *env = &cpu->env;
> +
> if (n < CSR_TABLE_SIZE) {
> target_ulong val = ldtul_p(mem_buf);
> int result;
> @@ -188,25 +204,31 @@ static int riscv_gdb_set_csr(CPURISCVState *env, uint8_t *mem_buf, int n)
> return 0;
> }
>
> -static int riscv_gdb_get_virtual(CPURISCVState *cs, GByteArray *buf, int n)
> +static int riscv_gdb_get_virtual(CPUState *cs, GByteArray *buf, int n)
> {
> if (n == 0) {
> #ifdef CONFIG_USER_ONLY
> return gdb_get_regl(buf, 0);
> #else
> - return gdb_get_regl(buf, cs->priv);
> + RISCVCPU *cpu = RISCV_CPU(cs);
> + CPURISCVState *env = &cpu->env;
> +
> + return gdb_get_regl(buf, env->priv);
> #endif
> }
> return 0;
> }
>
> -static int riscv_gdb_set_virtual(CPURISCVState *cs, uint8_t *mem_buf, int n)
> +static int riscv_gdb_set_virtual(CPUState *cs, uint8_t *mem_buf, int n)
> {
> if (n == 0) {
> #ifndef CONFIG_USER_ONLY
> - cs->priv = ldtul_p(mem_buf) & 0x3;
> - if (cs->priv == PRV_RESERVED) {
> - cs->priv = PRV_S;
> + RISCVCPU *cpu = RISCV_CPU(cs);
> + CPURISCVState *env = &cpu->env;
> +
> + env->priv = ldtul_p(mem_buf) & 0x3;
> + if (env->priv == PRV_RESERVED) {
> + env->priv = PRV_S;
> }
> #endif
> return sizeof(target_ulong);
> diff --git a/target/s390x/gdbstub.c b/target/s390x/gdbstub.c
> index 02c388dc323b..c1e7c59b8222 100644
> --- a/target/s390x/gdbstub.c
> +++ b/target/s390x/gdbstub.c
> @@ -70,8 +70,11 @@ int s390_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
> #define S390_A0_REGNUM 0
> #define S390_A15_REGNUM 15
>
> -static int cpu_read_ac_reg(CPUS390XState *env, GByteArray *buf, int n)
> +static int cpu_read_ac_reg(CPUState *cs, GByteArray *buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_A0_REGNUM ... S390_A15_REGNUM:
> return gdb_get_reg32(buf, env->aregs[n]);
> @@ -80,8 +83,11 @@ static int cpu_read_ac_reg(CPUS390XState *env, GByteArray *buf, int n)
> }
> }
>
> -static int cpu_write_ac_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> +static int cpu_write_ac_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_A0_REGNUM ... S390_A15_REGNUM:
> env->aregs[n] = ldl_p(mem_buf);
> @@ -97,8 +103,11 @@ static int cpu_write_ac_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> #define S390_F0_REGNUM 1
> #define S390_F15_REGNUM 16
>
> -static int cpu_read_fp_reg(CPUS390XState *env, GByteArray *buf, int n)
> +static int cpu_read_fp_reg(CPUState *cs, GByteArray *buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_FPC_REGNUM:
> return gdb_get_reg32(buf, env->fpc);
> @@ -109,8 +118,11 @@ static int cpu_read_fp_reg(CPUS390XState *env, GByteArray *buf, int n)
> }
> }
>
> -static int cpu_write_fp_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> +static int cpu_write_fp_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_FPC_REGNUM:
> env->fpc = ldl_p(mem_buf);
> @@ -129,8 +141,10 @@ static int cpu_write_fp_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> #define S390_V16_REGNUM 16
> #define S390_V31_REGNUM 31
>
> -static int cpu_read_vreg(CPUS390XState *env, GByteArray *buf, int n)
> +static int cpu_read_vreg(CPUState *cs, GByteArray *buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> int ret;
>
> switch (n) {
> @@ -148,8 +162,11 @@ static int cpu_read_vreg(CPUS390XState *env, GByteArray *buf, int n)
> return ret;
> }
>
> -static int cpu_write_vreg(CPUS390XState *env, uint8_t *mem_buf, int n)
> +static int cpu_write_vreg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_V0L_REGNUM ... S390_V15L_REGNUM:
> env->vregs[n][1] = ldtul_p(mem_buf + 8);
> @@ -168,8 +185,11 @@ static int cpu_write_vreg(CPUS390XState *env, uint8_t *mem_buf, int n)
> #define S390_C15_REGNUM 15
>
> #ifndef CONFIG_USER_ONLY
> -static int cpu_read_c_reg(CPUS390XState *env, GByteArray *buf, int n)
> +static int cpu_read_c_reg(CPUState *cs, GByteArray *buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_C0_REGNUM ... S390_C15_REGNUM:
> return gdb_get_regl(buf, env->cregs[n]);
> @@ -178,8 +198,11 @@ static int cpu_read_c_reg(CPUS390XState *env, GByteArray *buf, int n)
> }
> }
>
> -static int cpu_write_c_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> +static int cpu_write_c_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_C0_REGNUM ... S390_C15_REGNUM:
> env->cregs[n] = ldtul_p(mem_buf);
> @@ -199,8 +222,11 @@ static int cpu_write_c_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> #define S390_VIRT_BEA_REGNUM 2
> #define S390_VIRT_PREFIX_REGNUM 3
>
> -static int cpu_read_virt_reg(CPUS390XState *env, GByteArray *mem_buf, int n)
> +static int cpu_read_virt_reg(CPUState *cs, GByteArray *mem_buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_VIRT_CKC_REGNUM:
> return gdb_get_regl(mem_buf, env->ckc);
> @@ -215,24 +241,27 @@ static int cpu_read_virt_reg(CPUS390XState *env, GByteArray *mem_buf, int n)
> }
> }
>
> -static int cpu_write_virt_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> +static int cpu_write_virt_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_VIRT_CKC_REGNUM:
> env->ckc = ldtul_p(mem_buf);
> - cpu_synchronize_post_init(env_cpu(env));
> + cpu_synchronize_post_init(cs);
> return 8;
> case S390_VIRT_CPUTM_REGNUM:
> env->cputm = ldtul_p(mem_buf);
> - cpu_synchronize_post_init(env_cpu(env));
> + cpu_synchronize_post_init(cs);
> return 8;
> case S390_VIRT_BEA_REGNUM:
> env->gbea = ldtul_p(mem_buf);
> - cpu_synchronize_post_init(env_cpu(env));
> + cpu_synchronize_post_init(cs);
> return 8;
> case S390_VIRT_PREFIX_REGNUM:
> env->psa = ldtul_p(mem_buf);
> - cpu_synchronize_post_init(env_cpu(env));
> + cpu_synchronize_post_init(cs);
> return 8;
> default:
> return 0;
> @@ -245,8 +274,11 @@ static int cpu_write_virt_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> #define S390_VIRT_KVM_PFS_REGNUM 2
> #define S390_VIRT_KVM_PFC_REGNUM 3
>
> -static int cpu_read_virt_kvm_reg(CPUS390XState *env, GByteArray *mem_buf, int n)
> +static int cpu_read_virt_kvm_reg(CPUState *cs, GByteArray *mem_buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_VIRT_KVM_PP_REGNUM:
> return gdb_get_regl(mem_buf, env->pp);
> @@ -261,8 +293,11 @@ static int cpu_read_virt_kvm_reg(CPUS390XState *env, GByteArray *mem_buf, int n)
> }
> }
>
> -static int cpu_write_virt_kvm_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> +static int cpu_write_virt_kvm_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> switch (n) {
> case S390_VIRT_KVM_PP_REGNUM:
> env->pp = ldtul_p(mem_buf);
> @@ -292,13 +327,19 @@ static int cpu_write_virt_kvm_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> #define S390_GS_GSSM_REGNUM 2
> #define S390_GS_GSEPLA_REGNUM 3
>
> -static int cpu_read_gs_reg(CPUS390XState *env, GByteArray *buf, int n)
> +static int cpu_read_gs_reg(CPUState *cs, GByteArray *buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> return gdb_get_regl(buf, env->gscb[n]);
> }
>
> -static int cpu_write_gs_reg(CPUS390XState *env, uint8_t *mem_buf, int n)
> +static int cpu_write_gs_reg(CPUState *cs, uint8_t *mem_buf, int n)
> {
> + S390CPU *cpu = S390_CPU(cs);
> + CPUS390XState *env = &cpu->env;
> +
> env->gscb[n] = ldtul_p(mem_buf);
> cpu_synchronize_post_init(env_cpu(env));
> return 8;
>
> --
> 2.43.0
>
>
next prev parent reply other threads:[~2023-12-18 0:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-13 6:40 [PATCH v17 00/14] plugins: Allow to read registers Akihiko Odaki
2023-12-13 6:41 ` [PATCH v17 01/14] target/arm: Use GDBFeature for dynamic XML Akihiko Odaki
2023-12-13 6:41 ` [PATCH v17 02/14] target/ppc: " Akihiko Odaki
2023-12-13 6:41 ` [PATCH v17 03/14] target/riscv: " Akihiko Odaki
2023-12-18 0:11 ` Alistair Francis
2023-12-13 6:41 ` [PATCH v17 04/14] gdbstub: Use GDBFeature for gdb_register_coprocessor Akihiko Odaki
2023-12-18 0:12 ` Alistair Francis
2023-12-13 6:41 ` [PATCH v17 05/14] gdbstub: Use GDBFeature for GDBRegisterState Akihiko Odaki
2023-12-13 6:41 ` [PATCH v17 06/14] gdbstub: Change gdb_get_reg_cb and gdb_set_reg_cb Akihiko Odaki
2023-12-18 0:15 ` Alistair Francis [this message]
2023-12-13 6:41 ` [PATCH v17 07/14] gdbstub: Simplify XML lookup Akihiko Odaki
2023-12-13 6:41 ` [PATCH v17 08/14] gdbstub: Infer number of core registers from XML Akihiko Odaki
2023-12-18 0:16 ` Alistair Francis
2023-12-13 6:41 ` [PATCH v17 09/14] hw/core/cpu: Remove gdb_get_dynamic_xml member Akihiko Odaki
2023-12-18 0:17 ` Alistair Francis
2023-12-13 6:41 ` [PATCH v17 10/14] gdbstub: Add members to identify registers to GDBFeature Akihiko Odaki
2023-12-13 6:41 ` [PATCH v17 11/14] gdbstub: Expose functions to read registers Akihiko Odaki
2023-12-13 6:41 ` [PATCH v17 12/14] plugins: Use different helpers when reading registers Akihiko Odaki
2023-12-13 6:41 ` [PATCH v17 13/14] plugins: Allow to read registers Akihiko Odaki
2023-12-13 6:41 ` [PATCH v17 14/14] contrib/plugins: Allow to log registers Akihiko Odaki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKmqyKONQ_FQnx8ts0ZKG1s5zu56vr=86_4P0UhR1c9-+mJTWw@mail.gmail.com' \
--to=alistair23@gmail.com \
--cc=20231213-riscv-v7-0-a760156a337f@daynix.com \
--cc=a.anenkov@yadro.com \
--cc=akihiko.odaki@daynix.com \
--cc=alex.bennee@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=bcain@quicinc.com \
--cc=bin.meng@windriver.com \
--cc=clg@kaod.org \
--cc=crosa@redhat.com \
--cc=danielhb413@gmail.com \
--cc=david@redhat.com \
--cc=dbarboza@ventanamicro.com \
--cc=edgar.iglesias@gmail.com \
--cc=eduardo@habkost.net \
--cc=erdnaxe@crans.org \
--cc=gaosong@loongson.cn \
--cc=iii@linux.ibm.com \
--cc=jsnow@redhat.com \
--cc=laurent@vivier.eu \
--cc=liwei1518@gmail.com \
--cc=m.tyutin@yadro.com \
--cc=ma.mandourr@gmail.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mrolnik@gmail.com \
--cc=npiggin@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wangyanan55@huawei.com \
--cc=ysato@users.sourceforge.jp \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).