X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Farm-xdep.c;h=f0b3b99f4339a3cf963c4dd7d441d43bb326fc05;hb=eb16c04c8c232558f68b424bcb62b285fd2d9002;hp=149b30fd3cd01e6e3a552c9e61d7c1f1059b66e7;hpb=d747e0af3d41f19815ab972f6fc9527fbf52804a;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/arm-xdep.c b/gdb/arm-xdep.c
index 149b30fd3c..f0b3b99f43 100644
--- a/gdb/arm-xdep.c
+++ b/gdb/arm-xdep.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"
@@ -36,7 +36,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include <sys/user.h>		/* After a.out.h  */
 #include <sys/file.h>
-#include <sys/stat.h>
+#include "gdb_stat.h"
 
 #include <errno.h>
 
@@ -50,29 +50,33 @@ fetch_inferior_registers (regno)
 
   struct user u;
   unsigned int offset = (char *) &u.u_ar0 - (char *) &u;
-  offset = ptrace (PT_READ_U, inferior_pid, offset, 0) - KERNEL_U_ADDR;
+  offset = ptrace (PT_READ_U, inferior_pid, (PTRACE_ARG3_TYPE) offset, 0)
+      - KERNEL_U_ADDR;
 
   registers_fetched ();
   
   for (regno = 0; regno < 16; regno++)
     {
       regaddr = offset + regno * 4;
-      *(int *)&buf[0] = ptrace (PT_READ_U, inferior_pid, regaddr, 0);
+      *(int *)&buf[0] = ptrace (PT_READ_U, inferior_pid,
+				(PTRACE_ARG3_TYPE) regaddr, 0);
       if (regno == PC_REGNUM)
 	  *(int *)&buf[0] = GET_PC_PART(*(int *)&buf[0]);
       supply_register (regno, buf);
     }
-  *(int *)&buf[0] = ptrace (PT_READ_U, inferior_pid, offset + PC*4);
+  *(int *)&buf[0] = ptrace (PT_READ_U, inferior_pid,
+			    (PTRACE_ARG3_TYPE) (offset + PC*4), 0);
   supply_register (PS_REGNUM, buf); /* set virtual register ps same as pc */
 
   /* read the floating point registers */
   offset = (char *) &u.u_fp_regs - (char *)&u;
-  *(int *)buf = ptrace (PT_READ_U, inferior_pid, offset, 0);
+  *(int *)buf = ptrace (PT_READ_U, inferior_pid, (PTRACE_ARG3_TYPE) offset, 0);
   supply_register (FPS_REGNUM, buf);
   for (regno = 16; regno < 24; regno++) {
       regaddr = offset + 4 + 12 * (regno - 16);
       for (i = 0; i < 12; i += sizeof(int))
-	  *(int *) &buf[i] = ptrace (PT_READ_U, inferior_pid, regaddr + i, 0);
+	  *(int *) &buf[i] = ptrace (PT_READ_U, inferior_pid,
+				     (PTRACE_ARG3_TYPE) (regaddr + i), 0);
       supply_register (regno, buf);
   }
 }
@@ -91,7 +95,8 @@ store_inferior_registers (regno)
   struct user u;
   unsigned long value;
   unsigned int offset = (char *) &u.u_ar0 - (char *) &u;
