[v3] gdb: xtensa: fix registers supply if they not present
Commit Message
When parsing a core file on hardware configurations without the
zero-overhead loop option (e.g. ESP32-S2 chip), GDB used to assert
while trying to call 'raw_supply' for lbeg, lend, lcount registers,
even though they were not set.
This was because:
regnum == -1 was used to indicate "supply all registers"
lbeg_regnum == -1 was used to indicate "lbeg register not present"
regnum == lbeg_regnum check was considered successful
---
gdb/xtensa-tdep.c | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
--
2.34.1
@@ -803,6 +803,18 @@ xtensa_register_reggroup_p (struct gdbarch *gdbarch,
}
+/* Check if register raw supplied
+ Note:
+ - check_regnum == -1 means register is not present.
+ - regnum == -1 means all present registers are supplied. */
+
+static inline bool
+is_reg_raw_supplied (int check_regnum, int regnum)
+{
+ return check_regnum > 0 && (regnum == check_regnum || regnum == -1);
+}
+
+
/* Supply register REGNUM from the buffer specified by GREGS and LEN
in the general-purpose register set REGSET to register cache
REGCACHE. If REGNUM is -1 do this for all registers in REGSET. */
@@ -825,22 +837,22 @@ xtensa_supply_gregset (const struct regset *regset,
rc->raw_supply (gdbarch_pc_regnum (gdbarch), (char *) ®s->pc);
if (regnum == gdbarch_ps_regnum (gdbarch) || regnum == -1)
rc->raw_supply (gdbarch_ps_regnum (gdbarch), (char *) ®s->ps);
- if (regnum == tdep->wb_regnum || regnum == -1)
+ if (is_reg_raw_supplied (tdep->wb_regnum, regnum))
rc->raw_supply (tdep->wb_regnum,
(char *) ®s->windowbase);
- if (regnum == tdep->ws_regnum || regnum == -1)
+ if (is_reg_raw_supplied (tdep->ws_regnum, regnum))
rc->raw_supply (tdep->ws_regnum,
(char *) ®s->windowstart);
- if (regnum == tdep->lbeg_regnum || regnum == -1)
+ if (is_reg_raw_supplied (tdep->lbeg_regnum, regnum))
rc->raw_supply (tdep->lbeg_regnum,
(char *) ®s->lbeg);
- if (regnum == tdep->lend_regnum || regnum == -1)
+ if (is_reg_raw_supplied (tdep->lend_regnum, regnum))
rc->raw_supply (tdep->lend_regnum,
(char *) ®s->lend);
- if (regnum == tdep->lcount_regnum || regnum == -1)
+ if (is_reg_raw_supplied (tdep->lcount_regnum, regnum))
rc->raw_supply (tdep->lcount_regnum,
(char *) ®s->lcount);
- if (regnum == tdep->sar_regnum || regnum == -1)
+ if (is_reg_raw_supplied (tdep->sar_regnum, regnum))
rc->raw_supply (tdep->sar_regnum,
(char *) ®s->sar);
if (regnum >=tdep->ar_base