Remove make_cleanup_restore_current_ui

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

diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index d7cf38f8be0a9c801643f978931408901a17e493..ca4d66863e2df34d73e15ae06abfb8aed7a60bc4 100644 (file)
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -4700,9 +4700,11 @@ ppc_process_record_op31 (struct gdbarch *gdbarch, struct regcache *regcache,
 
     case 397:          /* Store VSX Vector with Length */
     case 429:          /* Store VSX Vector Left-justified with Length */
+      ra = 0;
       if (PPC_RA (insn) != 0)
        regcache_raw_read_unsigned (regcache,
-                                   tdep->ppc_gp0_regnum + PPC_RA (insn), &ea);
+                                   tdep->ppc_gp0_regnum + PPC_RA (insn), &ra);
+      ea = ra;
       regcache_raw_read_unsigned (regcache,
                                  tdep->ppc_gp0_regnum + PPC_RB (insn), &rb);
       /* Store up to 16 bytes.  */
@@ -4713,9 +4715,11 @@ ppc_process_record_op31 (struct gdbarch *gdbarch, struct regcache *regcache,
 
     case 710:          /* Store Word Atomic */
     case 742:          /* Store Doubleword Atomic */
+      ra = 0;
       if (PPC_RA (insn) != 0)
        regcache_raw_read_unsigned (regcache,
-                                   tdep->ppc_gp0_regnum + PPC_RA (insn), &ea);
+                                   tdep->ppc_gp0_regnum + PPC_RA (insn), &ra);
+      ea = ra;
       switch (ext)
        {
        case 710:       /* Store Word Atomic */
@@ -5399,6 +5403,7 @@ ppc_process_record_op63 (struct gdbarch *gdbarch, struct regcache *regcache,
                                     tdep->ppc_fp0_regnum + PPC_FRT (insn));
       if (PPC_RC (insn))
        record_full_arch_list_add_reg (regcache, tdep->ppc_cr_regnum);
+      return 0;
     }
 
   switch (ext & 0xff)
@@ -5462,7 +5467,7 @@ ppc_process_record_op63 (struct gdbarch *gdbarch, struct regcache *regcache,
       if (PPC_RC (insn))
        record_full_arch_list_add_reg (regcache, tdep->ppc_cr_regnum);
       record_full_arch_list_add_reg (regcache, tdep->ppc_fpscr_regnum);
-      break;
+      return 0;
 
     case 354:          /* DFP Extract Biased Exponent Quad */
       record_full_arch_list_add_reg (regcache,
@@ -5541,7 +5546,7 @@ ppc_process_record_op63 (struct gdbarch *gdbarch, struct regcache *regcache,
       if (PPC_RC (insn))
        record_full_arch_list_add_reg (regcache, tdep->ppc_cr_regnum);
       record_full_arch_list_add_reg (regcache, tdep->ppc_fpscr_regnum);
-      break;
+      return 0;
 
     case 0:            /* Floating Compare Unordered */
     case 32:           /* Floating Compare Ordered */