We never defined USE_APPLE_GDB, so the code introduced in commit
b3cad3abf6d ("PPC: Add support for Apple gdb in gdbstub") is dead
since almost 12 years. Remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/ppc/cpu.h | 2 -
target/ppc/cpu_init.c | 7 ---
target/ppc/gdbstub.c | 124 ------------------------------------------
3 files changed, 133 deletions(-)
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 49445eb4ca8..d637a50798f 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1637,9 +1637,7 @@ static inline bool vhyp_cpu_in_nested(PowerPCCPU *cpu)
void ppc_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
int ppc_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
-int ppc_cpu_gdb_read_register_apple(CPUState *cpu, GByteArray *buf, int reg);
int ppc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
-int ppc_cpu_gdb_write_register_apple(CPUState *cpu, uint8_t *buf, int reg);
#ifndef CONFIG_USER_ONLY
hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
#endif
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 27de8d80204..0b5610d02d5 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -52,7 +52,6 @@
#endif
#include "cpu_init.h"
-/* #define USE_APPLE_GDB */
static const Property powerpc_cpu_properties[] = {
DEFINE_PROP_BOOL("rtas-stopped-state", PowerPCCPU,
@@ -7554,12 +7553,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, const void *data)
#endif
cc->gdb_num_core_regs = 70;
-#ifdef USE_APPLE_GDB
- cc->gdb_read_register = ppc_cpu_gdb_read_register_apple;
- cc->gdb_write_register = ppc_cpu_gdb_write_register_apple;
- cc->gdb_num_core_regs = 71 + 32;
-#endif
-
cc->gdb_arch_name = ppc_gdb_arch_name;
#if defined(TARGET_PPC64)
cc->gdb_core_xml_file = "power64-core.xml";
diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c
index b19c0f1ea9c..ece1e5c9bd7 100644
--- a/target/ppc/gdbstub.c
+++ b/target/ppc/gdbstub.c
@@ -23,31 +23,6 @@
#include "gdbstub/helpers.h"
#include "internal.h"
-static int ppc_gdb_register_len_apple(int n)
-{
- switch (n) {
- case 0 ... 31:
- /* gprs */
- return 8;
- case 32 ... 63:
- /* fprs */
- return 8;
- case 64 ... 95:
- return 16;
- case 64 + 32: /* nip */
- case 65 + 32: /* msr */
- case 67 + 32: /* lr */
- case 68 + 32: /* ctr */
- case 70 + 32: /* fpscr */
- return 8;
- case 66 + 32: /* cr */
- case 69 + 32: /* xer */
- return 4;
- default:
- return 0;
- }
-}
-
static int ppc_gdb_register_len(int n)
{
switch (n) {
@@ -149,59 +124,6 @@ int ppc_cpu_gdb_read_register(CPUState *cs, GByteArray *buf, int n)
return r;
}
-int ppc_cpu_gdb_read_register_apple(CPUState *cs, GByteArray *buf, int n)
-{
- CPUPPCState *env = cpu_env(cs);
- uint8_t *mem_buf;
- int r = ppc_gdb_register_len_apple(n);
-
- if (!r) {
- return r;
- }
-
- if (n < 32) {
- /* gprs */
- gdb_get_reg64(buf, env->gpr[n]);
- } else if (n < 64) {
- /* fprs */
- gdb_get_reg64(buf, *cpu_fpr_ptr(env, n - 32));
- } else if (n < 96) {
- /* Altivec */
- gdb_get_reg64(buf, n - 64);
- gdb_get_reg64(buf, 0);
- } else {
- switch (n) {
- case 64 + 32:
- gdb_get_reg64(buf, env->nip);
- break;
- case 65 + 32:
- gdb_get_reg64(buf, env->msr);
- break;
- case 66 + 32:
- {
- uint32_t cr = ppc_get_cr(env);
- gdb_get_reg32(buf, cr);
- break;
- }
- case 67 + 32:
- gdb_get_reg64(buf, env->lr);
- break;
- case 68 + 32:
- gdb_get_reg64(buf, env->ctr);
- break;
- case 69 + 32:
- gdb_get_reg32(buf, cpu_read_xer(env));
- break;
- case 70 + 32:
- gdb_get_reg64(buf, env->fpscr);
- break;
- }
- }
- mem_buf = buf->data + buf->len - r;
- ppc_maybe_bswap_register(env, mem_buf, r);
- return r;
-}
-
int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
{
CPUPPCState *env = cpu_env(cs);
@@ -248,52 +170,6 @@ int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
}
return r;
}
-int ppc_cpu_gdb_write_register_apple(CPUState *cs, uint8_t *mem_buf, int n)
-{
- CPUPPCState *env = cpu_env(cs);
- int r = ppc_gdb_register_len_apple(n);
-
- if (!r) {
- return r;
- }
- ppc_maybe_bswap_register(env, mem_buf, r);
- if (n < 32) {
- /* gprs */
- env->gpr[n] = ldq_p(mem_buf);
- } else if (n < 64) {
- /* fprs */
- *cpu_fpr_ptr(env, n - 32) = ldq_p(mem_buf);
- } else {
- switch (n) {
- case 64 + 32:
- env->nip = ldq_p(mem_buf);
- break;
- case 65 + 32:
- ppc_store_msr(env, ldq_p(mem_buf));
- break;
- case 66 + 32:
- {
- uint32_t cr = ldl_p(mem_buf);
- ppc_set_cr(env, cr);
- break;
- }
- case 67 + 32:
- env->lr = ldq_p(mem_buf);
- break;
- case 68 + 32:
- env->ctr = ldq_p(mem_buf);
- break;
- case 69 + 32:
- cpu_write_xer(env, ldl_p(mem_buf));
- break;
- case 70 + 32:
- /* fpscr */
- ppc_store_fpscr(env, ldq_p(mem_buf));
- break;
- }
- }
- return r;
-}
#ifndef CONFIG_USER_ONLY
static void gdb_gen_spr_feature(CPUState *cs)
--
2.52.0