Use ui_file_as_string in gdbarch.sh/gdbarch.c

[deliverable/binutils-gdb.git] / gdb / ax-general.c

diff --git a/gdb/ax-general.c b/gdb/ax-general.c
index 30f90e897120d1d4a6c9818ddca8e2bd5046d342..7f27a458a98089713b48605e289e49b75b0140c1 100644 (file)
--- a/gdb/ax-general.c
+++ b/gdb/ax-general.c
@@ -308,6 +308,9 @@ ax_reg (struct agent_expr *x, int reg)
     }
   else
     {
+      /* Get the remote register number.  */
+      reg = gdbarch_remote_register_number (x->gdbarch, reg);
+
       /* Make sure the register number is in range.  */
       if (reg < 0 || reg > 0xffff)
         error (_("GDB bug: ax-general.c (ax_reg): "
@@ -456,7 +459,11 @@ ax_reg_mask (struct agent_expr *ax, int reg)
     }
   else
     {
-      int byte = reg / 8;
+      int byte;
+
+      /* Get the remote register number.  */
+      reg = gdbarch_remote_register_number (ax->gdbarch, reg);
+      byte = reg / 8;
 
       /* Grow the bit mask if necessary.  */
       if (byte >= ax->reg_mask_len)