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 | ce1dfb7a1078decf340714eaec57db9533dc8af6 (patch) | |
| tree | b37e11381f56087ea4dc652c2a5b0b8d66f24fe2 /gdbstub.c | |
| parent | Disable special ioapic inti0 routing (diff) | |
| parent | Do not rely on __powerpc__ being defined as a feature test macro (diff) | |
| download | qemu-kvm-ce1dfb7a1078decf340714eaec57db9533dc8af6.tar.gz qemu-kvm-ce1dfb7a1078decf340714eaec57db9533dc8af6.tar.bz2 qemu-kvm-ce1dfb7a1078decf340714eaec57db9533dc8af6.zip | |
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 'gdbstub.c')
| -rw-r--r-- | gdbstub.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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) { |