nindy bug fixes (function types) and opcode library inclusion

[deliverable/binutils-gdb.git] / gdb / tm-umax.h

diff --git a/gdb/tm-umax.h b/gdb/tm-umax.h
index 0dea3012df25e4fcfa7935e24312f7632a222e33..0e74b92ad6a1ccc1461238e8c79f6c2ad7bf1f75 100644 (file)
--- a/gdb/tm-umax.h
+++ b/gdb/tm-umax.h
@@ -113,6 +113,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    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
@@ -124,7 +125,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Total amount of space needed to store our copies of the machine's
    register state, the array `registers'.  */
-#define REGISTER_BYTES ((NUM_REGS - 4) * sizeof (int) + 4 * sizeof (double))
+#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.  */
@@ -212,28 +215,16 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    (its caller).  */
 
 /* FRAME_CHAIN takes a frame's nominal address
-   and produces the frame's chain-pointer.
-
-   FRAME_CHAIN_COMBINE takes the chain pointer and the frame's nominal address
-   and produces the nominal address of the caller frame.
-
-   However, if FRAME_CHAIN_VALID returns zero,
-   it means the given frame is the outermost one and has no caller.
-   In that case, FRAME_CHAIN_COMBINE is not used.  */
+   and produces the frame's chain-pointer. */
 
 /* In the case of the ns32000 series, the frame's nominal address is the FP
    value, and at that address is saved previous FP value as a 4-byte word.  */
 
 #define FRAME_CHAIN(thisframe)  \
-  (outside_startup_file ((thisframe)->pc) ? \
+  (!inside_entry_file ((thisframe)->pc) ? \
    read_memory_integer ((thisframe)->frame, 4) :\
    0)
 
-#define FRAME_CHAIN_VALID(chain, thisframe) \
-  (chain != 0 && (outside_startup_file (FRAME_SAVED_PC (thisframe))))
-
-#define FRAME_CHAIN_COMBINE(chain, thisframe) (chain)
-
 /* Define other aspects of the stack frame.  */
 
 #define FRAME_SAVED_PC(FRAME) (read_memory_integer ((FRAME)->frame + 4, 4))
@@ -250,10 +241,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    Returns positive address > 1 if pc is between enter/exit,
    1 if pc before enter or after exit, 0 otherwise. */
 
-#ifndef CORE_ADDR
-#include "defs.h"   /* Make sure CORE_ADDR is defined.  */
-#endif
-
 extern CORE_ADDR ns32k_get_enter_addr ();
 
 /* Return number of args passed to a frame.