Re: print_npx_status_word

["Baars, M.J." <mjbaars1977.gdb@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

On 04/16/2011 10:24 AM, Mark Kettenis wrote:
>> Date: Sat, 16 Apr 2011 08:08:48 +0200
>> From: "Baars, M.J."<mjbaars1977.gdb@gmail.com>
>>
>> Hi Tom,
>>
>> I believe this is the format you requested?
> No!  This is a .tar.gz.  Proper diffs don't come as a .tar.gz.
Oops... did I remove one of your entries in the ChangeLog? :)
>> --------------020309050206070002040202
>> Content-Type: application/x-gzip;
>>   name="patches-gdb-7.2.tar.gz"
>> Content-Transfer-Encoding: base64
>> Content-Disposition: attachment;
>>   filename="patches-gdb-7.2.tar.gz"


[-- Attachment #2: ChangeLog.diff --]
[-- Type: text/x-patch, Size: 382 bytes --]

--- ./gdb-7.2/gdb/ChangeLog	2010-09-03 01:37:25.000000000 +0200
+++ ./gdb-7.2.2/gdb/ChangeLog	2011-04-14 16:14:53.623948000 +0200
@@ -1,3 +1,7 @@
+2011-04-14	Ir. M.J. Baars <mjbaars1977.gdb@gmail.com>
+
+	* i387-tdep.c (print_npx_status_word) - new function
+
 2010-09-02  Joel Brobecker  <brobecker@adacore.com>
 
 	* NEWS: Replace "Changes since GDB 7.1" by "Changes in GDB 7.2".

[-- Attachment #3: ChangeLog-1999.diff --]
[-- Type: text/x-patch, Size: 704 bytes --]

--- ./gdb-7.2/gdb/ChangeLog-1999	2001-01-12 04:44:31.000000000 +0100
+++ ./gdb-7.2.2/gdb/ChangeLog-1999	2011-04-14 16:11:31.503948001 +0200
@@ -581,9 +581,9 @@ Wed Dec  8 15:29:48 1999  Andrew Cagney
 	Patch from Mark Kettenis  <kettenis@gnu.org>:
 
 	* config/i386/tm-i386.h (FLOAT_INFO): New define.
-	* i387-tdep.c (print_i387_value, print_i387_ext,
-	print_i387_status_word, print_i387_control_word, i387_float_info):
-	New functions, used to implement generic `info float' command.
+	
+	* i387-tdep.c (print_i387_value, print_i387_ext,print_i387_control_word, i387_float_info):
+	  New functions, used to implement generic `info float' command.
 
 1999-12-06  Christopher Faylor  <cgf@cygnus.com>
 

[-- Attachment #4: ChangeLog-2001.diff --]
[-- Type: text/x-patch, Size: 557 bytes --]

--- ./gdb-7.2/gdb/ChangeLog-2001	2002-01-06 05:37:53.000000000 +0100
+++ ./gdb-7.2.2/gdb/ChangeLog-2001	2011-04-14 15:55:22.631948002 +0200
@@ -8076,11 +8076,6 @@ Wed Apr  4 21:48:42 2001  Christopher Fa
 
 	* MAINTAINERS: Add myself to write after approval list.
 
-2001-03-09  Mark Kettenis  <kettenis@gnu.org>
-
-	* i387-tdep.c (print_i387_status_word): Fix printing of Stack
-	fault flag.  It is bit 6 of the x87 FPU status word, not bit 7.
-
 2001-03-08  Andrew Cagney  <ac131313@redhat.com>
 
 	* configure.host (m88*-harris-cxux*): Mark as obsolete.

[-- Attachment #5: ChangeLog-2002.diff --]
[-- Type: text/x-patch, Size: 1081 bytes --]

--- ./gdb-7.2/gdb/ChangeLog-2002	2004-04-24 00:15:17.000000000 +0200
+++ ./gdb-7.2.2/gdb/ChangeLog-2002	2011-04-14 16:13:29.187948001 +0200
@@ -5396,12 +5396,13 @@ Fri Sep 13 07:42:09 2002  Andrew Cagney
 	* config/i386/tm-i386.h: Don't include "regcache.h".
 
 	* i387-tdep.h (i387_print_float_info): New prototype.
-	* i387-tdep.c (print_i387_value, print_i387_ext,
-	print_i387_status_word, print_i387_control_word): Add `struct
-	ui_file *' argument and use it for output.
-	(i387_print_float_info): Renamed from i387_float_info.  Add
-	`struct gdbarch *' and `struct ui_file *' arguments and use the
-	latter for output.
+	* i387-tdep.c (print_i387_value, print_i387_ext, print_i387_control_word):
+	  Add `struct ui_file *' argument and use it for output.
+
+	* i387-tdep.c (i387_print_float_info):
+	  Renamed from i387_float_info.  Add `struct gdbarch *' and `struct ui_file *' arguments
+	  and use the latter for output.
+
 	* i386-tdep.c: Include "i387-tdep.h".
 	(i386_gdbarch_init): Set print_float_info.
 	* config/i386/tm-i386.h (i387_float_info): Remove prototype.

[-- Attachment #6: ChangeLog-2004.diff --]
[-- Type: text/x-patch, Size: 679 bytes --]

--- ./gdb-7.2/gdb/ChangeLog-2004	2006-10-24 22:23:56.000000000 +0200
+++ ./gdb-7.2.2/gdb/ChangeLog-2004	2011-04-14 16:13:52.067948001 +0200
@@ -3468,9 +3468,10 @@
 	* ui-out.c (ui_out_field_core_addr): Ditto.
 	* breakpoint.c (breakpoint_adjustment_warning): Ditto.
 	* exec.c (print_section_info): Ditto.
-	* i387-tdep.c (print_i387_status_word): Ditto.
-	(print_i387_control_word): Ditto.
-	(i387_print_float_info): Ditto.
+
+	* i387-tdep.c (print_i387_control_word): Ditto.
+	* i387-tdep.c (i387_print_float_info): Ditto.
+
 	* maint.c (maint_print_section_info): Ditto.
 	* solib.c (info_sharedlibrary_command): Ditto.
 	* somsolib.c (som_sharedlibrary_info_command): Ditto.

[-- Attachment #7: i387-tdep.c.diff --]
[-- Type: text/x-patch, Size: 4261 bytes --]

--- ./gdb-7.2/gdb/i387-tdep.c	2010-05-05 21:30:36.000000000 +0200
+++ ./gdb-7.2.2/gdb/i387-tdep.c	2011-04-14 16:23:54.647948001 +0200
@@ -36,6 +36,52 @@
 #include "i387-tdep.h"
 #include "i386-xstate.h"
 
+struct
+{
+	char *tag;
+	char *description;
+}
+
+static const npx_exception_flags[6] =
+
+{
+	{"IE", "invalid operation"},
+	{"DE", "denormalized operand"},
+	{"ZE", "zero divide"},
+	{"OE", "overflow"},
+	{"UE", "underflow"},
+	{"PE", "precision"}
+};
+
+// print the numeric coprocessor extension (npx) status word
+void print_npx_status_word(uint16_t npx_status_word, struct ui_file *file)
+{
+	fprintf_filtered(file, "status word              : 0x%04X\n", npx_status_word);
+
+	fprintf_filtered(file, "  exception flags        : ");
+
+	fprintf_filtered(file, "%s ", ((npx_status_word >> 0x0005) & 0x0001) ? npx_exception_flags[5].tag : "  ");	// precision
+	fprintf_filtered(file, "%s ", ((npx_status_word >> 0x0004) & 0x0001) ? npx_exception_flags[4].tag : "  ");	// underflow
+	fprintf_filtered(file, "%s ", ((npx_status_word >> 0x0003) & 0x0001) ? npx_exception_flags[3].tag : "  ");	// overflow
+	fprintf_filtered(file, "%s ", ((npx_status_word >> 0x0002) & 0x0001) ? npx_exception_flags[2].tag : "  ");	// zero divide
+	fprintf_filtered(file, "%s ", ((npx_status_word >> 0x0001) & 0x0001) ? npx_exception_flags[1].tag : "  ");	// denormalized operand
+	fprintf_filtered(file, "%s ", ((npx_status_word >> 0x0000) & 0x0001) ? npx_exception_flags[0].tag : "  ");	// invalid operation
+	fprintf_filtered(file, "\n");
+
+	fprintf_filtered(file, "  stack fault            : %u\n", ((npx_status_word >> 0x0006) & 0x0001));
+	fprintf_filtered(file, "  error summary status   : %u\n", ((npx_status_word >> 0x0007) & 0x0001));
+	fprintf_filtered(file, "  busy                   : %u\n", ((npx_status_word >> 0x000F) & 0x0001));
+	fprintf_filtered(file, "  top of stack pointer   : %u\n", ((npx_status_word >> 0x000B) & 0x0007));
+
+	fprintf_filtered(file, "  condition code         : ");
+
+	fprintf_filtered(file, "%s ", ((npx_status_word >> 0x000E) & 0x0001) ? "C3" : "  ");
+	fprintf_filtered(file, "%s ", ((npx_status_word >> 0x000A) & 0x0001) ? "C2" : "  ");
+	fprintf_filtered(file, "%s ", ((npx_status_word >> 0x0009) & 0x0001) ? "C1" : "  ");
+	fprintf_filtered(file, "%s ", ((npx_status_word >> 0x0008) & 0x0001) ? "C0" : "  ");
+	fprintf_filtered(file, "\n");
+}
+
 /* Print the floating point number specified by RAW.  */
 
 static void
@@ -114,36 +160,6 @@ print_i387_ext (struct gdbarch *gdbarch,
     fputs_filtered (" Unsupported", file);
 }
 
-/* Print the status word STATUS.  */
-
-static void
-print_i387_status_word (unsigned int status, struct ui_file *file)
-{
-  fprintf_filtered (file, "Status Word:         %s",
-		    hex_string_custom (status, 4));
-  fputs_filtered ("  ", file);
-  fprintf_filtered (file, " %s", (status & 0x0001) ? "IE" : "  ");
-  fprintf_filtered (file, " %s", (status & 0x0002) ? "DE" : "  ");
-  fprintf_filtered (file, " %s", (status & 0x0004) ? "ZE" : "  ");
-  fprintf_filtered (file, " %s", (status & 0x0008) ? "OE" : "  ");
-  fprintf_filtered (file, " %s", (status & 0x0010) ? "UE" : "  ");
-  fprintf_filtered (file, " %s", (status & 0x0020) ? "PE" : "  ");
-  fputs_filtered ("  ", file);
-  fprintf_filtered (file, " %s", (status & 0x0080) ? "ES" : "  ");
-  fputs_filtered ("  ", file);
-  fprintf_filtered (file, " %s", (status & 0x0040) ? "SF" : "  ");
-  fputs_filtered ("  ", file);
-  fprintf_filtered (file, " %s", (status & 0x0100) ? "C0" : "  ");
-  fprintf_filtered (file, " %s", (status & 0x0200) ? "C1" : "  ");
-  fprintf_filtered (file, " %s", (status & 0x0400) ? "C2" : "  ");
-  fprintf_filtered (file, " %s", (status & 0x4000) ? "C3" : "  ");
-
-  fputs_filtered ("\n", file);
-
-  fprintf_filtered (file,
-		    "                       TOP: %d\n", ((status >> 11) & 7));
-}
-
 /* Print the control word CONTROL.  */
 
 static void
@@ -268,7 +284,9 @@ i387_print_float_info (struct gdbarch *g
 
   fputs_filtered ("\n", file);
 
-  print_i387_status_word (fstat, file);
+	print_npx_status_word(fstat, file);
+	fprintf_filtered(file, "\n");
+
   print_i387_control_word (fctrl, file);
   fprintf_filtered (file, "Tag Word:            %s\n",
 		    hex_string_custom (ftag, 4));