2003-10-06 Andrew Cagney <cagney@redhat.com>

[deliverable/binutils-gdb.git] / gdb / sparcnbsd-tdep.c

diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c
index 4fe05aa9ce03a1ae3ea590fba344be52d15b9096..f25950740485c98a3096fc0dbe4dda2b1ac418df 100644 (file)
--- a/gdb/sparcnbsd-tdep.c
+++ b/gdb/sparcnbsd-tdep.c
@@ -28,6 +28,7 @@
 
 #include "gdb_string.h"
 
+#include "sparc-tdep.h"
 #include "sparcnbsd-tdep.h"
 #include "nbsd-tdep.h"
 
@@ -58,8 +59,8 @@ sparcnbsd_supply_reg32 (char *regs, int regno)
   if (regno == PC_REGNUM || regno == -1)
     supply_register (PC_REGNUM, regs + REG32_OFFSET_PC);
 
-  if (regno == NPC_REGNUM || regno == -1)
-    supply_register (NPC_REGNUM, regs + REG32_OFFSET_NPC);
+  if (regno == DEPRECATED_NPC_REGNUM || regno == -1)
+    supply_register (DEPRECATED_NPC_REGNUM, regs + REG32_OFFSET_NPC);
 
   if (regno == Y_REGNUM || regno == -1)
     supply_register (Y_REGNUM, regs + REG32_OFFSET_Y);
@@ -125,8 +126,8 @@ sparcnbsd_supply_reg64 (char *regs, int regno)
   if (regno == PC_REGNUM || regno == -1)
     supply_register (PC_REGNUM, regs + REG64_OFFSET_PC);
 
-  if (regno == NPC_REGNUM || regno == -1)
-    supply_register (NPC_REGNUM, regs + REG64_OFFSET_NPC);
+  if (regno == DEPRECATED_NPC_REGNUM || regno == -1)
+    supply_register (DEPRECATED_NPC_REGNUM, regs + REG64_OFFSET_NPC);
 
   if (regno == Y_REGNUM || regno == -1)
     {
@@ -219,8 +220,8 @@ sparcnbsd_fill_reg32 (char *regs, int regno)
   if (regno == PC_REGNUM || regno == -1)
     regcache_collect (PC_REGNUM, regs + REG32_OFFSET_PC);
 
-  if (regno == NPC_REGNUM || regno == -1)
-    regcache_collect (NPC_REGNUM, regs + REG32_OFFSET_NPC);
+  if (regno == DEPRECATED_NPC_REGNUM || regno == -1)
+    regcache_collect (DEPRECATED_NPC_REGNUM, regs + REG32_OFFSET_NPC);
 
   if (regno == Y_REGNUM || regno == -1)
     regcache_collect (Y_REGNUM, regs + REG32_OFFSET_Y);
@@ -260,8 +261,8 @@ sparcnbsd_fill_reg64 (char *regs, int regno)
   if (regno == PC_REGNUM || regno == -1)
     regcache_collect (PC_REGNUM, regs + REG64_OFFSET_PC);
 
-  if (regno == NPC_REGNUM || regno == -1)
-    regcache_collect (NPC_REGNUM, regs + REG64_OFFSET_NPC);
+  if (regno == DEPRECATED_NPC_REGNUM || regno == -1)
+    regcache_collect (DEPRECATED_NPC_REGNUM, regs + REG64_OFFSET_NPC);
 
   if (regno == Y_REGNUM || regno == -1)
     regcache_collect (Y_REGNUM, regs + REG64_OFFSET_Y);