From 07a5991a095f75d6869c8bc62ab0308ad465ad6e Mon Sep 17 00:00:00 2001
From: "K. Richard Pixley" <rich@cygnus>
Date: Wed, 22 Sep 1993 18:34:05 +0000
Subject: [PATCH] 	  infcmd.c (step_1), 	  infrun.c
 (wait_for_inferior): collapse SHIFT_INST_REGS ifdef 	  and insert macro.

---
 gdb/infcmd.c |  3 +--
 gdb/infrun.c | 10 +---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 8cd99404c6e..1df2c8fa23f 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -395,8 +395,7 @@ which has no line number information.\n", name);
       if (! stop_step)
 	break;
 #if defined (SHIFT_INST_REGS)
-      write_register (NNPC_REGNUM, read_register (NPC_REGNUM));
-      write_register (NPC_REGNUM, read_register (PC_REGNUM));
+      SHIFT_INST_REGS();
 #endif
     }
 
diff --git a/gdb/infrun.c b/gdb/infrun.c
index b3484a157c0..e7d2c4221ea 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1259,15 +1259,7 @@ step_into_function:
           if (!bpstat_explains_signal (stop_bpstat)
 	      && (stop_signal != SIGCLD) 
               && !stopped_by_random_signal)
-            {
-            CORE_ADDR pc_contents = read_register (PC_REGNUM);
-            CORE_ADDR npc_contents = read_register (NPC_REGNUM);
-            if (pc_contents != npc_contents)
-              {
-              write_register (NNPC_REGNUM, npc_contents);
-              write_register (NPC_REGNUM, pc_contents);
-	      }
-            }
+            SHIFT_INST_REGS();
 #endif /* SHIFT_INST_REGS */
 
 	  resume (CURRENTLY_STEPPING (), stop_signal);
-- 
2.30.2