141 lines
4.7 KiB
Plaintext
141 lines
4.7 KiB
Plaintext
$OpenBSD: patch-gdb_armnbsd-nat_c,v 1.2 2018/01/24 00:19:56 jca Exp $
|
|
Index: gdb/armnbsd-nat.c
|
|
--- gdb/armnbsd-nat.c.orig
|
|
+++ gdb/armnbsd-nat.c
|
|
@@ -65,10 +65,10 @@ arm_supply_fparegset (struct regcache *regcache, struc
|
|
|
|
for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
|
|
regcache_raw_supply (regcache, regno,
|
|
- (char *) &fparegset->fpr[regno - ARM_F0_REGNUM]);
|
|
+ (char *) &fparegset->fp_reg[regno - ARM_F0_REGNUM]);
|
|
|
|
regcache_raw_supply (regcache, ARM_FPS_REGNUM,
|
|
- (char *) &fparegset->fpr_fpsr);
|
|
+ (char *) &fparegset->fp_scr);
|
|
}
|
|
|
|
static void
|
|
@@ -77,7 +77,7 @@ fetch_register (struct regcache *regcache, int regno)
|
|
struct reg inferior_registers;
|
|
int ret;
|
|
|
|
- ret = ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
|
|
+ ret = ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),
|
|
(PTRACE_TYPE_ARG3) &inferior_registers, 0);
|
|
|
|
if (ret < 0)
|
|
@@ -130,7 +130,7 @@ fetch_regs (struct regcache *regcache)
|
|
int ret;
|
|
int regno;
|
|
|
|
- ret = ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
|
|
+ ret = ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),
|
|
(PTRACE_TYPE_ARG3) &inferior_registers, 0);
|
|
|
|
if (ret < 0)
|
|
@@ -148,7 +148,7 @@ fetch_fp_register (struct regcache *regcache, int regn
|
|
struct fpreg inferior_fp_registers;
|
|
int ret;
|
|
|
|
- ret = ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
|
|
+ ret = ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid),
|
|
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
|
|
|
|
if (ret < 0)
|
|
@@ -161,12 +161,12 @@ fetch_fp_register (struct regcache *regcache, int regn
|
|
{
|
|
case ARM_FPS_REGNUM:
|
|
regcache_raw_supply (regcache, ARM_FPS_REGNUM,
|
|
- (char *) &inferior_fp_registers.fpr_fpsr);
|
|
+ (char *) &inferior_fp_registers.fp_scr);
|
|
break;
|
|
|
|
default:
|
|
regcache_raw_supply (regcache, regno,
|
|
- (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
|
|
+ (char *) &inferior_fp_registers.fp_reg[regno - ARM_F0_REGNUM]);
|
|
break;
|
|
}
|
|
}
|
|
@@ -178,7 +178,7 @@ fetch_fp_regs (struct regcache *regcache)
|
|
int ret;
|
|
int regno;
|
|
|
|
- ret = ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
|
|
+ ret = ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid),
|
|
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
|
|
|
|
if (ret < 0)
|
|
@@ -216,7 +216,7 @@ store_register (const struct regcache *regcache, int r
|
|
struct reg inferior_registers;
|
|
int ret;
|
|
|
|
- ret = ptrace (PT_GETREGS, ptid_get_pid (inferior_ptid),
|
|
+ ret = ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),
|
|
(PTRACE_TYPE_ARG3) &inferior_registers, 0);
|
|
|
|
if (ret < 0)
|
|
@@ -279,7 +279,7 @@ store_register (const struct regcache *regcache, int r
|
|
break;
|
|
}
|
|
|
|
- ret = ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),
|
|
+ ret = ptrace (PT_SETREGS, get_ptrace_pid (inferior_ptid),
|
|
(PTRACE_TYPE_ARG3) &inferior_registers, 0);
|
|
|
|
if (ret < 0)
|
|
@@ -327,7 +327,7 @@ store_regs (const struct regcache *regcache)
|
|
inferior_registers.r_pc = pc_val | psr_val;
|
|
}
|
|
|
|
- ret = ptrace (PT_SETREGS, ptid_get_pid (inferior_ptid),
|
|
+ ret = ptrace (PT_SETREGS, get_ptrace_pid (inferior_ptid),
|
|
(PTRACE_TYPE_ARG3) &inferior_registers, 0);
|
|
|
|
if (ret < 0)
|
|
@@ -340,7 +340,7 @@ store_fp_register (const struct regcache *regcache, in
|
|
struct fpreg inferior_fp_registers;
|
|
int ret;
|
|
|
|
- ret = ptrace (PT_GETFPREGS, ptid_get_pid (inferior_ptid),
|
|
+ ret = ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid),
|
|
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
|
|
|
|
if (ret < 0)
|
|
@@ -353,16 +353,16 @@ store_fp_register (const struct regcache *regcache, in
|
|
{
|
|
case ARM_FPS_REGNUM:
|
|
regcache_raw_collect (regcache, ARM_FPS_REGNUM,
|
|
- (char *) &inferior_fp_registers.fpr_fpsr);
|
|
+ (char *) &inferior_fp_registers.fp_scr);
|
|
break;
|
|
|
|
default:
|
|
regcache_raw_collect (regcache, regno,
|
|
- (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
|
|
+ (char *) &inferior_fp_registers.fp_reg[regno - ARM_F0_REGNUM]);
|
|
break;
|
|
}
|
|
|
|
- ret = ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid),
|
|
+ ret = ptrace (PT_SETFPREGS, get_ptrace_pid (inferior_ptid),
|
|
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
|
|
|
|
if (ret < 0)
|
|
@@ -379,12 +379,12 @@ store_fp_regs (const struct regcache *regcache)
|
|
|
|
for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
|
|
regcache_raw_collect (regcache, regno,
|
|
- (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
|
|
+ (char *) &inferior_fp_registers.fp_reg[regno - ARM_F0_REGNUM]);
|
|
|
|
regcache_raw_collect (regcache, ARM_FPS_REGNUM,
|
|
- (char *) &inferior_fp_registers.fpr_fpsr);
|
|
+ (char *) &inferior_fp_registers.fp_scr);
|
|
|
|
- ret = ptrace (PT_SETFPREGS, ptid_get_pid (inferior_ptid),
|
|
+ ret = ptrace (PT_SETFPREGS, get_ptrace_pid (inferior_ptid),
|
|
(PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);
|
|
|
|
if (ret < 0)
|