Mon Dec 21 12:40:10 1992 Ian Lance Taylor (ian@cygnus.com)

[binutils-gdb.git] / gdb / tm-i960.h

diff --git a/gdb/tm-i960.h b/gdb/tm-i960.h
index 0b8785f6e26a0b665878416df5d7ce05b6ad48d4..d7f74bd64e0f18eb25080103b89312cd422e22cb 100644 (file)
--- a/gdb/tm-i960.h
+++ b/gdb/tm-i960.h
@@ -94,7 +94,7 @@ extern CORE_ADDR saved_pc_after_call ();
        /*  8 */ "r8",  "r9",  "r10", "r11", "r12", "r13", "r14", "r15",\
        /* 16 */ "g0",  "g1",  "g2",  "g3",  "g4",  "g5",  "g6",  "g7", \
        /* 24 */ "g8",  "g9",  "g10", "g11", "g12", "g13", "g14", "fp", \
-       /* 32 */ "pc",  "ac",  "ip",  "tc",  "fp0", "fp1", "fp2", "fp3",       \
+       /* 32 */ "pcw", "ac",  "tc",  "ip",  "fp0", "fp1", "fp2", "fp3",\
 }
 
 /* Register numbers of various important registers (used to index
@@ -110,8 +110,8 @@ extern CORE_ADDR saved_pc_after_call ();
 #define FP_REGNUM  31  /* Contains address of executing stack frame */
 #define        PCW_REGNUM 32   /* process control word */
 #define        ACW_REGNUM 33   /* arithmetic control word */
-#define        IP_REGNUM  34   /* instruction pointer */
-#define        TCW_REGNUM 35   /* trace control word */
+#define        TCW_REGNUM 34   /* trace control word */
+#define IP_REGNUM  35  /* instruction pointer */
 #define FP0_REGNUM 36  /* First floating point register */
 
 /* Some registers have more than one name */
@@ -173,12 +173,12 @@ extern CORE_ADDR saved_pc_after_call ();
 /* Convert data from raw format for register REGNUM
    to virtual format for register REGNUM.  */
 
+extern struct ext_format ext_format_i960;
+
 #define REGISTER_CONVERT_TO_VIRTUAL(REGNUM,FROM,TO)     \
 { \
-  extern struct ext_format ext_format_i960[];          \
-  \
   if ((REGNUM) >= FP0_REGNUM)   \
-    ieee_extended_to_double (ext_format_i960, (FROM), (TO));     \
+    ieee_extended_to_double (&ext_format_i960, (FROM), (double *)(TO));     \
   else                                  \
     bcopy ((FROM), (TO), 4);   \
 }
@@ -188,10 +188,8 @@ extern CORE_ADDR saved_pc_after_call ();
 
 #define REGISTER_CONVERT_TO_RAW(REGNUM,FROM,TO) \
 { \
-  extern struct ext_format ext_format_i960[];          \
-  \
   if ((REGNUM) >= FP0_REGNUM)   \
-    double_to_ieee_extended (ext_format_i960, (FROM), (TO));     \
+    double_to_ieee_extended (&ext_format_i960, (double *)(FROM), (TO));     \
   else                                  \
     bcopy ((FROM), (TO), 4);   \
 }
@@ -264,12 +262,8 @@ extern CORE_ADDR saved_pc_after_call ();
 /* 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.  */
+   it means the given frame is the outermost one and has no caller.  */
 
 /* We cache information about saved registers in the frame structure,
    to save us from having to re-scan function prologues every time
@@ -285,7 +279,8 @@ extern CORE_ADDR saved_pc_after_call ();
    Set the arg_pointer to -1, which is not valid; 0 and other values
    indicate real, cached values.  */
 
-#define INIT_EXTRA_FRAME_INFO(fi) ((fi)->fsr = 0, (fi)->arg_pointer = -1)
+#define INIT_EXTRA_FRAME_INFO(fromleaf, fi) \
+       ((fi)->fsr = 0, (fi)->arg_pointer = -1)
 
 /* On the i960, we get the chain pointer by reading the PFP saved
    on the stack and clearing the status bits.  */
@@ -293,10 +288,8 @@ extern CORE_ADDR saved_pc_after_call ();
 #define FRAME_CHAIN(thisframe) \
   (read_memory_integer (FRAME_FP(thisframe), 4) & ~0xf)
 
-#define FRAME_CHAIN_COMBINE(chain, thisframe) (chain)
-
 /* FRAME_CHAIN_VALID returns zero if the given frame is the outermost one
-   and has no caller.  In that case, FRAME_CHAIN_COMBINE is not used.
+   and has no caller.
 
    On the i960, each various target system type must define FRAME_CHAIN_VALID,
    since it differs between NINDY and VxWorks, the two currently supported