import gdb-1999-06-07 snapshot

16 files changed, 65 insertions, 152 deletions

diff --git a/gdb/config/a29k/tm-vx29k.h b/gdb/config/a29k/tm-vx29k.h
index 487df82..140df05 100644
--- a/gdb/config/a29k/tm-vx29k.h
+++ b/gdb/config/a29k/tm-vx29k.h
@@ -1,5 +1,5 @@
 /* Target machine description for VxWorks on the 29k, for GDB, the GNU debugger.
-   Copyright 1994 Free Software Foundation, Inc.
+   Copyright 1994, 1999 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB.
@@ -19,10 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "a29k/tm-a29k.h"
-
-#define	GDBINIT_FILENAME	".vxgdbinit"
-
-#define	DEFAULT_PROMPT		"(vxgdb) "
+#include "tm-vxworks.h"
 
 /* Number of registers in a ptrace_getregs call. */
 
diff --git a/gdb/config/d10v/tm-d10v.h b/gdb/config/d10v/tm-d10v.h
index 85aa3ef..99fd9ac 100644
--- a/gdb/config/d10v/tm-d10v.h
+++ b/gdb/config/d10v/tm-d10v.h
@@ -31,20 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define FUNCTION_START_OFFSET 0
 
-/* these are the addresses the D10V-EVA board maps data */
-/* and instruction memory to. */
-
-#define DMEM_START	0x0000000
-#define IMEM_START	0x1000000
-#define STACK_START	0x0007ffe
-
-#ifdef __STDC__		/* Forward decls for prototypes */
-struct frame_info;
-struct frame_saved_regs; 
-struct type;
-struct value;
-#endif
-
 /* Advance PC across any function entry prologue instructions
    to reach some "real" code.  */
 
@@ -74,6 +60,8 @@ extern char *d10v_register_name PARAMS ((int reg_nr));
    to be actual register numbers as far as the user is concerned
    but do serve to get the desired values when passed to read_register.  */
 
+/* Used by both d10v-tdep.c and remote-d10v.c */
+
 #define R0_REGNUM	0
 #define LR_REGNUM 	13
 #define SP_REGNUM 	15
@@ -85,8 +73,11 @@ extern char *d10v_register_name PARAMS ((int reg_nr));
 #define DMAP_REGNUM	34
 #define A0_REGNUM 	35
 
+/* ??? */
+#define REGISTER_SIZE 2
+
 /* Say how much memory is needed to store a copy of the register set */
-#define REGISTER_BYTES    ((NUM_REGS-2)*2+16) 
+#define REGISTER_BYTES    ((37/*NUM_REGS*/-2)*2+16) 
 
 /* Index within `registers' of the first byte of the space for
    register N.  */
@@ -117,14 +108,13 @@ extern int d10v_register_virtual_size PARAMS ((int reg_nr));
 extern struct type *d10v_register_virtual_type PARAMS ((int reg_nr));
 #define REGISTER_VIRTUAL_TYPE(N) (d10v_register_virtual_type (N))
 
-
 /* convert $pc and $sp to/from virtual addresses */
 extern int d10v_register_convertible PARAMS ((int nr));
-#define REGISTER_CONVERTIBLE(N) (d10v_register_convertible ((N)))
 extern void d10v_register_convert_to_virtual PARAMS ((int regnum, struct type *type, char *from, char *to));
+extern void d10v_register_convert_to_raw PARAMS ((struct type *type, int regnum, char *from, char *to));
+#define REGISTER_CONVERTIBLE(N) (d10v_register_convertible ((N)))
 #define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,TYPE,FROM,TO) \
   d10v_register_convert_to_virtual ((REGNUM), (TYPE), (FROM), (TO))
-extern void d10v_register_convert_to_raw PARAMS ((struct type *type, int regnum, char *from, char *to));
 #define REGISTER_CONVERT_TO_RAW(TYPE,REGNUM,FROM,TO) \
   d10v_register_convert_to_raw ((TYPE), (REGNUM), (FROM), (TO))
 
