* ns32k-tdep.c: include gdbtypes.h, inferior.h, regcache.h,

target.s, arch-utils.h, ns32k-tdep.h.  Make many functions
static.  Rename some register numbers to put them in ns32k-tdep
private namespace.
(ns32k_get_saved_register, ns32k_gdbarch_init_32082,
ns32k_gdbarch_init_32382, ns32k_gdbarch_init, ns32k_dump_tdep): New
functions.
(_initialize_ns32k_tdep): Use gdbarch_register.
* ns32k-tdep.h: New file.
* ns32knbsd-tdep.c: New file.
* config/ns32k/nbsdaout.mt (TDEPFILES): Add ns32knbsd-tdep.o.
* config/ns32k/tm-nbsd.h: Include "ns32k/tm-ns32k.h".
(IN_SOLIB_CALL_TRAMPOLINE, REGISTER_NAME, NUM_REGS,
REGISTER_BYTES, REGISTER_BYTE): Remove.
* config/ns32k/tm-ns32k.h: New file.
* config/ns32k/tm-umax.h: Remove.

4 files changed, 41 insertions, 215 deletions

diff --git a/gdb/config/ns32k/nbsdaout.mt b/gdb/config/ns32k/nbsdaout.mt
index 14d37f9a40f..24418f4e8dc 100644
--- a/gdb/config/ns32k/nbsdaout.mt
+++ b/gdb/config/ns32k/nbsdaout.mt
@@ -1,3 +1,3 @@
 # Target: PC532 running NetBSD
-TDEPFILES= ns32k-tdep.o
+TDEPFILES= ns32k-tdep.o ns32knbsd-tdep.o
 TM_FILE= tm-nbsd.h
diff --git a/gdb/config/ns32k/tm-nbsd.h b/gdb/config/ns32k/tm-nbsd.h
index 5081c3587aa..88b4e226942 100644
--- a/gdb/config/ns32k/tm-nbsd.h
+++ b/gdb/config/ns32k/tm-nbsd.h
@@ -27,33 +27,11 @@
 
 /* Most definitions from umax could be used. */
 
-#include "ns32k/tm-umax.h"
-
-/* Return non-zero if we are in a shared library trampoline code stub. */
-#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) \
-  (name && !strcmp(name, "_DYNAMIC"))
+#include "ns32k/tm-ns32k.h"
 
 /* Saved Pc.  Get it from sigcontext if within sigtramp.  */
 
 /* Offset to saved PC in sigcontext, from <machine/signal.h>.  */
 #define SIGCONTEXT_PC_OFFSET 20
 
-/* tm-umax.h assumes a 32082 fpu. We have a 32382 fpu. */
-
-#undef REGISTER_NAME
-#define REGISTER_NAME(REGNUM) ns32k_register_name_32382((REGNUM))
-
-#undef NUM_REGS
-#define NUM_REGS		29
-
-/* Total amount of space needed to store our copies of the machine's
-   register state, the array `registers'.  */
-#undef REGISTER_BYTES
-#define REGISTER_BYTES \
-  ((NUM_REGS - 4) * REGISTER_RAW_SIZE(R0_REGNUM) \
-   + 8            * REGISTER_RAW_SIZE(LP0_REGNUM))
-
-#undef  REGISTER_BYTE
-#define REGISTER_BYTE(N) ns32k_register_byte_32382 ((N))
-
 #endif /* TM_NBSD_H */
