Cort Dougan <cort@attis.cs.nmt.edu>

[deliverable/binutils-gdb.git] / gdb / m88k-nat.c

diff --git a/gdb/m88k-nat.c b/gdb/m88k-nat.c
index e7c4d68838f2f2bcf0aac8796ef5f634d56e7a6e..27d72544606e5a4b5a314cc33105ec3eb5bb01a7 100644 (file)
--- a/gdb/m88k-nat.c
+++ b/gdb/m88k-nat.c
@@ -15,7 +15,7 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "frame.h"
@@ -34,7 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <sys/file.h>
-#include <sys/stat.h>
+#include "gdb_stat.h"
 
 #include "symtab.h"
 #include "setjmp.h"
@@ -59,7 +59,6 @@ extern int have_symbol_file_p();
 extern jmp_buf stack_jmp;
 
 extern int errno;
-extern char registers[REGISTER_BYTES];
 
 void
 fetch_inferior_registers (regno)
@@ -114,60 +113,62 @@ store_inferior_registers (regno)
 
   struct USER u;
 
-
   unsigned int offset = (char *) &u.pt_r0 - (char *) &u;
 
   regaddr = offset;
 
+  /* Don't try to deal with EXIP_REGNUM or ENIP_REGNUM, because I think either
+     svr3 doesn't run on an 88110, or the kernel isolates the different (not
+     completely sure this is true, but seems to be.  */
   if (regno >= 0)
     {
-/*      regaddr = register_addr (regno, offset); */
-        if (regno < PC_REGNUM)
-           { 
-            regaddr = offset + regno * sizeof (int);
-             errno = 0;
-             ptrace (6, inferior_pid,
-                    (PTRACE_ARG3_TYPE) regaddr, read_register (regno));
-             if (errno != 0)
-              {
-                sprintf (buf, "writing register number %d", regno);
-                perror_with_name (buf);
-              }
-           }
-       else if (regno == SXIP_REGNUM)
-             ptrace (6, inferior_pid,
-                    (PTRACE_ARG3_TYPE) SXIP_OFFSET, read_register(regno));
-       else if (regno == SNIP_REGNUM)
-            ptrace (6, inferior_pid,
-                    (PTRACE_ARG3_TYPE) SNIP_OFFSET, read_register(regno));
-       else if (regno == SFIP_REGNUM)
-            ptrace (6, inferior_pid,
-                    (PTRACE_ARG3_TYPE) SFIP_OFFSET, read_register(regno));
-       else printf ("Bad register number for store_inferior routine\n");
-    }
-  else { 
-         for (regno = 0; regno < NUM_REGS - 3; regno++)
-           {
       /*      regaddr = register_addr (regno, offset); */
-              errno = 0;
-              regaddr = offset + regno * sizeof (int);
-              ptrace (6, inferior_pid,
-                     (PTRACE_ARG3_TYPE) regaddr, read_register (regno));
-              if (errno != 0)
-               {
-                 sprintf (buf, "writing register number %d", regno);
-                 perror_with_name (buf);
-               }
-           }
-        ptrace (6,inferior_pid,
-                (PTRACE_ARG3_TYPE) SXIP_OFFSET,read_register(SXIP_REGNUM));
-        ptrace (6,inferior_pid,
-                (PTRACE_ARG3_TYPE) SNIP_OFFSET,read_register(SNIP_REGNUM));
-        ptrace (6,inferior_pid,
-                (PTRACE_ARG3_TYPE) SFIP_OFFSET,read_register(SFIP_REGNUM));
-       }       
-           
-
+      if (regno < PC_REGNUM)
+       { 
+         regaddr = offset + regno * sizeof (int);
+         errno = 0;
+         ptrace (6, inferior_pid,
+                 (PTRACE_ARG3_TYPE) regaddr, read_register (regno));
+         if (errno != 0)
+           {
+             sprintf (buf, "writing register number %d", regno);
+             perror_with_name (buf);
+           }
+       }
+      else if (regno == SXIP_REGNUM)
+       ptrace (6, inferior_pid,
+               (PTRACE_ARG3_TYPE) SXIP_OFFSET, read_register(regno));
+      else if (regno == SNIP_REGNUM)
+       ptrace (6, inferior_pid,
+               (PTRACE_ARG3_TYPE) SNIP_OFFSET, read_register(regno));
+      else if (regno == SFIP_REGNUM)
+       ptrace (6, inferior_pid,
+               (PTRACE_ARG3_TYPE) SFIP_OFFSET, read_register(regno));
+      else
+       printf_unfiltered ("Bad register number for store_inferior routine\n");
+    }
+  else
+    { 
+      for (regno = 0; regno < PC_REGNUM; regno++)
+       {
+         /*      regaddr = register_addr (regno, offset); */
+         errno = 0;
+         regaddr = offset + regno * sizeof (int);
+         ptrace (6, inferior_pid,
+                 (PTRACE_ARG3_TYPE) regaddr, read_register (regno));
+         if (errno != 0)
+           {
+             sprintf (buf, "writing register number %d", regno);
+             perror_with_name (buf);
+           }
+       }
+      ptrace (6,inferior_pid,
+             (PTRACE_ARG3_TYPE) SXIP_OFFSET,read_register(SXIP_REGNUM));
+      ptrace (6,inferior_pid,
+             (PTRACE_ARG3_TYPE) SNIP_OFFSET,read_register(SNIP_REGNUM));
+      ptrace (6,inferior_pid,
+             (PTRACE_ARG3_TYPE) SFIP_OFFSET,read_register(SFIP_REGNUM));
+    }
 }
 
 
