From 771f63d3ff21c3cdbbf7ecf0537dbebf782e5f00 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Mon, 1 Apr 1996 01:25:44 +0000 Subject: [PATCH] * hppah-nat.c (store_inferior_registers, store_inferior_registers, fetch_register, child_xfer_memory): Use call_ptrace function supplied by infptrace.c rather than calling ptrace directly. --- gdb/ChangeLog | 6 ++++++ gdb/hppah-nat.c | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 12955d7..1a91763 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +Sun Mar 31 16:15:43 1996 Fred Fish + + * hppah-nat.c (store_inferior_registers, store_inferior_registers, + fetch_register, child_xfer_memory): Use call_ptrace function supplied + by infptrace.c rather than calling ptrace directly. + Sun Mar 31 15:39:00 1996 Stan Shebs * mon960-rom.c: Cleanups and elimination of unused code, diff --git a/gdb/hppah-nat.c b/gdb/hppah-nat.c index 1d643f1..17a675d 100644 --- a/gdb/hppah-nat.c +++ b/gdb/hppah-nat.c @@ -67,8 +67,8 @@ store_inferior_registers (regno) if (regno == PCOQ_HEAD_REGNUM || regno == PCOQ_TAIL_REGNUM) { scratch = *(int *) ®isters[REGISTER_BYTE (regno)] | 0x3; - ptrace (PT_WUREGS, inferior_pid, (PTRACE_ARG3_TYPE) regaddr, - scratch, 0); + call_ptrace (PT_WUREGS, inferior_pid, (PTRACE_ARG3_TYPE) regaddr, + scratch); if (errno != 0) { /* Error, even if attached. Failing to write these two @@ -81,8 +81,8 @@ store_inferior_registers (regno) for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof(int)) { errno = 0; - ptrace (PT_WUREGS, inferior_pid, (PTRACE_ARG3_TYPE) regaddr, - *(int *) ®isters[REGISTER_BYTE (regno) + i], 0); + call_ptrace (PT_WUREGS, inferior_pid, (PTRACE_ARG3_TYPE) regaddr, + *(int *) ®isters[REGISTER_BYTE (regno) + i]); if (errno != 0) { /* Warning, not error, in case we are attached; sometimes the @@ -122,8 +122,8 @@ fetch_register (regno) for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (int)) { errno = 0; - *(int *) &buf[i] = ptrace (PT_RUREGS, inferior_pid, - (PTRACE_ARG3_TYPE) regaddr, 0, 0); + *(int *) &buf[i] = call_ptrace (PT_RUREGS, inferior_pid, + (PTRACE_ARG3_TYPE) regaddr, 0); regaddr += sizeof (int); if (errno != 0) { @@ -174,16 +174,16 @@ child_xfer_memory (memaddr, myaddr, len, write, target) if (addr != memaddr || len < (int)sizeof (int)) { /* Need part of initial word -- fetch it. */ - buffer[0] = ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, - inferior_pid, (PTRACE_ARG3_TYPE) addr, 0, 0); + buffer[0] = call_ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, + inferior_pid, (PTRACE_ARG3_TYPE) addr, 0); } if (count > 1) /* FIXME, avoid if even boundary */ { buffer[count - 1] - = ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, inferior_pid, + = call_ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, inferior_pid, (PTRACE_ARG3_TYPE) (addr + (count - 1) * sizeof (int)), - 0, 0); + 0); } /* Copy data to be written over corresponding part of buffer */ @@ -199,9 +199,9 @@ child_xfer_memory (memaddr, myaddr, len, write, target) WIUSER, or do these idiots really expect us to figure out which segment the address is in, so we can use a separate system call for it??! */ errno = 0; - ptrace (addr < text_end ? PT_WIUSER : PT_WDUSER, inferior_pid, + call_ptrace (addr < text_end ? PT_WIUSER : PT_WDUSER, inferior_pid, (PTRACE_ARG3_TYPE) addr, - buffer[i], 0); + buffer[i]); if (errno) return 0; } @@ -212,8 +212,8 @@ child_xfer_memory (memaddr, myaddr, len, write, target) for (i = 0; i < count; i++, addr += sizeof (int)) { errno = 0; - buffer[i] = ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, - inferior_pid, (PTRACE_ARG3_TYPE) addr, 0, 0); + buffer[i] = call_ptrace (addr < text_end ? PT_RIUSER : PT_RDUSER, + inferior_pid, (PTRACE_ARG3_TYPE) addr, 0); if (errno) return 0; QUIT; -- 2.7.4