@@ -143,10 +133,6 @@ extern CORE_ADDR d10v_convert_daddr_to_raw PARAMS ((CORE_ADDR x));
 extern CORE_ADDR d10v_convert_iaddr_to_raw PARAMS ((CORE_ADDR x));
 #define D10V_CONVERT_IADDR_TO_RAW(X) (d10v_convert_iaddr_to_raw (X))
 
-#define ARG1_REGNUM R0_REGNUM
-#define ARGN_REGNUM 3
-#define RET1_REGNUM R0_REGNUM
-
 /* Store the address of the place in which to copy the structure the
    subroutine will return.  This is called from call_function. 
 
@@ -184,21 +170,14 @@ extern use_struct_convention_fn d10v_use_struct_convention;
 #define USE_STRUCT_CONVENTION(gcc_p, type) d10v_use_struct_convention (gcc_p, type)
 
 
-
 /* Define other aspects of the stack frame. 
    we keep a copy of the worked out return pc lying around, since it
    is a useful bit of info */
 
-#define EXTRA_FRAME_INFO \
-    CORE_ADDR return_pc; \
-    int frameless; \
-    int size;
-
+extern void d10v_init_extra_frame_info PARAMS ((int fromleaf, struct frame_info *fi));
 #define INIT_EXTRA_FRAME_INFO(fromleaf, fi) \
     d10v_init_extra_frame_info(fromleaf, fi) 
 
-extern void d10v_init_extra_frame_info PARAMS (( int fromleaf, struct frame_info *fi ));
-
 /* A macro that tells us whether the function invocation represented
    by FI does not have a frame on the stack associated with it.  If it
    does not, FRAMELESS is set to 1, else 0.  */
@@ -234,17 +213,15 @@ extern CORE_ADDR d10v_saved_pc_after_call PARAMS ((struct frame_info *frame));
 
 #define FRAME_ARGS_SKIP 0
 
-
-/* Put here the code to store, into a struct frame_saved_regs,
-   the addresses of the saved registers of frame described by FRAME_INFO.
+/* Put here the code to store, into frame_info->saved_regs, the
+   addresses of the saved registers of frame described by FRAME_INFO.
    This includes special registers such as pc and fp saved in special
-   ways in the stack frame.  sp is even more special:
-   the address we return for it IS the sp for the next frame.  */
-
-#define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)	    \
-   d10v_frame_find_saved_regs(frame_info, &(frame_saved_regs))
+   ways in the stack frame.  sp is even more special: the address we
+   return for it IS the sp for the next frame.  */
 
-extern void d10v_frame_find_saved_regs PARAMS ((struct frame_info *, struct frame_saved_regs *));
+extern void d10v_frame_init_saved_regs PARAMS ((struct frame_info *));
+#define FRAME_INIT_SAVED_REGS(frame_info)	    \
+   d10v_frame_init_saved_regs(frame_info)
 
 /* DUMMY FRAMES.  Need these to support inferior function calls.  They
    work like this on D10V: First we set a breakpoint at 0 or __start.
@@ -255,8 +232,8 @@ extern void d10v_frame_find_saved_regs PARAMS ((struct frame_info *, struct fram
    breakpoint, clear the break point and pop the old register contents
    off the stack.  */
 
-extern void d10v_pop_frame PARAMS ((struct frame_info *frame));
-#define POP_FRAME generic_pop_current_frame (d10v_pop_frame)
+extern void d10v_pop_frame PARAMS ((void));
+#define POP_FRAME d10v_pop_frame ()
 
 #define USE_GENERIC_DUMMY_FRAMES 1
 #define CALL_DUMMY                   {0}
