1 files changed, 211 insertions, 97 deletions

diff --git a/gdb/findvar.c b/gdb/findvar.c
index d7ccdc4..0bfd1d8 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -19,7 +19,6 @@ anyone else from sharing it farther.  Help stamp out software hoarding!
 */
 
 #include "defs.h"
-#include "initialize.h"
 #include "param.h"
 #include "symtab.h"
 #include "frame.h"
@@ -27,34 +26,56 @@ anyone else from sharing it farther.  Help stamp out software hoarding!
 
 CORE_ADDR read_register ();
 
-START_FILE
-
 /* Return the address in which frame FRAME's value of register REGNUM
    has been saved in memory.  Or return zero if it has not been saved.
    If REGNUM specifies the SP, the value we return is actually
    the SP value, not an address where it was saved.  */
 
-static CORE_ADDR
+CORE_ADDR
 find_saved_register (frame, regnum)
      FRAME frame;
      int regnum;
 {
-  struct frame_info fi;
+  struct frame_info *fi;
   struct frame_saved_regs saved_regs;
 
   register FRAME frame1 = 0;
   register CORE_ADDR addr = 0;
 
+#ifdef HAVE_REGISTER_WINDOWS
+  /* We assume that a register in a register window will only be saved
+     in one place (since the name changes and dissapears as you go
+     towards inner frames), so we only call get_frame_saved_regs on
+     the current frame.  This is directly in contradiction to the
+     usage below, which assumes that registers used in a frame must be
+     saved in a lower (more interior) frame.  This change is a result
+     of working on a register window machine; get_frame_saved_regs
+     always returns the registers saved within a frame, within the
+     context (register namespace) of that frame. */
+
+  if (REGISTER_IN_WINDOW_P(regnum))
+    {
+      fi = get_frame_info (frame);
+      get_frame_saved_regs (fi, &saved_regs);
+      return (saved_regs.regs[regnum] ?
+	      saved_regs.regs[regnum] : 0);
+    }
+#endif /* HAVE_REGISTER_WINDOWS */
+
+  /* Note that this next routine assumes that registers used in
+     frame x will be saved only in the frame that x calls and
+     frames interior to it.  This is not true on the sparc, but the
+     above macro takes care of it, so we should be all right. */
   while (1)
     {
       QUIT;
-      fi = get_prev_frame_info (frame1);
-      if (fi.frame == 0 || fi.frame == frame)
+      frame1 = get_prev_frame (frame1);
+      if (frame1 == 0 || frame1 == frame)
 	break;
-      get_frame_saved_regs (&fi, &saved_regs);
+      fi = get_frame_info (frame1);
+      get_frame_saved_regs (fi, &saved_regs);
       if (saved_regs.regs[regnum])
 	addr = saved_regs.regs[regnum];
-      frame1 = fi.frame;
     }
 
   return addr;
@@ -73,7 +94,7 @@ read_relative_register_raw_bytes (regnum, myaddr)
 
   if (regnum == FP_REGNUM)
     {
-      bcopy (&selected_frame, myaddr, sizeof (CORE_ADDR));
+      bcopy (&FRAME_FP(selected_frame), myaddr, sizeof (CORE_ADDR));
       return;
     }
 
@@ -102,15 +123,19 @@ value
 value_of_register (regnum)
      int regnum;
 {
-  register CORE_ADDR addr = find_saved_register (selected_frame, regnum);
+  register CORE_ADDR addr;
   register value val;
   char raw_buffer[MAX_REGISTER_RAW_SIZE];
   char virtual_buffer[MAX_REGISTER_VIRTUAL_SIZE];
 
+  if (! (have_inferior_p () || have_core_file_p ()))
+    error ("Can't get value of register without inferior or core file");
+  
+  addr =  find_saved_register (selected_frame, regnum);
   if (addr)
     {
       if (regnum == SP_REGNUM)
-	return value_from_long (builtin_type_int, addr);
+	return value_from_long (builtin_type_int, (LONGEST) addr);
       read_memory (addr, raw_buffer, REGISTER_RAW_SIZE (regnum));
     }
   else
@@ -137,6 +162,7 @@ char registers[REGISTER_BYTES];
    starting with the REGBYTE'th byte of register data
    into memory at MYADDR.  */
 
+void
 read_register_bytes (regbyte, myaddr, len)
      int regbyte;
      char *myaddr;
@@ -148,6 +174,7 @@ read_register_bytes (regbyte, myaddr, len)
 /* Copy LEN bytes of consecutive data from memory at MYADDR
    into registers starting with the REGBYTE'th byte of register data.  */
 
+void
 write_register_bytes (regbyte, myaddr, len)
      int regbyte;
      char *myaddr;
@@ -211,7 +238,7 @@ read_var_value (var, frame)
 {
   register value v;
 
-  struct frame_info fi;
+  struct frame_info *fi;
 
   struct type *type = SYMBOL_TYPE (var);
   register CORE_ADDR addr = 0;
@@ -260,84 +287,178 @@ read_var_value (var, frame)
 
     case LOC_REGISTER:
     case LOC_REGPARM:
-      {
-	char raw_buffer[MAX_REGISTER_RAW_SIZE];
-	char virtual_buffer[MAX_REGISTER_VIRTUAL_SIZE];
-
-	VALUE_REGNO (v) = val;
-
-	/* Locate the register's contents in a real register or in core;
-	   read the data in raw format.  */
-
-	addr = find_saved_register (frame, val);
-	if (addr == 0)
-	  {
-	    /* Value is really in a register.  */
-
-	    VALUE_LVAL (v) = lval_register;
-	    VALUE_ADDRESS (v) = REGISTER_BYTE (val);
-
-	    read_register_bytes (REGISTER_BYTE (val),
-				 raw_buffer, REGISTER_RAW_SIZE (val));
-	  }
-	else
-	  {
-	    /* Value was in a register that has been saved in memory.  */
-
-	    read_memory (addr, raw_buffer, REGISTER_RAW_SIZE (val));
-	    VALUE_ADDRESS (v) = addr;
-	  }
-
-	/* Convert the raw contents to virtual contents.
-	   (Just copy them if the formats are the same.)  */
-
-	REGISTER_CONVERT_TO_VIRTUAL (val, raw_buffer, virtual_buffer);
-
-	if (REGISTER_CONVERTIBLE (val))
-	  {
-	    /* When the raw and virtual formats differ, the virtual format
-	       corresponds to a specific data type.  If we want that type,
-	       copy the data into the value.
-	       Otherwise, do a type-conversion.  */
-
-	    if (type != REGISTER_VIRTUAL_TYPE (val))
-	      {
-		/* eg a variable of type `float' in a 68881 register
-		   with raw type `extended' and virtual type `double'.
-		   Fetch it as a `double' and then convert to `float'.  */
-		v = allocate_value (REGISTER_VIRTUAL_TYPE (val));
-		bcopy (virtual_buffer, VALUE_CONTENTS (v), len);
-		v = value_cast (type, v);
-	      }
-	    else
-	      bcopy (virtual_buffer, VALUE_CONTENTS (v), len);
-	  }
-	else
-	  {
-	    /* Raw and virtual formats are the same for this register.  */
-
-	    union { int i; char c; } test;
-	    /* If we want less than the full size, we need to
-	       test for a big-endian or little-endian machine.  */
-	    test.i = 1;
-	    if (test.c != 1 && len < REGISTER_RAW_SIZE (val))
-	      {
-		/* Big-endian, and we want less than full size.  */
-		VALUE_OFFSET (v) = REGISTER_RAW_SIZE (val) - len;
-	      }
-
-	    bcopy (virtual_buffer + VALUE_OFFSET (v),
-		   VALUE_CONTENTS (v), len);
-	  }
-
-	return v;
-      }
+      v = value_from_register (type, val, frame);
+      return v;
     }
 
   read_memory (addr, VALUE_CONTENTS (v), len);
   VALUE_ADDRESS (v) = addr;
   return v;
 }
+
+/* Return a value of type TYPE, stored in register REGNUM, in frame
+   FRAME. */
+
+value
+value_from_register (type, regnum, frame)
+     struct type *type;
+     int regnum;
+     FRAME frame;
+{
+  char raw_buffer [MAX_REGISTER_RAW_SIZE];
+  char virtual_buffer[MAX_REGISTER_VIRTUAL_SIZE];
+  CORE_ADDR addr;
+  value v = allocate_value (type);
+  int len = TYPE_LENGTH (type);
+  char *value_bytes = 0;
+  int value_bytes_copied = 0;
+  int num_storage_locs;
+
+  VALUE_REGNO (v) = regnum;
+
+  num_storage_locs = (len > REGISTER_VIRTUAL_SIZE (regnum) ?
+		      ((len - 1) / REGISTER_RAW_SIZE (regnum)) + 1 :
+		      1);
+
+  if (num_storage_locs > 1)
+    {
+      /* Value spread across multiple storage locations.  */
+      
+      int local_regnum;
+      int mem_stor = 0, reg_stor = 0;
+      int mem_tracking = 1;
+      CORE_ADDR last_addr = 0;
+
+      value_bytes = (char *) alloca (len + MAX_REGISTER_RAW_SIZE);
+
+      /* Copy all of the data out, whereever it may be.  */
+
+      for (local_regnum = regnum;
+	   value_bytes_copied < len;
+	   (value_bytes_copied += REGISTER_RAW_SIZE (local_regnum),
+	    ++local_regnum))
+	{
+	  int register_index = local_regnum - regnum;
+	  addr = find_saved_register (frame, local_regnum);
+	  if (addr == 0)
+	    {
+	      read_register_bytes (REGISTER_BYTE (local_regnum),
+				   value_bytes + value_bytes_copied,
+				   REGISTER_RAW_SIZE (local_regnum));
+	      reg_stor++;
+	    }
+	  else
+	    {
+	      read_memory (addr, value_bytes + value_bytes_copied,
+			   REGISTER_RAW_SIZE (local_regnum));
+	      mem_stor++;
+	      mem_tracking =
+		(mem_tracking
+		 && (regnum == local_regnum
+		     || addr == last_addr));
+	    }
+	  last_addr = addr;
+	}
+
+      if ((reg_stor && mem_stor)
+	  || (mem_stor && !mem_tracking))
+	/* Mixed storage; all of the hassle we just went through was
+	   for some good purpose.  */
+	{
+	  VALUE_LVAL (v) = lval_reg_frame_relative;
+	  VALUE_FRAME (v) = FRAME_FP (frame);
+	  VALUE_FRAME_REGNUM (v) = regnum;
+	}
+      else if (mem_stor)
+	{
+	  VALUE_LVAL (v) = lval_memory;
+	  VALUE_ADDRESS (v) = find_saved_register (frame, regnum);
+	}
+      else if (reg_stor)
+	{
+	  VALUE_LVAL (v) = lval_register;
+	  VALUE_ADDRESS (v) = REGISTER_BYTE (regnum);
+	}
+      else
+	fatal ("value_from_register: Value not stored anywhere!");
+      
+      /* Any structure stored in more than one register will always be
+	 an inegral number of registers.  Otherwise, you'd need to do
+	 some fiddling with the last register copied here for little
+	 endian machines.  */
+
+      /* Copy into the contents section of the value.  */
+      bcopy (value_bytes, VALUE_CONTENTS (v), len);
+
+      return v;
+    }
+
+  /* Data is completely contained within a single register.  Locate the
+     register's contents in a real register or in core;
+     read the data in raw format.  */
+  
+  addr = find_saved_register (frame, regnum);
+  if (addr == 0)
+    {
+      /* Value is really in a register.  */
+      
+      VALUE_LVAL (v) = lval_register;
+      VALUE_ADDRESS (v) = REGISTER_BYTE (regnum);
+      
+      read_register_bytes (REGISTER_BYTE (regnum),
+			   raw_buffer, REGISTER_RAW_SIZE (regnum));
+    }
+  else
+    {
+      /* Value was in a register that has been saved in memory.  */
+      
+      read_memory (addr, raw_buffer, REGISTER_RAW_SIZE (regnum));
+      VALUE_LVAL (v) = lval_memory;
+      VALUE_ADDRESS (v) = addr;
+    }
+  
+  /* Convert the raw contents to virtual contents.
+     (Just copy them if the formats are the same.)  */
+  
+  REGISTER_CONVERT_TO_VIRTUAL (regnum, raw_buffer, virtual_buffer);
+  
+  if (REGISTER_CONVERTIBLE (regnum))
+    {
+      /* When the raw and virtual formats differ, the virtual format
+	 corresponds to a specific data type.  If we want that type,
+	 copy the data into the value.
+	 Otherwise, do a type-conversion.  */
+      
+      if (type != REGISTER_VIRTUAL_TYPE (regnum))
+	{
+	  /* eg a variable of type `float' in a 68881 register
+	     with raw type `extended' and virtual type `double'.
+	     Fetch it as a `double' and then convert to `float'.  */
+	  v = allocate_value (REGISTER_VIRTUAL_TYPE (regnum));
+	  bcopy (virtual_buffer, VALUE_CONTENTS (v), len);
+	  v = value_cast (type, v);
+	}
+      else
+	bcopy (virtual_buffer, VALUE_CONTENTS (v), len);
+    }
+  else
+    {
+      /* Raw and virtual formats are the same for this register.  */
+      
+#ifdef BYTES_BIG_ENDIAN
+      if (len < REGISTER_RAW_SIZE (regnum))
+	{
+	  /* Big-endian, and we want less than full size.  */
+	  VALUE_OFFSET (v) = REGISTER_RAW_SIZE (regnum) - len;
+	}
+#endif
+ 
+      bcopy (virtual_buffer + VALUE_OFFSET (v),
+	     VALUE_CONTENTS (v), len);
+    }
+  
+  return v;
+}
 
 /* Given a struct symbol for a variable,
    and a stack frame address,
@@ -350,7 +471,7 @@ locate_var_value (var, frame)
 {
   register CORE_ADDR addr = 0;
   int val = SYMBOL_VALUE (var);
-  struct frame_info fi;
+  struct frame_info *fi;
   struct type *type = SYMBOL_TYPE (var);
 
   if (frame == 0) frame = selected_frame;
@@ -367,14 +488,12 @@ locate_var_value (var, frame)
       addr = find_saved_register (frame, val);
       if (addr != 0)
 	{
-	  union { int i; char c; } test;
 	  int len = TYPE_LENGTH (type);
-	  /* If var is less than the full size of register, we need to
-	     test for a big-endian or little-endian machine.  */
-	  test.i = 1;
-	  if (test.c != 1 && len < REGISTER_RAW_SIZE (val))
+#ifdef BYTES_BIG_ENDIAN
+	  if (len < REGISTER_RAW_SIZE (val))
 	    /* Big-endian, and we want less than full size.  */
 	    addr += REGISTER_RAW_SIZE (val) - len;
+#endif
 	  break;
 	}
       error ("Address requested for identifier \"%s\" which is in a register.",
@@ -405,11 +524,6 @@ locate_var_value (var, frame)
     }
 
   return value_cast (lookup_pointer_type (type),
-		     value_from_long (builtin_type_long, addr));
+		     value_from_long (builtin_type_long, (LONGEST) addr));
 }
 
-static
-initialize ()
-{}
-
-END_FILE