X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgo32-nat.c;h=6ff2710c22d3faf68d46285431936edcd0334940;hb=c45df9bda811929d3135aebd34d53b44ee45fe15;hp=e7442358c12f373440d4b50d16e986f3b2d03dbe;hpb=284a190e5223c2b011878741af6b12178b1da66f;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index e7442358c1..6ff2710c22 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -29,7 +29,8 @@
 #include "gdbcmd.h"
 #include "floatformat.h"
 #include "buildsym.h"
-#include "i387-nat.h"
+#include "i387-tdep.h"
+#include "i386-tdep.h"
 #include "value.h"
 #include "regcache.h"
 #include "gdb_string.h"
@@ -93,13 +94,13 @@ save_npx (void)
   asm ("inb    $0xa0, %%al  \n\
        testb $0x20, %%al    \n\
        jz 1f 	    	    \n\
-       xorb %% al, %%al	    \n\
-       outb %% al, $0xf0    \n\
+       xorb %%al, %%al	    \n\
+       outb %%al, $0xf0     \n\
        movb $0x20, %%al	    \n\
-       outb %% al, $0xa0    \n\
-       outb %% al, $0x20    \n\
+       outb %%al, $0xa0     \n\
+       outb %%al, $0x20     \n\
 1:     	       	   	    \n\
-       fnsave % 0	    \n\
+       fnsave %0	    \n\
        fwait "
 :     "=m" (npx)
 :				/* No input */
@@ -109,9 +110,6 @@ save_npx (void)
 /* *INDENT-ON* */
 
 
-
-
-
 /* ------------------------------------------------------------------------- */
 /* Reload the contents of the NPX from the global variable `npx'.  */
 
@@ -469,7 +467,7 @@ fetch_register (int regno)
 {
   if (regno < FP0_REGNUM)
     supply_register (regno, (char *) &a_tss + regno_mapping[regno].tss_ofs);
-  else if (regno <= LAST_FPU_CTRL_REGNUM)
+  else if (i386_fp_regnum_p (regno) || i386_fpc_regnum_p (regno))
     i387_supply_register (regno, (char *) &npx);
   else
     internal_error (__FILE__, __LINE__,
@@ -493,9 +491,9 @@ static void
 store_register (int regno)
 {
   if (regno < FP0_REGNUM)
-    regcache_collect (regno, (void *) &a_tss + regno_mapping[regno].tss_ofs);
-  else if (regno <= LAST_FPU_CTRL_REGNUM)
-    i387_fill_fsave ((char *)&npx, regno);
+    regcache_collect (regno, (char *) &a_tss + regno_mapping[regno].tss_ofs);
+  else if (i386_fp_regnum_p (regno) || i386_fpc_regnum_p (regno))
+    i387_fill_fsave ((char *) &npx, regno);
   else
     internal_error (__FILE__, __LINE__,
 		    "Invalid register no. %d in store_register.", regno);
@@ -806,7 +804,7 @@ go32_terminal_inferior (void)
   {
     redir_to_debugger (&child_cmd);
     error ("Cannot redirect standard handles for program: %s.",
-	   strerror (errno));
+	   safe_strerror (errno));
   }
   /* set the console device of the inferior to whatever mode
      (raw or cooked) we found it last time */
@@ -840,7 +838,7 @@ go32_terminal_ours (void)
     {
       redir_to_child (&child_cmd);
       error ("Cannot redirect standard handles for debugger: %s.",
-	     strerror (errno));
+	     safe_strerror (errno));
     }
   }
 }
@@ -1907,7 +1905,7 @@ _initialize_go32_nat (void)
   add_target (&go32_ops);
 
   add_prefix_cmd ("dos", class_info, go32_info_dos_command,
-		  "Print information specific to DJGPP (a.k.a. MS-DOS) debugging.",
+		  "Print information specific to DJGPP (aka MS-DOS) debugging.",
 		  &info_dos_cmdlist, "info dos ", 0, &infolist);
 
   add_cmd ("sysinfo", class_info, go32_sysinfo,