mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-12-16 16:53:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

ppc: Fix size of ppc64 xer register

Browse Source 
The normal gdb definition of the XER registers is only 32 bit,
and that's what the current version of power64-core.xml also
says (seems copied from gdb's).  But qemu's idea of the XER register
is target_ulong (in CPUPPCState, ppc_gdb_register_len and
ppc_cpu_gdb_read_register)

That mismatch leads to the following message when attaching
with gdb:

  Truncated register 32 in remote 'g' packet

(and following on that qemu stops responding).  The simple fix is
to say the truth in the .xml file.  But the better fix is to
actually make it 32bit on the wire, as old gdbs don't support
XML files for describing registers.  Also the XER state in qemu
doesn't seem to use the high 32 bits, so sending it off to gdb
doesn't seem worthwhile.

Signed-off-by: Michael Matz <matz@suse.de>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Michael Matz 2018-02-23 17:29:56 +00:00 committed by David Gibson
parent c90c393c2d
commit a2f04333a3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/ppc/gdbstub.c
View File

@ -37,10 +37,10 @@ static int ppc_gdb_register_len_apple(int n)
case 65+32: /* msr */ case 65+32: /* msr */
case 67+32: /* lr */ case 67+32: /* lr */
case 68+32: /* ctr */ case 68+32: /* ctr */
case 69+32: /* xer */
case 70+32: /* fpscr */ case 70+32: /* fpscr */
return 8; return 8;
case 66+32: /* cr */ case 66+32: /* cr */
case 69+32: /* xer */
return 4; return 4;
default: default:
return 0; return 0;
@ -61,6 +61,8 @@ static int ppc_gdb_register_len(int n)
return 8; return 8;
case 66: case 66:
/* cr */ /* cr */
case 69:
/* xer */
return 4; return 4;
case 64: case 64:
/* nip */ /* nip */
@ -70,8 +72,6 @@ static int ppc_gdb_register_len(int n)
/* lr */ /* lr */
case 68: case 68:
/* ctr */ /* ctr */
case 69:
/* xer */
return sizeof(target_ulong); return sizeof(target_ulong);
case 70: case 70:
/* fpscr */ /* fpscr */
@ -152,7 +152,7 @@ int ppc_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
gdb_get_regl(mem_buf, env->ctr); gdb_get_regl(mem_buf, env->ctr);
break; break;
case 69: case 69:
gdb_get_regl(mem_buf, env->xer); gdb_get_reg32(mem_buf, env->xer);
break; break;
case 70: case 70:
gdb_get_reg32(mem_buf, env->fpscr); gdb_get_reg32(mem_buf, env->fpscr);
@ -208,7 +208,7 @@ int ppc_cpu_gdb_read_register_apple(CPUState *cs, uint8_t *mem_buf, int n)
gdb_get_reg64(mem_buf, env->ctr); gdb_get_reg64(mem_buf, env->ctr);
break; break;
case 69 + 32: case 69 + 32:
gdb_get_reg64(mem_buf, env->xer); gdb_get_reg32(mem_buf, env->xer);
break; break;
case 70 + 32: case 70 + 32:
gdb_get_reg64(mem_buf, env->fpscr); gdb_get_reg64(mem_buf, env->fpscr);
@ -259,7 +259,7 @@ int ppc_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n)
env->ctr = ldtul_p(mem_buf); env->ctr = ldtul_p(mem_buf);
break; break;
case 69: case 69:
env->xer = ldtul_p(mem_buf); env->xer = ldl_p(mem_buf);
break; break;
case 70: case 70:
/* fpscr */ /* fpscr */
@ -309,7 +309,7 @@ int ppc_cpu_gdb_write_register_apple(CPUState *cs, uint8_t *mem_buf, int n)
env->ctr = ldq_p(mem_buf); env->ctr = ldq_p(mem_buf);
break; break;
case 69 + 32: case 69 + 32:
env->xer = ldq_p(mem_buf); env->xer = ldl_p(mem_buf);
break; break;
case 70 + 32: case 70 + 32:
/* fpscr */ /* fpscr */