Fix typos and thinkos reported by Sun Ming (and one reported by John).

[deliverable/binutils-gdb.git] / gdb / xm-mips.h

diff --git a/gdb/xm-mips.h b/gdb/xm-mips.h
index 4b5eb5fd8d7449a94d3d809a9aca2a9218ce642b..6a8a5bbccd65a38bfc99f0dbca40c0347d358b5c 100644 (file)
--- a/gdb/xm-mips.h
+++ b/gdb/xm-mips.h
@@ -27,28 +27,39 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define        SET_STACK_LIMIT_HUGE
 
-/* This WOULD BE the amount to subtract from u.u_ar0
-   to get the offset in the core file of the register values.
-   But Mips' ptrace works on regnums, not displacements.  So since
-   REGISTER_U_ADDR is called for both core files and ptrace, use
-   BLOCKEND as a flag:  0 for core files, 1 for ptrace.  What a
-   kludge.  */
+#ifdef ultrix
+/* Needed for DECstation core files.  */
+#include <machine/param.h>
+#define KERNEL_U_ADDR UADDR
+#endif
+
+#ifdef ultrix
+extern char *strdup();
+#endif
+
+/* DECstation memcpy and memset return void *, not char *.  */
+
+extern void *memcpy();
+extern void *memset();
+#define        MEM_FNS_DECLARED
+
+#if !defined (offsetof)
+# define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
+#endif
 
-#define KERNEL_U_ADDR (int)reg_ptr     /* Magic, causes a zero blockend */
+/* Only used for core files on DECstations.
+   First four registers at u.u_ar0 are saved arguments, and
+   there is no r0 saved.   Float registers are saved
+   in u_pcb.pcb_fpregs, not relative to u.u_ar0.  */
 
 #define REGISTER_U_ADDR(addr, blockend, regno)                 \
-   if (blockend == 0) {                                        \
-       if (regno < 38) addr = (NBPG*UPAGES) + (regno - 38)*sizeof(int);\
-       else addr = 0; /* ..somewhere in the pcb */     \
-   } else if (regno < 32) addr = regno;                        \
-   else if (regno == PC_REGNUM) addr = 96;             \
-   else if (regno == 36) addr = 97;                    \
-   else if (regno == HI_REGNUM) addr = 98;             \
-   else if (regno == LO_REGNUM) addr = 99;             \
-   else if (regno == FCRCS_REGNUM) addr = 100;         \
-   else if (regno == FCRIR_REGNUM) addr = 101;         \
-   else if (regno >= FP0_REGNUM) addr = regno - (FP0_REGNUM-32);\
-   else addr = 0;
+       { \
+         if (regno < FP0_REGNUM) \
+           addr = blockend + sizeof(int) * (4 + regno - 1); \
+         else \
+           addr = offsetof (struct user, u_pcb.pcb_fpregs[0]) + \
+                  sizeof (int) * (regno - FP0_REGNUM); \
+       }
 
 /* Override copies of {fetch,store}_inferior_registers in infptrace.c.  */
 #define FETCH_INFERIOR_REGISTERS