@samitouri / QOSamiQemu / commits / 429471c801

target/ppc: Remove dead code depending on USE_APPLE_GDB

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. Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20260219191955.83815-9-philmd@linaro.org>

Philippe Mathieu-Daudé committed Feb 17, 2026 at 15:18 UTC 429471c801884b2456cab311d1fc482f8690b231
3 files changed -133
target/ppc/cpu.h
-2
@@ -1637,9 +1637,7 @@ static inline bool vhyp_cpu_in_nested(PowerPCCPU *cpu)
1637
1638 void ppc_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
1639 int ppc_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
1640 -int ppc_cpu_gdb_read_register_apple(CPUState *cpu, GByteArray *buf, int reg);
1640 int ppc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
1642 -int ppc_cpu_gdb_write_register_apple(CPUState *cpu, uint8_t *buf, int reg);
1641 #ifndef CONFIG_USER_ONLY
1642 hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
1643 #endif
target/ppc/cpu_init.c
-7
@@ -52,7 +52,6 @@
52 #endif
53
54 #include "cpu_init.h"
55 -/* #define USE_APPLE_GDB */
55
56 static const Property powerpc_cpu_properties[] = {
57 DEFINE_PROP_BOOL("rtas-stopped-state", PowerPCCPU,
@@ -7554,12 +7553,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, const void *data)
7553 #endif
7554
7555 cc->gdb_num_core_regs = 70;
7557 -#ifdef USE_APPLE_GDB
7558 - cc->gdb_read_register = ppc_cpu_gdb_read_register_apple;
7559 - cc->gdb_write_register = ppc_cpu_gdb_write_register_apple;
7560 - cc->gdb_num_core_regs = 71 + 32;
7561 -#endif
7562 -
7556 cc->gdb_arch_name = ppc_gdb_arch_name;
7557 #if defined(TARGET_PPC64)
7558 cc->gdb_core_xml_file = "power64-core.xml";
target/ppc/gdbstub.c
-124
@@ -23,31 +23,6 @@
23 #include "gdbstub/helpers.h"
24 #include "internal.h"
25
26 -static int ppc_gdb_register_len_apple(int n)
27 -{
28 - switch (n) {
29 - case 0 ... 31:
30 - /* gprs */
31 - return 8;
32 - case 32 ... 63:
33 - /* fprs */
34 - return 8;
35 - case 64 ... 95:
36 - return 16;
37 - case 64 + 32: /* nip */
38 - case 65 + 32: /* msr */
39 - case 67 + 32: /* lr */
40 - case 68 + 32: /* ctr */
41 - case 70 + 32: /* fpscr */
42 - return 8;
43 - case 66 + 32: /* cr */
44 - case 69 + 32: /* xer */
45 - return 4;
46 - default:
47 - return 0;
48 - }
49 -}
50 -
26 static int ppc_gdb_register_len(int n)
27 {
28 switch (n) {
@@ -149,59 +124,6 @@ int ppc_cpu_gdb_read_register(CPUState *cs, GByteArray *buf, int n)
124 return r;
125 }
126
152 -int ppc_cpu_gdb_read_register_apple(CPUState *cs, GByteArray *buf, int n)
153 -{
154 - CPUPPCState *env = cpu_env(cs);
155 - uint8_t *mem_buf;
156 - int r = ppc_gdb_register_len_apple(n);
157 -
158 - if (!r) {
159 - return r;
160 - }
161 -
162 - if (n < 32) {
163 - /* gprs */
164 - gdb_get_reg64(buf, env->gpr[n]);
165 - } else if (n < 64) {
166 - /* fprs */
167 - gdb_get_reg64(buf, *cpu_fpr_ptr(env, n - 32));
168 - } else if (n < 96) {
169 - /* Altivec */
170 - gdb_get_reg64(buf, n - 64);
171 - gdb_get_reg64(buf, 0);
172 - } else {
173 - switch (n) {
174 - case 64 + 32:
175 - gdb_get_reg64(buf, env->nip);
176 - break;
177 - case 65 + 32:
178 - gdb_get_reg64(buf, env->msr);
179 - break;
180 - case 66 + 32:
181 - {
182 - uint32_t cr = ppc_get_cr(env);
183 - gdb_get_reg32(buf, cr);
184 - break;
185 - }
186 - case 67 + 32:
187 - gdb_get_reg64(buf, env->lr);
188 - break;
189 - case 68 + 32:
190 - gdb_get_reg64(buf, env->ctr);
191 - break;
192 - case 69 + 32:
193 - gdb_get_reg32(buf, cpu_read_xer(env));
194 - break;
195 - case 70 + 32:
196 - gdb_get_reg64(buf, env->fpscr);
197 - break;
198 - }
199 - }
200 - mem_buf = buf->data + buf->len - r;
201 - ppc_maybe_bswap_register(env, mem_buf, r);
202 - return r;
203 -}
204 -
127 int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
128 {
129 CPUPPCState *env = cpu_env(cs);
@@ -248,52 +170,6 @@ int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
170 }
171 return r;
172 }
251 -int ppc_cpu_gdb_write_register_apple(CPUState *cs, uint8_t *mem_buf, int n)
252 -{
253 - CPUPPCState *env = cpu_env(cs);
254 - int r = ppc_gdb_register_len_apple(n);
255 -
256 - if (!r) {
257 - return r;
258 - }
259 - ppc_maybe_bswap_register(env, mem_buf, r);
260 - if (n < 32) {
261 - /* gprs */
262 - env->gpr[n] = ldq_p(mem_buf);
263 - } else if (n < 64) {
264 - /* fprs */
265 - *cpu_fpr_ptr(env, n - 32) = ldq_p(mem_buf);
266 - } else {
267 - switch (n) {
268 - case 64 + 32:
269 - env->nip = ldq_p(mem_buf);
270 - break;
271 - case 65 + 32:
272 - ppc_store_msr(env, ldq_p(mem_buf));
273 - break;
274 - case 66 + 32:
275 - {
276 - uint32_t cr = ldl_p(mem_buf);
277 - ppc_set_cr(env, cr);
278 - break;
279 - }
280 - case 67 + 32:
281 - env->lr = ldq_p(mem_buf);
282 - break;
283 - case 68 + 32:
284 - env->ctr = ldq_p(mem_buf);
285 - break;
286 - case 69 + 32:
287 - cpu_write_xer(env, ldl_p(mem_buf));
288 - break;
289 - case 70 + 32:
290 - /* fpscr */
291 - ppc_store_fpscr(env, ldq_p(mem_buf));
292 - break;
293 - }
294 - }
295 - return r;
296 -}
173
174 #ifndef CONFIG_USER_ONLY
175 static void gdb_gen_spr_feature(CPUState *cs)