@@ -209,14 +210,21 @@ m88k_register_u_addr (blockend, regnum)
     case 28:
     case 29:
     case 30:
-    case 31:          return (ustart + ((int) &u.pt_r0 - (int) &u) + sizeof(REGISTER_TYPE) * regnum);
+    case 31:
+      return (ustart + ((int) &u.pt_r0 - (int) &u) + REGISTER_SIZE * regnum);
     case PSR_REGNUM:  return (ustart + ((int) &u.pt_psr - (int) &u));
     case FPSR_REGNUM: return (ustart + ((int) &u.pt_fpsr - (int) &u));
     case FPCR_REGNUM: return (ustart + ((int) &u.pt_fpcr - (int) &u));
     case SXIP_REGNUM: return (ustart + SXIP_OFFSET); 
     case SNIP_REGNUM: return (ustart + SNIP_OFFSET);
     case SFIP_REGNUM: return (ustart + SFIP_OFFSET); 
-    default: return (blockend + sizeof (REGISTER_TYPE) * regnum);
+    default: 
+       if (regnum < NUM_REGS)
+           /* The register is one of those which is not defined...
+              give it zero */
+           return (ustart + ((int) &u.pt_r0 - (int) &u));
+       else
+           return (blockend + REGISTER_SIZE * regnum);
     }
 }
 
@@ -253,7 +261,6 @@ fill_gregset (gregsetp, regno)
 {
     int regi;
     register greg_t *regp = (greg_t *) gregsetp;
-    extern char registers[];
 
     for (regi = 0 ; regi <= R_R31 ; regi++)
        if ((regno == -1) || (regno == regi))
@@ -264,7 +271,7 @@ fill_gregset (gregsetp, regno)
     if ((regno == -1) || (regno == SNIP_REGNUM))
        *(regp + R_NIP) = *(int *) &registers[REGISTER_BYTE(SNIP_REGNUM)];
     if ((regno == -1) || (regno == SFIP_REGNUM))
-       *(regp + R_SFIP) = *(int *) &registers[REGISTER_BYTE(SFIP_REGNUM)];
+       *(regp + R_FIP) = *(int *) &registers[REGISTER_BYTE(SFIP_REGNUM)];
     if ((regno == -1) || (regno == PSR_REGNUM))
        *(regp + R_PSR) = *(int *) &registers[REGISTER_BYTE(PSR_REGNUM)];
     if ((regno == -1) || (regno == FPSR_REGNUM))