summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2015-02-12 04:15:55 +0000
committerian <ian@FreeBSD.org>2015-02-12 04:15:55 +0000
commita9d7d10c208a910d1f4132d0ff76c4cc58676124 (patch)
tree622c4009e7db7c61b1ae2b3a27d4f247f9351d43 /gnu
parentdff1ee7f45c73c94ead5792fd2f879e70e6232c8 (diff)
downloadFreeBSD-src-a9d7d10c208a910d1f4132d0ff76c4cc58676124.zip
FreeBSD-src-a9d7d10c208a910d1f4132d0ff76c4cc58676124.tar.gz
MFC r276187, r276190, r271422:
Rename pmap_kenter_temp to pmap_kenter_temporary to be consistent with the other architectures with this function. Eliminate unnecessary references to pte.h internals by using the standard pmap_kenter_temporary() to map pages while dumping. Cleanup up ARM *frame structures.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/gdb/kgdb/trgt_arm.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_arm.c b/gnu/usr.bin/gdb/kgdb/trgt_arm.c
index ca18ae3..1bb3f41 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_arm.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_arm.c
@@ -68,20 +68,12 @@ kgdb_trgt_fetch_registers(int regno __unused)
warnx("kvm_read: %s", kvm_geterr(kvm));
memset(&pcb, 0, sizeof(pcb));
}
- for (i = ARM_A1_REGNUM + 8; i <= ARM_SP_REGNUM; i++) {
- supply_register(i, (char *)&pcb.un_32.pcb32_r8 +
- (i - (ARM_A1_REGNUM + 8 )) * 4);
+ for (i = ARM_A1_REGNUM + 4; i <= ARM_SP_REGNUM; i++) {
+ supply_register(i, (char *)&pcb.pcb_regs.sf_r4 +
+ (i - (ARM_A1_REGNUM + 4 )) * 4);
}
- if (pcb.un_32.pcb32_sp != 0) {
- for (i = 0; i < 4; i++) {
- if (kvm_read(kvm, pcb.un_32.pcb32_sp + (i) * 4,
- &reg, 4) != 4) {
- warnx("kvm_read: %s", kvm_geterr(kvm));
- break;
- }
- supply_register(ARM_A1_REGNUM + 4 + i, (char *)&reg);
- }
- if (kvm_read(kvm, pcb.un_32.pcb32_sp + 4 * 4, &reg, 4) != 4)
+ if (pcb.pcb_regs.sf_sp != 0) {
+ if (kvm_read(kvm, pcb.pcb_regs.sf_sp + 4 * 4, &reg, 4) != 4)
warnx("kvm_read :%s", kvm_geterr(kvm));
else
supply_register(ARM_PC_REGNUM, (char *)&reg);
OpenPOWER on IntegriCloud