-  offset = ptrace (PT_READ_U, inferior_pid, offset, 0) - KERNEL_U_ADDR;
+  offset = ptrace (PT_READ_U, inferior_pid, (PTRACE_ARG3_TYPE) offset, 0)
+      - KERNEL_U_ADDR;
 
   if (regno >= 0) {
       if (regno >= 16) return;
@@ -100,7 +105,7 @@ store_inferior_registers (regno)
       value = read_register(regno);
       if (regno == PC_REGNUM)
 	  value = SET_PC_PART(read_register (PS_REGNUM), value);
-      ptrace (PT_WRITE_U, inferior_pid, regaddr, value);
+      ptrace (PT_WRITE_U, inferior_pid, (PTRACE_ARG3_TYPE) regaddr, value);
       if (errno != 0)
 	{
 	  sprintf (buf, "writing register number %d", regno);
@@ -114,7 +119,7 @@ store_inferior_registers (regno)
       value = read_register(regno);
       if (regno == PC_REGNUM)
 	  value = SET_PC_PART(read_register (PS_REGNUM), value);
-      ptrace (6, inferior_pid, regaddr, value);
+      ptrace (6, inferior_pid, (PTRACE_ARG3_TYPE) regaddr, value);
       if (errno != 0)
 	{
 	  sprintf (buf, "writing all regs, number %d", regno);
@@ -124,7 +129,7 @@ store_inferior_registers (regno)
 }
 
 /* Work with core dump and executable files, for GDB. 
-   This code would be in core.c if it weren't machine-dependent. */
+   This code would be in corefile.c if it weren't machine-dependent. */
 
 /* Structure to describe the chain of shared libraries used
    by the execfile.
@@ -182,7 +187,7 @@ core_file_command (filename, from_tty)
       make_cleanup (free, filename);
       
       if (have_inferior_p ())
-	error ("To look at a core file, you must kill the inferior with \"kill\".");
+	error ("To look at a core file, you must kill the program with \"kill\".");
       corechan = open (filename, O_RDONLY, 0);
       if (corechan < 0)
 	perror_with_name (filename);
@@ -262,11 +267,293 @@ core_file_command (filename, from_tty)
 	  corefile = concat (current_directory, "/", filename, NULL);
 	}
 
-      set_current_frame ( create_new_frame (read_register (FP_REGNUM),
-					    read_pc ()));
+      flush_cached_frames ();
       select_frame (get_current_frame (), 0);
       validate_files ();
     }
   else if (from_tty)
     printf ("No core file now.\n");
 }
+
+#if 0
+/* Work with core dump and executable files, for GDB. 
+   This code would be in corefile.c if it weren't machine-dependent. */
+
+/* Structure to describe the chain of shared libraries used
+   by the execfile.
+   e.g. prog shares Xt which shares X11 which shares c. */
+
+struct shared_library {
+    struct exec_header header;
+    char name[SHLIBLEN];
+    CORE_ADDR text_start;	/* CORE_ADDR of 1st byte of text, this file */
+    long data_offset;		/* offset of data section in file */
+    int chan;			/* file descriptor for the file */
+    struct shared_library *shares; /* library this one shares */
+};
+static struct shared_library *shlib = 0;
+
+/* Hook for `exec_file_command' command to call.  */
+
+extern void (*exec_file_display_hook) ();
+   
+static CORE_ADDR unshared_text_start;
+
+/* extended header from exec file (for shared library info) */
+
+static struct exec_header exec_header;
+
+void
+exec_file_command (filename, from_tty)
+     char *filename;
+     int from_tty;
+{
+  int val;
+
+  /* Eliminate all traces of old exec file.
+     Mark text segment as empty.  */
+
+  if (execfile)
+    free (execfile);
+  execfile = 0;
+  data_start = 0;
+  data_end -= exec_data_start;
+  text_start = 0;
+  unshared_text_start = 0;
+  text_end = 0;
+  exec_data_start = 0;
+  exec_data_end = 0;
+  if (execchan >= 0)
+    close (execchan);
+  execchan = -1;
+  if (shlib) {
+      close_shared_library(shlib);
+      shlib = 0;
+  }
+
+  /* Now open and digest the file the user requested, if any.  */
+
+  if (filename)
+    {
+      filename = tilde_expand (filename);
+      make_cleanup (free, filename);
+
+      execchan = openp (getenv ("PATH"), 1, filename, O_RDONLY, 0,
+			&execfile);
+      if (execchan < 0)
+	perror_with_name (filename);
+
+      {
+	struct stat st_exec;
+
+#ifdef HEADER_SEEK_FD
+	HEADER_SEEK_FD (execchan);
+#endif
+	
+	val = myread (execchan, &exec_header, sizeof exec_header);
+	exec_aouthdr = exec_header.a_exec;
+
+	if (val < 0)
+	  perror_with_name (filename);
+
+	text_start = 0x8000;
+
+	/* Look for shared library if needed */
+	if (exec_header.a_exec.a_magic & MF_USES_SL)
+	    shlib = open_shared_library(exec_header.a_shlibname, text_start);
+
+	text_offset = N_TXTOFF (exec_aouthdr);
+	exec_data_offset = N_TXTOFF (exec_aouthdr) + exec_aouthdr.a_text;
+
+	if (shlib) {
+	    unshared_text_start = shared_text_end(shlib) & ~0x7fff;
+	    stack_start = shlib->header.a_exec.a_sldatabase;
+	    stack_end = STACK_END_ADDR;
+	} else
+	    unshared_text_start = 0x8000;
+	text_end = unshared_text_start + exec_aouthdr.a_text;
+
+	exec_data_start = unshared_text_start + exec_aouthdr.a_text;
+        exec_data_end = exec_data_start + exec_aouthdr.a_data;
+
+	data_start = exec_data_start;
+	data_end += exec_data_start;
+
+	fstat (execchan, &st_exec);
+	exec_mtime = st_exec.st_mtime;
+      }
+
+      validate_files ();
+    }
+  else if (from_tty)
+    printf ("No exec file now.\n");
+
+  /* Tell display code (if any) about the changed file name.  */
+  if (exec_file_display_hook)
+    (*exec_file_display_hook) (filename);
+}
+#endif
+
+#if 0
+/* Read from the program's memory (except for inferior processes).
+   This function is misnamed, since it only reads, never writes; and
+   since it will use the core file and/or executable file as necessary.
+
+   It should be extended to write as well as read, FIXME, for patching files.
+
+   Return 0 if address could be read, EIO if addresss out of bounds.  */
+
+int
+xfer_core_file (memaddr, myaddr, len)
+     CORE_ADDR memaddr;
+     char *myaddr;
+     int len;
+{
+  register int i;
+  register int val;
+  int xferchan;
+  char **xferfile;
+  int fileptr;
+  int returnval = 0;
+
+  while (len > 0)
+    {
+      xferfile = 0;
+      xferchan = 0;
+
+      /* Determine which file the next bunch of addresses reside in,
+	 and where in the file.  Set the file's read/write pointer
+	 to point at the proper place for the desired address
+	 and set xferfile and xferchan for the correct file.
+
+	 If desired address is nonexistent, leave them zero.
+
+	 i is set to the number of bytes that can be handled
+	 along with the next address.
+
+	 We put the most likely tests first for efficiency.  */
+
+      /* Note that if there is no core file
+	 data_start and data_end are equal.  */
+      if (memaddr >= data_start && memaddr < data_end)
+	{
+	  i = min (len, data_end - memaddr);
+	  fileptr = memaddr - data_start + data_offset;
+	  xferfile = &corefile;
+	  xferchan = corechan;
+	}
+      /* Note that if there is no core file
+	 stack_start and stack_end define the shared library data.  */
+      else if (memaddr >= stack_start && memaddr < stack_end)
+	{
+	    if (corechan < 0) {
+		struct shared_library *lib;
+		for (lib = shlib; lib; lib = lib->shares)
+		    if (memaddr >= lib->header.a_exec.a_sldatabase &&
+			memaddr < lib->header.a_exec.a_sldatabase +
+			  lib->header.a_exec.a_data)
+			break;
+		if (lib) {
+		    i = min (len, lib->header.a_exec.a_sldatabase +
+			     lib->header.a_exec.a_data - memaddr);
+		    fileptr = lib->data_offset + memaddr -
+			lib->header.a_exec.a_sldatabase;
+		    xferfile = execfile;
+		    xferchan = lib->chan;
+		}
+	    } else {
+		i = min (len, stack_end - memaddr);
+		fileptr = memaddr - stack_start + stack_offset;
+		xferfile = &corefile;
+		xferchan = corechan;
+	    }
+	}
+      else if (corechan < 0
+	       && memaddr >= exec_data_start && memaddr < exec_data_end)
+	{
+	  i = min (len, exec_data_end - memaddr);
+	  fileptr = memaddr - exec_data_start + exec_data_offset;
+	  xferfile = &execfile;
+	  xferchan = execchan;
+	}
+      else if (memaddr >= text_start && memaddr < text_end)
+	{
+	    struct shared_library *lib;
+	    for (lib = shlib; lib; lib = lib->shares)
+		if (memaddr >= lib->text_start &&
+		    memaddr < lib->text_start + lib->header.a_exec.a_text)
+		    break;
+	    if (lib) {
+		i = min (len, lib->header.a_exec.a_text +
+			 lib->text_start - memaddr);
+		fileptr = memaddr - lib->text_start + text_offset;
+		xferfile = &execfile;
+		xferchan = lib->chan;
+	    } else {
+		i = min (len, text_end - memaddr);
+		fileptr = memaddr - unshared_text_start + text_offset;
+		xferfile = &execfile;
+		xferchan = execchan;
+	    }
+	}
+      else if (memaddr < text_start)
+	{
+	  i = min (len, text_start - memaddr);
+	}
+      else if (memaddr >= text_end
+	       && memaddr < (corechan >= 0? data_start : exec_data_start))
+	{
+	  i = min (len, data_start - memaddr);
+	}
+      else if (corechan >= 0
+	       && memaddr >= data_end && memaddr < stack_start)
+	{
+	  i = min (len, stack_start - memaddr);
+	}
+      else if (corechan < 0 && memaddr >= exec_data_end)
+	{
+	  i = min (len, - memaddr);
+	}
+      else if (memaddr >= stack_end && stack_end != 0)
+	{
+	  i = min (len, - memaddr);
+	}
+      else
+	{
+	  /* Address did not classify into one of the known ranges.
+	     This shouldn't happen; we catch the endpoints.  */
+	  fatal ("Internal: Bad case logic in xfer_core_file.");
+	}
+
+      /* Now we know which file to use.
+	 Set up its pointer and transfer the data.  */
+      if (xferfile)
+	{
+	  if (*xferfile == 0)
+	    if (xferfile == &execfile)
+	      error ("No program file to examine.");
+	    else
+	      error ("No core dump file or running program to examine.");
+	  val = lseek (xferchan, fileptr, 0);
+	  if (val < 0)
+	    perror_with_name (*xferfile);
+	  val = myread (xferchan, myaddr, i);
+	  if (val < 0)
+	    perror_with_name (*xferfile);
+	}
+      /* If this address is for nonexistent memory,
+	 read zeros if reading, or do nothing if writing.
+	 Actually, we never right.  */
+      else
+	{
+	  memset (myaddr, '\0', i);
+	  returnval = EIO;
+	}
+
+      memaddr += i;
+      myaddr += i;
+      len -= i;
+    }
+  return returnval;
+}
+#endif