diff --git a/gdb/config/ns32k/tm-ns32k.h b/gdb/config/ns32k/tm-ns32k.h
new file mode 100644
index 00000000000..cd1594294fc
--- /dev/null
+++ b/gdb/config/ns32k/tm-ns32k.h
@@ -0,0 +1,39 @@
+/* Definitions to make GDB run on an encore under umax 4.2
+   Copyright 1987, 1989, 1991, 1993, 1994, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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_NS32K_H
+#define TM_NS32K_H
+
+#define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL
+
+/* Need to get function ends by adding this to epilogue address from .bf
+   record, not using x_fsize field.  */
+#define FUNCTION_EPILOGUE_SIZE 4
+
+/* Address of end of stack space.  */
+
+#ifndef STACK_END_ADDR
+#define STACK_END_ADDR (0xfffff000)
+#endif
+
+#define NUM_GENERAL_REGS	8
+
+#endif /* TM_NS32K_H */
diff --git a/gdb/config/ns32k/tm-umax.h b/gdb/config/ns32k/tm-umax.h
deleted file mode 100644
index 0ddd6d13f4e..00000000000
--- a/gdb/config/ns32k/tm-umax.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* Definitions to make GDB run on an encore under umax 4.2
-   Copyright 1987, 1989, 1991, 1993, 1994, 1998, 1999, 2000, 2001, 2002
-   Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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.  */
-
-#include "regcache.h"
-
-struct value;
-struct type;
-
-/* Need to get function ends by adding this to epilogue address from .bf
-   record, not using x_fsize field.  */
-#define FUNCTION_EPILOGUE_SIZE 4
-
-/* Offset from address of function to start of its code.
-   Zero on most machines.  */
-
-#define FUNCTION_START_OFFSET 0
-
-/* Advance PC across any function entry prologue instructions
-   to reach some "real" code.  */
-
-extern CORE_ADDR umax_skip_prologue (CORE_ADDR);
-#define SKIP_PROLOGUE(pc) (umax_skip_prologue (pc))
-
-CORE_ADDR ns32k_saved_pc_after_call (struct frame_info *);
-#define SAVED_PC_AFTER_CALL(frame) ns32k_saved_pc_after_call ((frame))
-
-/* Address of end of stack space.  */
-
-#ifndef STACK_END_ADDR
-#define STACK_END_ADDR (0xfffff000)
-#endif
-
-/* Stack grows downward.  */
-
-#define INNER_THAN(lhs,rhs) core_addr_lessthan ((lhs), (rhs))
-
-extern const unsigned char *ns32k_breakpoint_from_pc (CORE_ADDR *, int *);
-#define BREAKPOINT_FROM_PC(PCP, LENP) ns32k_breakpoint_from_pc ((PCP), (LENP))
-
-/* Amount PC must be decremented by after a breakpoint.
-   This is often the number of bytes in BREAKPOINT
-   but not always.  */
-
-#define DECR_PC_AFTER_BREAK 0
-
-/* Say how long (ordinary) registers are.  This is a piece of bogosity
-   used in push_word and a few other places; REGISTER_RAW_SIZE is the
-   real way to know how big a register is.  */
-
-#define REGISTER_SIZE 4
-
-/* Number of machine registers */
-
-#define NUM_REGS		25
-
-#define NUM_GENERAL_REGS	8
-
-extern char *ns32k_register_name_32082 (int);
-extern char *ns32k_register_name_32382 (int);
-
-#define REGISTER_NAME(REGNUM) ns32k_register_name_32082(REGNUM)
-
-/* Register numbers of various important registers.
-   Note that some of these values are "real" register numbers,
-   and correspond to the general registers of the machine,
-   and some are "phony" register numbers which are too large
-   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.  */
-
-#define	R0_REGNUM 0		/* General register 0 */
-#define FP0_REGNUM 8		/* Floating point register 0 */
-#define SP_REGNUM 16		/* Contains address of top of stack */
-#define AP_REGNUM FP_REGNUM
-#define FP_REGNUM 17		/* Contains address of executing stack frame */
-#define PC_REGNUM 18		/* Contains program counter */
-#define PS_REGNUM 19		/* Contains processor status */
-#define FPS_REGNUM 20		/* Floating point status register */
-#define LP0_REGNUM 21		/* Double register 0 (same as FP0) */
-
-/* Total amount of space needed to store our copies of the machine's
-   register state, the array `registers'.  */
-#define REGISTER_BYTES \
-  ((NUM_REGS - 4) * REGISTER_RAW_SIZE(R0_REGNUM) \
-   + 4            * REGISTER_RAW_SIZE(LP0_REGNUM))
-
-/* Index within `registers' of the first byte of the space for
-   register N.  */
-extern int ns32k_register_byte_32082 (int);
-extern int ns32k_register_byte_32382 (int);
-#define REGISTER_BYTE(N) ns32k_register_byte_32082 ((N))
-
-extern int ns32k_register_raw_size (int);
-#define REGISTER_RAW_SIZE(N) ns32k_register_raw_size ((N))
-
-extern int ns32k_register_virtual_size (int);
-#define REGISTER_VIRTUAL_SIZE(N) ns32k_register_virtual_size ((N))
-
-/* Largest value REGISTER_RAW_SIZE can have.  */
-
-#define MAX_REGISTER_RAW_SIZE 8
-
-/* Largest value REGISTER_VIRTUAL_SIZE can have.  */
-
-#define MAX_REGISTER_VIRTUAL_SIZE 8
-
-struct type *ns32k_register_virtual_type (int);
-#define REGISTER_VIRTUAL_TYPE(N) ns32k_register_virtual_type ((N))
-
-extern void ns32k_store_struct_return (CORE_ADDR, CORE_ADDR);
-#define STORE_STRUCT_RETURN(ADDR, SP) \
-  ns32k_store_struct_return ((ADDR), (SP))
-
-extern void ns32k_extract_return_value (struct type *, char *, char *);
-#define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
-  ns32k_extract_return_value ((TYPE), (REGBUF), (VALBUF))
-
-extern void ns32k_store_return_value (struct type *, char *);
-#define STORE_RETURN_VALUE(TYPE,VALBUF) \
-  ns32k_store_return_value ((TYPE), (VALBUF))
-
-extern CORE_ADDR ns32k_extract_struct_value_address (char *);
-#define EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) \
-  ns32k_extract_struct_value_address ((REGBUF))
-
-/* Describe the pointer in each stack frame to the previous stack frame
-   (its caller).  */
-
-CORE_ADDR ns32k_frame_chain (struct frame_info *);
-#define FRAME_CHAIN(thisframe) ns32k_frame_chain ((thisframe))
-
-CORE_ADDR ns32k_frame_saved_pc (struct frame_info *);
-#define FRAME_SAVED_PC(FRAME) ns32k_frame_saved_pc ((FRAME))
-
-CORE_ADDR ns32k_frame_args_address (struct frame_info *);
-#define FRAME_ARGS_ADDRESS(fi) ns32k_frame_args_address ((fi))
-
-CORE_ADDR ns32k_frame_locals_address (struct frame_info *);
-#define FRAME_LOCALS_ADDRESS(fi) ns32k_frame_locals_address ((fi))
-
-/* Return number of args passed to a frame.
-   Can return -1, meaning no way to tell.  */
-
-extern int umax_frame_num_args (struct frame_info *);
-#define FRAME_NUM_ARGS(fi) (umax_frame_num_args ((fi)))
-
-/* Return number of bytes at start of arglist that are not really args.  */
-
-#define FRAME_ARGS_SKIP 8
-
-void ns32k_frame_init_saved_regs (struct frame_info *);
-#define FRAME_INIT_SAVED_REGS(FI) ns32k_frame_init_saved_regs ((FI))
-
-
-/* Things needed for making the inferior call functions.  */
-
-extern void ns32k_push_dummy_frame (void);
-#define PUSH_DUMMY_FRAME ns32k_push_dummy_frame ()
-
-extern void ns32k_pop_frame (void);
-#define POP_FRAME ns32k_pop_frame ()
-
-extern LONGEST ns32k_call_dummy_words[];
-#define CALL_DUMMY_WORDS ns32k_call_dummy_words
-
-extern int sizeof_ns32k_call_dummy_words;
-#define SIZEOF_CALL_DUMMY_WORDS sizeof_ns32k_call_dummy_words
-
-#define CALL_DUMMY_START_OFFSET	3
-
-extern void ns32k_fix_call_dummy (char *, CORE_ADDR, CORE_ADDR, int,
-                                  struct value **, struct type *, int);
-#define FIX_CALL_DUMMY(dummy, pc, fun, nargs, args, type, gcc_p) \
-  ns32k_fix_call_dummy ((dummy), (pc), (fun), (nargs), (args), (type), (gcc_p))