@@ -289,18 +266,8 @@ extern CORE_ADDR d10v_push_arguments PARAMS ((int, struct value **, CORE_ADDR, i
 
 #define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
 d10v_extract_return_value(TYPE, REGBUF, VALBUF)
-  extern void
-d10v_extract_return_value PARAMS ((struct type *, char *, char *));
-
-
-#define REGISTER_SIZE 2
+extern void d10v_extract_return_value PARAMS ((struct type *, char *, char *));
 
-#ifdef CC_HAS_LONG_LONG
-#  define LONGEST long long
-#else
-#  define LONGEST long
-#endif 
-#define ULONGEST unsigned LONGEST
 
 void d10v_write_pc PARAMS ((CORE_ADDR val, int pid));
 CORE_ADDR d10v_read_pc PARAMS ((int pid));
diff --git a/gdb/config/i386/tm-i386gnu.h b/gdb/config/i386/tm-i386gnu.h
index a6e3c08..3dc15a3 100644
--- a/gdb/config/i386/tm-i386gnu.h
+++ b/gdb/config/i386/tm-i386gnu.h
@@ -1,5 +1,5 @@
 /* Macro definitions for i386, GNU Hurd
-   Copyright (C) 1992 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#ifndef TM_I386GNU_H
+#define TM_I386GNU_H 1
+
 /* Include common definitions for gnu systems */
 #include "nm-gnu.h"
 
@@ -33,16 +36,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* we can do it */
 #define ATTACH_DETACH 1
 
-/* Sigh. There should be a file for i386 but no sysv stuff in it */
-#include "i386/tm-i386v.h"
+#include "i386/tm-i386.h"
 
-/* I want to test this float info code. See comment in tm-i386v.h */
 #undef FLOAT_INFO
 #define FLOAT_INFO { i386_mach3_float_info (); }
 
-/* Address of end of stack space.
- * for MACH, see <machine/vmparam.h>
- * @@@ I don't know what is in the 5 ints...
- */
-#undef  STACK_END_ADDR
-#define STACK_END_ADDR (0xc0000000-sizeof(int [5]))
+/* Offset to saved PC in sigcontext.  */
+#define SIGCONTEXT_PC_OFFSET 68
+
+/* We need this file for the SOLIB_TRAMPOLINE stuff.  */
+#include "tm-sysv4.h"
+
+#endif /* TM_I386GNU_H */
diff --git a/gdb/config/i960/tm-vx960.h b/gdb/config/i960/tm-vx960.h
index 17e2811..e6cade0 100644
--- a/gdb/config/i960/tm-vx960.h
+++ b/gdb/config/i960/tm-vx960.h
@@ -1,5 +1,5 @@
 /* Parameters for VxWorks Intel 960's, for GDB, the GNU debugger.
-   Copyright (C) 1986-1991 Free Software Foundation, Inc.
+   Copyright (C) 1986-1991, 1999 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB.
@@ -19,16 +19,13 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "i960/tm-i960.h"
+#include "tm-vxworks.h"
 
 /* Under VxWorks the IP isn't filled in.  Skip it, go with RIP, which has
    the real value.  */
 #undef PC_REGNUM
 #define PC_REGNUM RIP_REGNUM
 
-#define	GDBINIT_FILENAME	".vxgdbinit"
-
-#define	DEFAULT_PROMPT		"(vxgdb) "
-
 /* We have more complex, useful breakpoints on the target.
    Amount ip must be decremented by after a breakpoint.  */
 
diff --git a/gdb/config/m68k/tm-delta68.h b/gdb/config/m68k/tm-delta68.h
index e0692fb..8e77234 100644
--- a/gdb/config/m68k/tm-delta68.h
+++ b/gdb/config/m68k/tm-delta68.h
@@ -76,7 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    Can return -1, meaning no way to tell.  */
 
 extern int delta68_frame_num_args PARAMS ((struct frame_info *fi));
-#define FRAME_NUM_ARGS (delta68_frame_num_args ((fi)))
+#define FRAME_NUM_ARGS(fi) (delta68_frame_num_args ((fi)))
 
 /* On M68040 versions of sysV68 R3V7.1, ptrace(PT_WRITE_I) does not clear
    the processor's instruction cache as it should.  */
diff --git a/gdb/config/m68k/tm-news.h b/gdb/config/m68k/tm-news.h
index b9736a0..d844682 100644
--- a/gdb/config/m68k/tm-news.h
+++ b/gdb/config/m68k/tm-news.h
@@ -60,6 +60,6 @@ Here is an m-news.h file for gdb.  It supports the 68881 registers.
    Can return -1, meaning no way to tell.  */
 
 extern int news_frame_num_args PARAMS ((struct frame_info *fi));
-#define FRAME_NUM_ARGS (news_frame_num_args ((fi)))
+#define FRAME_NUM_ARGS(fi) (news_frame_num_args ((fi)))
 
 #include "m68k/tm-m68k.h"
diff --git a/gdb/config/m68k/tm-vx68.h b/gdb/config/m68k/tm-vx68.h
index e601bda..fbec915 100644
--- a/gdb/config/m68k/tm-vx68.h
+++ b/gdb/config/m68k/tm-vx68.h
@@ -1,5 +1,5 @@
 /* Target machine description for VxWorks m68k's, for GDB, the GNU debugger.
-   Copyright 1986, 1987, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1999 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB.
@@ -18,10 +18,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#define	GDBINIT_FILENAME	".vxgdbinit"
-
-#define	DEFAULT_PROMPT		"(vxgdb) "
-
 /* GCC is probably the only compiler used on this configuration.  So
    get this right even if the code which detects gcc2_compiled. is
    still broken.  */
@@ -32,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define	DECR_PC_AFTER_BREAK	0
 
 #include "m68k/tm-m68k.h"
+#include "tm-vxworks.h"
 
 /* Takes the current frame-struct pointer and returns the chain-pointer
    to get to the calling frame.
diff --git a/gdb/config/mips/tm-irix3.h b/gdb/config/mips/tm-irix3.h
index 7e8e53e..c8a4775 100644
--- a/gdb/config/mips/tm-irix3.h
+++ b/gdb/config/mips/tm-irix3.h
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Redefine register numbers for SGI. */
 
 #undef NUM_REGS
-#undef REGISTER_NAMES
+#undef MIPS_REGISTER_NAMES
 #undef FP0_REGNUM
 #undef PC_REGNUM
 #undef PS_REGNUM
@@ -45,7 +45,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Initializer for an array of names of registers.
    There should be NUM_REGS strings in this initializer.  */
 
-#define REGISTER_NAMES 	\
+#define MIPS_REGISTER_NAMES 	\
     {	"zero",	"at",	"v0",	"v1",	"a0",	"a1",	"a2",	"a3", \
 	"t0",	"t1",	"t2",	"t3",	"t4",	"t5",	"t6",	"t7", \
 	"s0",	"s1",	"s2",	"s3",	"s4",	"s5",	"s6",	"s7", \
diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index 108a203..e2e5099 100644
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -151,11 +151,16 @@ extern breakpoint_from_pc_fn mips_breakpoint_from_pc;
 #define NUM_REGS 90
 #endif
 
+/* Given the register index, return the name of the corresponding
+   register. */
+extern char *mips_register_name PARAMS ((int regnr));
+#define REGISTER_NAME(i) mips_register_name (i)
+
 /* Initializer for an array of names of registers.
    There should be NUM_REGS strings in this initializer.  */
 
-#ifndef REGISTER_NAMES
-#define REGISTER_NAMES 	\
+#ifndef MIPS_REGISTER_NAMES
+#define MIPS_REGISTER_NAMES 	\
     {	"zero",	"at",	"v0",	"v1",	"a0",	"a1",	"a2",	"a3", \
 	"t0",	"t1",	"t2",	"t3",	"t4",	"t5",	"t6",	"t7", \
 	"s0",	"s1",	"s2",	"s3",	"s4",	"s5",	"s6",	"s7", \
@@ -438,20 +443,13 @@ typedef struct mips_extra_func_info {
 	PDR	pdr;		/* Procedure descriptor record */
 } *mips_extra_func_info_t;
 
-#define EXTRA_FRAME_INFO \
-  mips_extra_func_info_t proc_desc; \
-  int num_args;
-
-#define INIT_EXTRA_FRAME_INFO(fromleaf, fci) init_extra_frame_info(fci)
-extern void init_extra_frame_info PARAMS ((struct frame_info *));
+extern void mips_init_extra_frame_info PARAMS ((int fromleaf, struct frame_info *));
+#define INIT_EXTRA_FRAME_INFO(fromleaf, fci) \
+  mips_init_extra_frame_info(fromleaf, fci)
 
+extern void mips_print_extra_frame_info PARAMS ((struct frame_info *frame));
 #define	PRINT_EXTRA_FRAME_INFO(fi) \
-  { \
-    if (fi && fi->proc_desc && fi->proc_desc->pdr.framereg < NUM_REGS) \
-      printf_filtered (" frame pointer is at %s+%d\n", \
-                       REGISTER_NAME (fi->proc_desc->pdr.framereg), \
-                                 fi->proc_desc->pdr.frameoffset); \
-  }
+  mips_print_extra_frame_info (fi)
 
 /* It takes two values to specify a frame on the MIPS.
 
diff --git a/gdb/config/mips/tm-tx39.h b/gdb/config/mips/tm-tx39.h
index ee99a28..36d9e2b 100644
--- a/gdb/config/mips/tm-tx39.h
+++ b/gdb/config/mips/tm-tx39.h
@@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "mips/tm-bigmips.h"
 
-#undef  REGISTER_NAMES
-#define REGISTER_NAMES 	\
+#undef  MIPS_REGISTER_NAMES
+#define MIPS_REGISTER_NAMES 	\
     {	"zero",	"at",	"v0",	"v1",	"a0",	"a1",	"a2",	"a3", \
 	"t0",	"t1",	"t2",	"t3",	"t4",	"t5",	"t6",	"t7", \
 	"s0",	"s1",	"s2",	"s3",	"s4",	"s5",	"s6",	"s7", \
diff --git a/gdb/config/mips/tm-tx39l.h b/gdb/config/mips/tm-tx39l.h
index 8ceec72..8889553 100644
--- a/gdb/config/mips/tm-tx39l.h
+++ b/gdb/config/mips/tm-tx39l.h
@@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "mips/tm-mips.h"
 
-#undef  REGISTER_NAMES
-#define REGISTER_NAMES 	\
+#undef  MIPS_REGISTER_NAMES
+#define MIPS_REGISTER_NAMES 	\
     {	"zero",	"at",	"v0",	"v1",	"a0",	"a1",	"a2",	"a3", \
 	"t0",	"t1",	"t2",	"t3",	"t4",	"t5",	"t6",	"t7", \
 	"s0",	"s1",	"s2",	"s3",	"s4",	"s5",	"s6",	"s7", \
diff --git a/gdb/config/mips/tm-vxmips.h b/gdb/config/mips/tm-vxmips.h
index 392a929..3f45d7e 100644
--- a/gdb/config/mips/tm-vxmips.h
+++ b/gdb/config/mips/tm-vxmips.h
@@ -1,5 +1,5 @@
 /* Target machine description for VxWorks MIPS's, for GDB, the GNU debugger.
-   Copyright 1996 Free Software Foundation, Inc.
+   Copyright 1996, 1999 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB.
@@ -18,11 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#define	GDBINIT_FILENAME	".vxgdbinit"
-
-#define	DEFAULT_PROMPT		"(vxgdb) "
-
 #include "mips/tm-mips.h"
+#include "tm-vxworks.h"
 
 /* FIXME: These are almost certainly wrong. */
 
diff --git a/gdb/config/ns32k/tm-merlin.h b/gdb/config/ns32k/tm-merlin.h
index 9a3edb9..907179f 100644
--- a/gdb/config/ns32k/tm-merlin.h
+++ b/gdb/config/ns32k/tm-merlin.h
@@ -193,7 +193,7 @@ extern CORE_ADDR merlin_skip_prologue PARAMS ((CORE_ADDR));
    Can return -1, meaning no way to tell.  */
 
 extern int merlin_frame_num_args PARAMS ((struct frame_info *fi));
-#define FRAME_NUM_ARGS (merlin_frame_num_args ((fi)))
+#define FRAME_NUM_ARGS(fi) (merlin_frame_num_args ((fi)))
 
 /* Return number of bytes at start of arglist that are not really args.  */
 
diff --git a/gdb/config/ns32k/tm-umax.h b/gdb/config/ns32k/tm-umax.h
index d4ea4ed..dd59388 100644
--- a/gdb/config/ns32k/tm-umax.h
+++ b/gdb/config/ns32k/tm-umax.h
@@ -221,46 +221,6 @@ extern CORE_ADDR umax_skip_prologue PARAMS ((CORE_ADDR));
 
 extern CORE_ADDR ns32k_get_enter_addr ();
 
-/* Return number of args passed to a frame.
-   Can return -1, meaning no way to tell.
-   Encore's C compiler often reuses same area on stack for args,
-   so this will often not work properly.  If the arg names
-   are known, it's likely most of them will be printed. */
-
-#define FRAME_NUM_ARGS(numargs, fi)			\
-{ CORE_ADDR	pc;					\
-  CORE_ADDR	enter_addr;				\
-  unsigned int	insn;					\
-  unsigned int	addr_mode;				\
-  int width;						\
-							\
-  numargs = -1;						\
-  enter_addr = ns32k_get_enter_addr ((fi)->pc);		\
-  if (enter_addr > 0)					\
-    {							\
-      pc = (enter_addr == 1) ?				\
-	SAVED_PC_AFTER_CALL (fi) :			\
-	FRAME_SAVED_PC (fi);				\
-      insn = read_memory_integer (pc,2);		\
-      addr_mode = (insn >> 11) & 0x1f;			\
-      insn = insn & 0x7ff;				\
-      if ((insn & 0x7fc) == 0x57c &&			\
-		addr_mode == 0x14) /* immediate */	\
-	{						\
-	  if (insn == 0x57c) /* adjspb */		\
-  		width = 1;				\
-	  else if (insn == 0x57d) /* adjspw */		\
-  		width = 2;				\
-	  else if (insn == 0x57f) /* adjspd */		\
-  		width = 4;				\
-	  numargs = read_memory_integer (pc+2,width);	\
-	  if (width > 1)				\
-	    flip_bytes (&numargs, width);		\
-	  numargs = - sign_extend (numargs, width*8) / 4;\
-	}						\
-    }							\
-}
-
 /* Return number of bytes at start of arglist that are not really args.  */
 
 #define FRAME_ARGS_SKIP 8
@@ -272,7 +232,7 @@ extern CORE_ADDR ns32k_get_enter_addr ();
    the address we return for it IS the sp for the next frame.  */
 
 extern int umax_frame_num_args PARAMS ((struct frame_info *fi));
-#define FRAME_NUM_ARGS (umax_frame_num_args ((fi)))
+#define FRAME_NUM_ARGS(fi) (umax_frame_num_args ((fi)))
 
 /* Things needed for making the inferior call functions.  */
 
diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index 169a817..ec83395 100644
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -1,5 +1,5 @@
 /* Parameters for execution on any Hewlett-Packard PA-RISC machine.
-   Copyright 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1995
+   Copyright 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1995, 1999
    Free Software Foundation, Inc. 
 
    Contributed by the Center for Software Science at the
@@ -723,6 +723,7 @@ enum unwind_stub_types
   PARAMETER_RELOCATION = 2,
   EXPORT = 10,
   IMPORT = 11,
+  IMPORT_SHLIB = 12,
 };
 
 /* We use the objfile->obj_private pointer for two things:
diff --git a/gdb/config/sparc/tm-vxsparc.h b/gdb/config/sparc/tm-vxsparc.h
index 6612943..06a98fc 100644
--- a/gdb/config/sparc/tm-vxsparc.h
+++ b/gdb/config/sparc/tm-vxsparc.h
@@ -1,5 +1,5 @@
 /* Target machine description for VxWorks sparc's, for GDB, the GNU debugger.
-   Copyright 1993 Free Software Foundation, Inc.
+   Copyright 1993, 1999 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB.
@@ -18,11 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#define	GDBINIT_FILENAME	".vxgdbinit"
-
-#define	DEFAULT_PROMPT		"(vxgdb) "
-
 #include "sparc/tm-spc-em.h"
+#include "tm-vxworks.h"
 
 /* FIXME: These are almost certainly wrong. */