The gdb_get_regl() calls in sparc_cp0_gdb_read_register() are guarded within:
#if defined(TARGET_ABI32) || !defined(TARGET_SPARC64) /* 32-bit */ #else /* 64-bit */ #endif Since the #else branch is only compiled for 64-bit targets where gdb_get_regl() forwards to gdb_get_reg64(), we can call the latter directly, dropping the use of the deprecated helper. Assert the invariant at build time to be safe. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/sparc/gdbstub.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/target/sparc/gdbstub.c b/target/sparc/gdbstub.c index 2874ce1b350..d3ccf533839 100644 --- a/target/sparc/gdbstub.c +++ b/target/sparc/gdbstub.c @@ -106,22 +106,23 @@ static int sparc_cp0_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n) return gdb_get_rega(mem_buf, 0); /* csr */ } #else + QEMU_BUILD_BUG_ON(TARGET_LONG_BITS != 64); switch (n) { case 0: - return gdb_get_regl(mem_buf, env->pc); + return gdb_get_reg64(mem_buf, env->pc); case 1: - return gdb_get_regl(mem_buf, env->npc); + return gdb_get_reg64(mem_buf, env->npc); case 2: - return gdb_get_regl(mem_buf, (cpu_get_ccr(env) << 32) | + return gdb_get_reg64(mem_buf, (cpu_get_ccr(env) << 32) | ((env->asi & 0xff) << 24) | ((env->pstate & 0xfff) << 8) | cpu_get_cwp64(env)); case 3: - return gdb_get_regl(mem_buf, cpu_get_fsr(env)); + return gdb_get_reg64(mem_buf, cpu_get_fsr(env)); case 4: - return gdb_get_regl(mem_buf, env->fprs); + return gdb_get_reg64(mem_buf, env->fprs); case 5: - return gdb_get_regl(mem_buf, env->y); + return gdb_get_reg64(mem_buf, env->y); } #endif return 0; -- 2.55.0
