* infptrace.c (child_xfer_memory): Only use if CHILD_XFER_MEMORY

	is not defined.

	* hppab-nat.c (call_ptrace): Delete redundant function.
	(kill_inferior, attach, detach, child_resume): Likewise.
	(child_xfer_memory): Likewise.

	* hppah-nat.c (call_ptrace): Delete redundant function.
	(kill_inferior, attach, detach, child_resume): Likewise.

	* config/pa/hppabsd.mh (NATDEPFILES): Add infptrace.o.

	* config/pa/hppahpux.mh (NATDEPFILES): Add infptrace.o.

	* config/pa/nm-hppab.h (FETCH_INFERIOR_REGISTERS): Define.

	* config/pa/nm-hppah.h (FETCH_INFERIOR_REGISTERS): define.
	(CHILD_XFER_MEMORY): Define.
	(PT_*): Define so that generic infptrace.c code can be used.

diff --git a/gdb/config/pa/hppabsd.mh b/gdb/config/pa/hppabsd.mh
index ed020a596f2dfd3c32bfd063f794592de2f93cc5..9f6c008530f450f49b2a2a8301d8092e3ae52c2c 100644 (file)
--- a/gdb/config/pa/hppabsd.mh
+++ b/gdb/config/pa/hppabsd.mh
@@ -2,4 +2,4 @@
 XDEPFILES= 
 XM_FILE= xm-hppab.h
 NAT_FILE= nm-hppab.h
-NATDEPFILES= hppab-nat.o coredep.o corelow.o exec.o inftarg.o fork-child.o paread.o
+NATDEPFILES= hppab-nat.o coredep.o corelow.o exec.o inftarg.o fork-child.o paread.o infptrace.o

diff --git a/gdb/config/pa/hppahpux.mh b/gdb/config/pa/hppahpux.mh
index 4841de46a19a919a7d852d28fb4b2fc3b502e12d..2c92c328b366d62b7cd40f3743fbb42ab429aa41 100644 (file)
--- a/gdb/config/pa/hppahpux.mh
+++ b/gdb/config/pa/hppahpux.mh
@@ -3,7 +3,7 @@ TERMCAP = -lcurses
 XDEPFILES= 
 XM_FILE= xm-hppah.h
 NAT_FILE= nm-hppah.h
-NATDEPFILES= hppah-nat.o coredep.o corelow.o inftarg.o fork-child.o paread.o
+NATDEPFILES= hppah-nat.o coredep.o corelow.o inftarg.o fork-child.o paread.o infptrace.o
 REGEX=regex.o
 REGEX1=regex.o
 HOST_IPC=-DBSD_IPC -DPOSIX_WAIT

diff --git a/gdb/config/pa/nm-hppab.h b/gdb/config/pa/nm-hppab.h
index 10f7bfd1c5219e522ad65ee148ba28c8c7b64341..8a615e8401b0d134079ae87a84f4a87cdb42e5a6 100644 (file)
--- a/gdb/config/pa/nm-hppab.h
+++ b/gdb/config/pa/nm-hppab.h
@@ -27,6 +27,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define        PTRACE_ARG3_TYPE caddr_t
 
+/* fetch_inferior_registers is in hppab-nat.c.  */
+#define FETCH_INFERIOR_REGISTERS
+
 /* attach/detach works to some extent under BSD and HPUX.  So long
    as the process you're attaching to isn't blocked waiting on io,
    blocked waiting on a signal, or in a system call things work 

diff --git a/gdb/config/pa/nm-hppah.h b/gdb/config/pa/nm-hppah.h
index 228821d72709994051f2ecccd2c5ff55d105d3f8..6a465d771a71c62f87c11948d40da89a455aabab 100644 (file)
--- a/gdb/config/pa/nm-hppah.h
+++ b/gdb/config/pa/nm-hppah.h
@@ -23,6 +23,23 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define REGISTER_U_ADDR(addr, blockend, regno)                         \
 { addr = (int)(blockend) + REGISTER_BYTE (regno);}
 
+/* fetch_inferior_registers is in hppah-nat.c.  */
+#define FETCH_INFERIOR_REGISTERS
+
+/* child_xfer_memory is in hppah-nat.c.  */
+#define CHILD_XFER_MEMORY
+
+/* So we can cleanly use code in infptrace.c.  */
+#define PT_KILL                PT_EXIT
+#define PT_STEP                PT_SINGLE
+#define PT_CONTINUE    PT_CONTIN
+#define PT_READ_U      PT_RDUAREA
+#define PT_WRITE_U     PT_WUAREA
+#define PT_READ_I      PT_RIUSER
+#define PT_READ_D      PT_RDUSER
+#define PT_WRITE_I     PT_WIUSER
+#define PT_WRITE_D     PT_WDUSER
+
 /* attach/detach works to some extent under BSD and HPUX.  So long
    as the process you're attaching to isn't blocked waiting on io,
    blocked waiting on a signal, or in a system call things work