@samitouri / QOSamiQemu / commits / 27385bc1ce

target/ppc: Replace ldtul_p() -> ldn_p()

Prefer ldn_p(target_long_bits/8) over target-specific ldtul_p(). Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-ID: <20260219191955.83815-26-philmd@linaro.org>

Philippe Mathieu-Daudé committed Feb 17, 2026 at 16:13 UTC 27385bc1ce22ec6248da412696e9e8c66771bcef
1 file changed +11 -11
target/ppc/gdbstub.c
+11 -11
@@ -23,12 +23,12 @@
23 #include "gdbstub/helpers.h"
24 #include "internal.h"
25
26 -static int ppc_gdb_register_len(int n)
26 +static unsigned ppc_gdb_register_len(int n)
27 {
28 switch (n) {
29 case 0 ... 31:
30 /* gprs */
31 - return sizeof(target_ulong);
31 + return target_long_bits() / 8;
32 case 66:
33 /* cr */
34 case 69:
@@ -42,7 +42,7 @@ static int ppc_gdb_register_len(int n)
42 /* lr */
43 case 68:
44 /* ctr */
45 - return sizeof(target_ulong);
45 + return target_long_bits() / 8;
46 default:
47 return 0;
48 }
@@ -85,7 +85,7 @@ int ppc_cpu_gdb_read_register(CPUState *cs, GByteArray *buf, int n)
85 {
86 CPUPPCState *env = cpu_env(cs);
87 uint8_t *mem_buf;
88 - int r = ppc_gdb_register_len(n);
88 + unsigned r = ppc_gdb_register_len(n);
89
90 if (!r) {
91 return r;
@@ -127,7 +127,7 @@ int ppc_cpu_gdb_read_register(CPUState *cs, GByteArray *buf, int n)
127 int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
128 {
129 CPUPPCState *env = cpu_env(cs);
130 - int r = ppc_gdb_register_len(n);
130 + unsigned r = ppc_gdb_register_len(n);
131
132 if (!r) {
133 return r;
@@ -135,17 +135,17 @@ int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
135 ppc_maybe_bswap_register(env, mem_buf, r);
136 if (n < 32) {
137 /* gprs */
138 - env->gpr[n] = ldtul_p(mem_buf);
138 + env->gpr[n] = ldn_p(mem_buf, r);
139 } else if (n < 64) {
140 /* fprs */
141 *cpu_fpr_ptr(env, n - 32) = ldq_p(mem_buf);
142 } else {
143 switch (n) {
144 case 64:
145 - env->nip = ldtul_p(mem_buf);
145 + env->nip = ldn_p(mem_buf, r);
146 break;
147 case 65:
148 - ppc_store_msr(env, ldtul_p(mem_buf));
148 + ppc_store_msr(env, ldn_p(mem_buf, r));
149 break;
150 case 66:
151 {
@@ -154,17 +154,17 @@ int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
154 break;
155 }
156 case 67:
157 - env->lr = ldtul_p(mem_buf);
157 + env->lr = ldn_p(mem_buf, r);
158 break;
159 case 68:
160 - env->ctr = ldtul_p(mem_buf);
160 + env->ctr = ldn_p(mem_buf, r);
161 break;
162 case 69:
163 cpu_write_xer(env, ldl_p(mem_buf));
164 break;
165 case 70:
166 /* fpscr */
167 - ppc_store_fpscr(env, ldtul_p(mem_buf));
167 + ppc_store_fpscr(env, ldn_p(mem_buf, r));
168 break;
169 }
170 }