From 1eb7c2d886c0faac42d2b68862b0e6b0d3182d98 Mon Sep 17 00:00:00 2001 From: Antoine Tremblay Date: Wed, 24 Feb 2016 15:00:17 -0500 Subject: [PATCH] Map registers to remote numbers when encoding an ax_reg or ax_reg_mask operation When encoding the agent expression operation ax_reg or ax_reg_mask, the register number used is internal to GDB. However GDBServer expects a tdesc based number. This usually does not cause a problem since at the moment, for raw registers GDBServer R trace action ignores the register mask and just collects all registers. It can be a problem, however with pseudo registers on some platforms if the tdesc number doesn't match the GDB internal register number. This is the case with ARM, the upcoming ARM tracepoint support, fails these test cases without this patch: gdb.trace/collection.exp: collect register locals collectively:* GDBSever would exit with: unhandled register size Since the register number is not mapped. This patch fixes these issues by calling gdbarch_remote_register_number before encoding the register number in the ax_reg or ax_reg_mask operation. Tested on x86 native-gdbserver no regressions observed. gdb/ChangeLog: * ax-general.c (ax_reg): Call gdbarch_remote_register_number. (ax_reg_mask): Likewise. --- gdb/ChangeLog | 5 +++++ gdb/ax-general.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0d6ea60bf72..dc123996c54 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-02-25 Antoine Tremblay + + * ax-general.c (ax_reg): Call gdbarch_remote_register_number. + (ax_reg_mask): Likewise. + 2016-02-24 Pedro Alves * linux-nat.c (save_sigtrap) Delete. diff --git a/gdb/ax-general.c b/gdb/ax-general.c index 30f90e89712..7f27a458a98 100644 --- 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) -- 2.30.2