* [Qemu-devel] [PATCH v4] target-ppc: gdbstub allow byte swapping for reading/writing registers
@ 2014-02-26 22:51 Thomas Falcon
2014-02-28 17:37 ` Richard Henderson
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Falcon @ 2014-02-26 22:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Falcon, qemu-ppc, agraf
This patch allows registers to be properly read from and written to
when using the gdbstub to debug a ppc guest running in little
endian mode. It accomplishes this goal by byte swapping the values of
any registers if the MSR:LE value is set.
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
---
Differences from v3:
Included ppc_cpu_gdb_register_len function suggested by Alexander Graf
Moved byteswapping loop into single function: ppc_cpu_gdb_swap_register
---
target-ppc/cpu-qom.h | 3 +
target-ppc/gdbstub.c | 141 +++++++++++++++++++++++++++++++++++---------
target-ppc/translate_init.c | 4 +-
3 files changed, 117 insertions(+), 31 deletions(-)
diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h
index 72b2232..cf4617e 100644
--- a/target-ppc/cpu-qom.h
+++ b/target-ppc/cpu-qom.h
@@ -107,9 +107,12 @@ void ppc_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,
int flags);
void ppc_cpu_dump_statistics(CPUState *cpu, FILE *f,
fprintf_function cpu_fprintf, int flags);
+cpu_gdb_swap_register(uint8_t *buf, int reg);
hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
int ppc_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
+int ppc_cpu_gdb_read_register_wrap(CPUState *cpu, uint8_t *buf, int reg);
int ppc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
+int ppc_cpu_gdb_write_register_wrap(CPUState *cpu, uint8_t *buf, int reg);
int ppc64_cpu_write_elf64_qemunote(WriteCoreDumpFunction f,
CPUState *cpu, void *opaque);
int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
diff --git a/target-ppc/gdbstub.c b/target-ppc/gdbstub.c
index 1c91090..dfdc7c1 100644
--- a/target-ppc/gdbstub.c
+++ b/target-ppc/gdbstub.c
@@ -21,6 +21,84 @@
#include "qemu-common.h"
#include "exec/gdbstub.h"
+static int ppc_cpu_gdb_register_len(int n)
+{
+ switch (n) {
+ case 0 ... 31:
+ /* gprs */
+ return sizeof(target_ulong);
+ case 32 ... 63:
+ /* fprs */
+ if (gdb_has_xml) {
+ return 0;
+ }
+ return 8;
+ case 66:
+ /* cr */
+ return 4;
+ case 64:
+ /* nip */
+ case 65:
+ /* msr */
+ case 67:
+ /* lr */
+ case 68:
+ /* ctr */
+ case 69:
+ /* xer */
+ return sizeof(target_ulong);
+ case 70:
+ /* fpscr */
+ if (gdb_has_xml) {
+ return 0;
+ }
+ return sizeof(target_ulong);
+ default:
+ return 0;
+ }
+}
+
+
+/* The following functions are used to ensure the correct
+ * transfer of registers between a little endian ppc target
+ * and a big endian host by checking the LE bit in the Machine State Register
+ */
+
+void ppc_cpu_gdb_swap_register(uint8_t *mem_buf, int n)
+{
+ int len = ppc_cpu_gdb_register_len(n);
+ int i = 0;
+ uint8_t tmp;
+ for (i = 0; i < len/2; i++) {
+ tmp = *(mem_buf + i);
+ *(mem_buf+i) = *(mem_buf + len - 1 - i);
+ *(mem_buf + len - 1 - i) = tmp;
+ }
+}
+
+int ppc_cpu_gdb_read_register_wrap(CPUState *cs, uint8_t *mem_buf, int n)
+{
+ PowerPCCPU *cpu = POWERPC_CPU(cs);
+ CPUPPCState *env = &cpu->env;
+
+ int len = ppc_cpu_gdb_read_register(cs, mem_buf, n);
+ if (msr_le) {
+ ppc_cpu_gdb_swap_register(mem_buf, n);
+ }
+ return len;
+}
+
+int ppc_cpu_gdb_write_register_wrap(CPUState *cs, uint8_t *mem_buf, int n)
+{
+ PowerPCCPU *cpu = POWERPC_CPU(cs);
+ CPUPPCState *env = &cpu->env;
+
+ if (msr_le) {
+ ppc_cpu_gdb_swap_register(mem_buf, n);
+ }
+ return ppc_cpu_gdb_write_register(cs, mem_buf, n);
+}
+
/* Old gdb always expects FP registers. Newer (xml-aware) gdb only
* expects whatever the target description contains. Due to a
* historical mishap the FP registers appear in between core integer
@@ -32,23 +110,26 @@ int ppc_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
{
PowerPCCPU *cpu = POWERPC_CPU(cs);
CPUPPCState *env = &cpu->env;
+ int r = ppc_cpu_gdb_register_len(n);
+
+ if (!r) {
+ return r;
+ }
if (n < 32) {
/* gprs */
- return gdb_get_regl(mem_buf, env->gpr[n]);
+ gdb_get_regl(mem_buf, env->gpr[n]);
} else if (n < 64) {
/* fprs */
- if (gdb_has_xml) {
- return 0;
- }
stfq_p(mem_buf, env->fpr[n-32]);
- return 8;
} else {
switch (n) {
case 64:
- return gdb_get_regl(mem_buf, env->nip);
+ gdb_get_regl(mem_buf, env->nip);
+ break;
case 65:
- return gdb_get_regl(mem_buf, env->msr);
+ gdb_get_regl(mem_buf, env->msr);
+ break;
case 66:
{
uint32_t cr = 0;
@@ -56,50 +137,55 @@ int ppc_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
for (i = 0; i < 8; i++) {
cr |= env->crf[i] << (32 - ((i + 1) * 4));
}
- return gdb_get_reg32(mem_buf, cr);
+ gdb_get_reg32(mem_buf, cr);
+ break;
}
case 67:
- return gdb_get_regl(mem_buf, env->lr);
+ gdb_get_regl(mem_buf, env->lr);
+ break;
case 68:
- return gdb_get_regl(mem_buf, env->ctr);
+ gdb_get_regl(mem_buf, env->ctr);
+ break;
case 69:
- return gdb_get_regl(mem_buf, env->xer);
+ gdb_get_regl(mem_buf, env->xer);
+ break;
case 70:
{
if (gdb_has_xml) {
return 0;
}
- return gdb_get_reg32(mem_buf, env->fpscr);
+ gdb_get_reg32(mem_buf, env->fpscr);
+ break;
}
}
}
- return 0;
+ return r;
}
int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
{
PowerPCCPU *cpu = POWERPC_CPU(cs);
CPUPPCState *env = &cpu->env;
+ int r = ppc_cpu_gdb_register_len(n);
+
+ if (!r) {
+ return r;
+ }
if (n < 32) {
/* gprs */
env->gpr[n] = ldtul_p(mem_buf);
- return sizeof(target_ulong);
} else if (n < 64) {
/* fprs */
- if (gdb_has_xml) {
- return 0;
- }
env->fpr[n-32] = ldfq_p(mem_buf);
- return 8;
} else {
switch (n) {
case 64:
env->nip = ldtul_p(mem_buf);
- return sizeof(target_ulong);
+ break;
case 65:
ppc_store_msr(env, ldtul_p(mem_buf));
- return sizeof(target_ulong);
+ break;
case 66:
{
uint32_t cr = ldl_p(mem_buf);
@@ -107,25 +193,22 @@ int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
for (i = 0; i < 8; i++) {
env->crf[i] = (cr >> (32 - ((i + 1) * 4))) & 0xF;
}
- return 4;
+ break;
}
case 67:
env->lr = ldtul_p(mem_buf);
- return sizeof(target_ulong);
+ break;
case 68:
env->ctr = ldtul_p(mem_buf);
- return sizeof(target_ulong);
+ break;
case 69:
env->xer = ldtul_p(mem_buf);
- return sizeof(target_ulong);
+ break;
case 70:
/* fpscr */
- if (gdb_has_xml) {
- return 0;
- }
store_fpscr(env, ldtul_p(mem_buf), 0xffffffff);
- return sizeof(target_ulong);
+ break;
}
}
- return 0;
+ return r;
}
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 445c360..cf12ba7 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -8655,8 +8655,8 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)
cc->dump_state = ppc_cpu_dump_state;
cc->dump_statistics = ppc_cpu_dump_statistics;
cc->set_pc = ppc_cpu_set_pc;
- cc->gdb_read_register = ppc_cpu_gdb_read_register;
- cc->gdb_write_register = ppc_cpu_gdb_write_register;
+ cc->gdb_read_register = ppc_cpu_gdb_read_register_wrap;
+ cc->gdb_write_register = ppc_cpu_gdb_write_register_wrap;
#ifndef CONFIG_USER_ONLY
cc->get_phys_page_debug = ppc_cpu_get_phys_page_debug;
cc->vmsd = &vmstate_ppc_cpu;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v4] target-ppc: gdbstub allow byte swapping for reading/writing registers
2014-02-26 22:51 [Qemu-devel] [PATCH v4] target-ppc: gdbstub allow byte swapping for reading/writing registers Thomas Falcon
@ 2014-02-28 17:37 ` Richard Henderson
2014-02-28 19:28 ` [Qemu-devel] [Qemu-ppc] " Thomas Falcon
0 siblings, 1 reply; 4+ messages in thread
From: Richard Henderson @ 2014-02-28 17:37 UTC (permalink / raw)
To: Thomas Falcon, qemu-devel; +Cc: qemu-ppc, agraf
On 02/26/2014 02:51 PM, Thomas Falcon wrote:
> +void ppc_cpu_gdb_swap_register(uint8_t *mem_buf, int n)
> +{
> + int len = ppc_cpu_gdb_register_len(n);
> + int i = 0;
> + uint8_t tmp;
> + for (i = 0; i < len/2; i++) {
> + tmp = *(mem_buf + i);
> + *(mem_buf+i) = *(mem_buf + len - 1 - i);
> + *(mem_buf + len - 1 - i) = tmp;
> + }
> +}
Ew.
The number of register sizes you need to handle is extremely limited. One can
easily use bswap32 and bswap64 for this.
r~
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH v4] target-ppc: gdbstub allow byte swapping for reading/writing registers
2014-02-28 17:37 ` Richard Henderson
@ 2014-02-28 19:28 ` Thomas Falcon
2014-02-28 20:08 ` Richard Henderson
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Falcon @ 2014-02-28 19:28 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: qemu-ppc
On 02/28/2014 11:37 AM, Richard Henderson wrote:
> On 02/26/2014 02:51 PM, Thomas Falcon wrote:
>> +void ppc_cpu_gdb_swap_register(uint8_t *mem_buf, int n)
>> +{
>> + int len = ppc_cpu_gdb_register_len(n);
>> + int i = 0;
>> + uint8_t tmp;
>> + for (i = 0; i < len/2; i++) {
>> + tmp = *(mem_buf + i);
>> + *(mem_buf+i) = *(mem_buf + len - 1 - i);
>> + *(mem_buf + len - 1 - i) = tmp;
>> + }
>> +}
> Ew.
>
> The number of register sizes you need to handle is extremely limited. One can
> easily use bswap32 and bswap64 for this.
>
>
> r~
>
Thanks for your feedback. Did not realize there were built-in bswap
functions for pointers. How about this instead?
int len = ppc_cpu_gdb_register_len(n);
if (len==4) {
bswap32s((uint32_t *)mem_buf);
} else {
bswap64s((uint64_t *)mem_buf);
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH v4] target-ppc: gdbstub allow byte swapping for reading/writing registers
2014-02-28 19:28 ` [Qemu-devel] [Qemu-ppc] " Thomas Falcon
@ 2014-02-28 20:08 ` Richard Henderson
0 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2014-02-28 20:08 UTC (permalink / raw)
To: Thomas Falcon, qemu-devel; +Cc: qemu-ppc
On 02/28/2014 11:28 AM, Thomas Falcon wrote:
> How about this instead?
>
> int len = ppc_cpu_gdb_register_len(n);
> if (len==4) {
> bswap32s((uint32_t *)mem_buf);
> } else {
> bswap64s((uint64_t *)mem_buf);
> }
Looks much better, thanks.
r~
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-28 20:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-26 22:51 [Qemu-devel] [PATCH v4] target-ppc: gdbstub allow byte swapping for reading/writing registers Thomas Falcon
2014-02-28 17:37 ` Richard Henderson
2014-02-28 19:28 ` [Qemu-devel] [Qemu-ppc] " Thomas Falcon
2014-02-28 20:08 ` Richard Henderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).