diff options
| author | Avi Kivity <avi@redhat.com> | 2009-01-14 13:18:20 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-01-14 13:18:20 +0200 |
| commit | b465c96777a6083a1904b1559ce114d2077252d3 (patch) | |
| tree | 935c2e71ae25dd54d3a63d34cf7c9c881cdaf630 /qemu/gdbstub.c | |
| parent | 6a124e1a563879800358385f8b01fa8d38f3835a (diff) | |
| parent | eab14d34f6b25fce965d9b844750e16cab082e4f (diff) | |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile
qemu/hw/mips_malta.c
qemu/hw/pc.c
qemu/hw/pci.c
qemu/hw/pci.h
qemu/hw/ppc_chrp.c
qemu/hw/ppc_prep.c
qemu/hw/realview.c
qemu/hw/sun4u.c
qemu/hw/versatilepb.c
qemu/hw/virtio-net.c
qemu/monitor.c
qemu/net.c
qemu/net.h
qemu/pc-bios/bios.bin
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu/gdbstub.c')
| -rw-r--r-- | qemu/gdbstub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu/gdbstub.c b/qemu/gdbstub.c index 9e6f44bd..47013826 100644 --- a/qemu/gdbstub.c +++ b/qemu/gdbstub.c @@ -695,7 +695,7 @@ static int cpu_gdb_write_register(CPUState *env, uint8_t *mem_buf, int n) #if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) #define NUM_CORE_REGS 86 #else -#define NUM_CORE_REGS 73 +#define NUM_CORE_REGS 72 #endif #ifdef TARGET_ABI32 @@ -729,7 +729,7 @@ static int cpu_gdb_read_register(CPUState *env, uint8_t *mem_buf, int n) case 69: GET_REGA(env->npc); case 70: GET_REGA(env->fsr); case 71: GET_REGA(0); /* csr */ - case 72: GET_REGA(0); + default: GET_REGA(0); } #else if (n < 64) { |