import gdb-1999-09-08 snapshot

1 files changed, 70 insertions, 6 deletions

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index d0363e6..6aef61b 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -58,9 +58,11 @@ static char *valid_flavors[] =
 };
 static char *disassembly_flavor = att_flavor;
 
+static void i386_print_register PARAMS ((char *, int, int));
+
 /* This is used to keep the bfd arch_info in sync with the disassembly flavor.  */
 static void set_disassembly_flavor_sfunc PARAMS ((char *, int, struct cmd_list_element *));
-static void set_disassembly_flavor ();
+static void set_disassembly_flavor PARAMS ((void));
 
 /* Stdio style buffering was used to minimize calls to ptrace, but this
    buffering did not take into account that the code section being accessed
@@ -674,21 +676,38 @@ i386_extract_return_value (type, regbuf, valbuf)
      char regbuf[REGISTER_BYTES];
      char *valbuf;
 {
-/* On AIX, floating point values are returned in floating point registers.  */
-#ifdef I386_AIX_TARGET
+  /* On AIX and i386 GNU/Linux, floating point values are returned in
+     floating point registers.  */
+#if defined(I386_AIX_TARGET) || defined(I386_GNULINUX_TARGET)
   if (TYPE_CODE_FLT == TYPE_CODE (type))
     {
       double d;
       /* 387 %st(0), gcc uses this */
       floatformat_to_double (&floatformat_i387_ext,
-			     &regbuf[REGISTER_BYTE (FP0_REGNUM)],
+			     &regbuf[REGISTER_BYTE(FPDATA_REGNUM)],
 			     &d);
       store_floating (valbuf, TYPE_LENGTH (type), d);
     }
   else
-#endif /* I386_AIX_TARGET */
+#endif /* I386_AIX_TARGET || I386_GNULINUX_TARGET*/
     {
-      memcpy (valbuf, regbuf, TYPE_LENGTH (type));
+      int len = TYPE_LENGTH (type);
+      int low_size = REGISTER_RAW_SIZE (LOW_RETURN_REGNUM);
+      int high_size = REGISTER_RAW_SIZE (HIGH_RETURN_REGNUM);
+
+      if (len <= low_size)
+	memcpy (valbuf, regbuf + REGISTER_BYTE (LOW_RETURN_REGNUM), len);
+      else if (len <= (low_size + high_size))
+	{
+	  memcpy (valbuf,
+		  regbuf + REGISTER_BYTE (LOW_RETURN_REGNUM),
+		  low_size);
+	  memcpy (valbuf + low_size,
+		  regbuf + REGISTER_BYTE (HIGH_RETURN_REGNUM),
+		  len - low_size);
+	}
+      else
+	error ("GDB bug: i386-tdep.c (i386_extract_return_value): Don't know how to find a return value %d bytes long", len);
     }
 }
 
@@ -942,6 +961,51 @@ set_disassembly_flavor ()
     set_architecture_from_arch_mach (bfd_arch_i386, bfd_mach_i386_i386_intel_syntax);
 }
 
+/* Print the register regnum, or all registers if regnum is -1 */
+
+void
+i386_do_registers_info (regnum, fpregs)
+     int regnum;
+     int fpregs;
+{
+  char raw_regs [REGISTER_BYTES];
+  int i;
+
+  for (i = 0; i < NUM_REGS; i++)
+    read_relative_register_raw_bytes (i, raw_regs + REGISTER_BYTE (i));
+
+  if (regnum < FPSTART_REGNUM)
+    i386_print_register (raw_regs, regnum, fpregs);
+  else
+    i387_print_register (raw_regs, regnum);
+}
+
+static void
+i386_print_register (raw_regs, regnum, fpregs)
+     char *raw_regs;
+     int regnum;
+     int fpregs;
+{
+  int i;
+  long val;
+  char string[12];
+
+  for (i = 0; i < FPSTART_REGNUM; i++)
+    {
+      if ((regnum != -1) && (i != regnum))
+	continue;
+
+      val = extract_signed_integer (raw_regs + REGISTER_BYTE (i), 4);
+
+      sprintf(string, "0x%x", val);
+      printf_filtered ("%8.8s: %10.10s %11d\n", REGISTER_NAME(i), string, val);
+    }
+
+  if ((regnum == -1) && fpregs)
+    for (i = FPSTART_REGNUM; i < FPEND_REGNUM; i++)
+      i387_print_register (raw_regs, i);
+}
+
 void
 _initialize_i386_tdep ()
 {