haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

target-ppc: Fix gdbstub for ppc64le-linux-user

Browse source 
The bswap that's needed for system mode isn't required for
user mode, and in fact breaks debugging.

Signed-off-by: Richard Henderson <rth@twiddle.net>
[agraf: fix apple gdbstub implementation]
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Richard Henderson 2014-06-28 09:45:28 -07:00 committed by Alexander Graf
parent a74029f6cb
commit be5c9ddabc
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
target-ppc/gdbstub.c
View file

@ -83,16 +83,24 @@ static int ppc_gdb_register_len(int n)
} }
} }
/* We need to present the registers to gdb in the "current" memory ordering.
static void ppc_gdb_swap_register(uint8_t *mem_buf, int n, int len) For user-only mode we get this for free; TARGET_WORDS_BIGENDIAN is set to
the proper ordering for the binary, and cannot be changed.
For system mode, TARGET_WORDS_BIGENDIAN is always set, and we must check
the current mode of the chip to see if we're running in little-endian. */
static void maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len)
{ {
if (len == 4) { #ifndef CONFIG_USER_ONLY
if (!msr_le) {
/* do nothing */
} else if (len == 4) {
bswap32s((uint32_t *)mem_buf); bswap32s((uint32_t *)mem_buf);
} else if (len == 8) { } else if (len == 8) {
bswap64s((uint64_t *)mem_buf); bswap64s((uint64_t *)mem_buf);
} else { } else {
g_assert_not_reached(); g_assert_not_reached();
} }
#endif
} }
/* Old gdb always expects FP registers. Newer (xml-aware) gdb only /* Old gdb always expects FP registers. Newer (xml-aware) gdb only
@ -150,10 +158,7 @@ int ppc_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
break; break;
} }
} }
if (msr_le) { maybe_bswap_register(env, mem_buf, r);
/* If cpu is in LE mode, convert memory contents to LE. */
ppc_gdb_swap_register(mem_buf, n, r);
}
return r; return r;
} }
@ -209,10 +214,7 @@ int ppc_cpu_gdb_read_register_apple(CPUState *cs, uint8_t *mem_buf, int n)
break; break;
} }
} }
if (msr_le) { maybe_bswap_register(env, mem_buf, r);
/* If cpu is in LE mode, convert memory contents to LE. */
ppc_gdb_swap_register(mem_buf, n, r);
}
return r; return r;
} }
@ -225,10 +227,7 @@ int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
if (!r) { if (!r) {
return r; return r;
} }
if (msr_le) { maybe_bswap_register(env, mem_buf, r);
/* If cpu is in LE mode, convert memory contents to LE. */
ppc_gdb_swap_register(mem_buf, n, r);
}
if (n < 32) { if (n < 32) {
/* gprs */ /* gprs */
env->gpr[n] = ldtul_p(mem_buf); env->gpr[n] = ldtul_p(mem_buf);
@ -278,10 +277,7 @@ int ppc_cpu_gdb_write_register_apple(CPUState *cs, uint8_t *mem_buf, int n)
if (!r) { if (!r) {
return r; return r;
} }
if (msr_le) { maybe_bswap_register(env, mem_buf, r);
/* If cpu is in LE mode, convert memory contents to LE. */
ppc_gdb_swap_register(mem_buf, n, r);
}
if (n < 32) { if (n < 32) {
/* gprs */ /* gprs */
env->gpr[n] = ldq_p(mem_buf); env->gpr[n] = ldq_p(mem_buf);