diff options
author | Luis Machado <luis.machado@linaro.org> | 2021-01-14 15:43:28 -0300 |
---|---|---|
committer | Luis Machado <luis.machado@linaro.org> | 2021-01-19 14:43:34 -0300 |
commit | a9a87d3525c2c32c92f0bcfc450ef005fa1f2863 (patch) | |
tree | 96edb8ea0e7363200182efc5683c30a86408268b /gdb/trad-frame.c | |
parent | bdec2917b1e94c7198ba39919f45060067952f43 (diff) | |
download | gdb-a9a87d3525c2c32c92f0bcfc450ef005fa1f2863.zip gdb-a9a87d3525c2c32c92f0bcfc450ef005fa1f2863.tar.gz gdb-a9a87d3525c2c32c92f0bcfc450ef005fa1f2863.tar.bz2 |
trad-frame cleanups
With the new member functions for struct trad_frame_saved_reg, there is no
need to invoke some of the set/get functions anymore. This patch removes
those and adjusts all callers.
Even though the most natural initial state of a saved register value is
UNKNOWN, there are target backends relying on the previous initial state
of REALREG set to a register's own number. I noticed this in at least a
couple targets: aarch64 and riscv.
Because of that, I decided to keep the reset function that sets the set of
register values to REALREG. I can't exercise all the targets to make sure
the initial state change won't break things, hence why it is risky to change
the default.
Validated with --enable-targets=all on aarch64-linux Ubuntu 18.04/20.04.
gdb/ChangeLog
2021-01-19 Luis Machado <luis.machado@linaro.org>
* trad-frame.h (trad_frame_saved_reg) <set_value_bytes>: Allocate
memory and save data.
(trad_frame_set_value, trad_frame_set_realreg, trad_frame_set_addr)
(trad_frame_set_unknown, trad_frame_set_value_bytes)
(trad_frame_value_p, trad_frame_addr_p, trad_frame_realreg_p)
(trad_frame_value_bytes_p): Remove.
(trad_frame_reset_saved_regs): Adjust documentation.
* trad-frame.c (trad_frame_alloc_saved_regs): Initialize via a
constructor and reset the state of the registers.
(trad_frame_value_p, trad_frame_addr_p, trad_frame_realreg_p)
(trad_frame_value_bytes_p, trad_frame_set_value)
(trad_frame_set_realreg, trad_frame_set_addr)
(trad_frame_set_unknown, trad_frame_set_value_bytes): Remove.
(trad_frame_set_reg_realreg): Update to call member function.
(trad_frame_set_reg_addr, trad_frame_set_reg_value_bytes): Likewise.
(trad_frame_get_prev_register): Likewise.
* aarch64-tdep.c (aarch64_analyze_prologue)
(aarch64_analyze_prologue_test, aarch64_make_prologue_cache_1)
(aarch64_prologue_prev_register): Update to use member functions.
* alpha-mdebug-tdep.c (alpha_mdebug_frame_unwind_cache): Likewise.
* alpha-tdep.c (alpha_heuristic_frame_unwind_cache): Likewise.
* arc-tdep.c (arc_print_frame_cache, arc_make_frame_cache): Likewise.
* arm-tdep.c (arm_make_prologue_cache, arm_exidx_fill_cache)
(arm_make_epilogue_frame_cache): Likewise.
* avr-tdep.c (avr_frame_unwind_cache)
(avr_frame_prev_register): Likewise.
* cris-tdep.c (cris_scan_prologue): Likewise.
* csky-tdep.c (csky_frame_unwind_cache): Likewise.
* frv-tdep.c (frv_analyze_prologue): Likewise.
* hppa-tdep.c (hppa_frame_cache, hppa_fallback_frame_cache): Likewise.
* lm32-tdep.c (lm32_frame_cache): Likewise.
* m32r-tdep.c (m32r_frame_unwind_cache): Likewise.
* m68hc11-tdep.c (m68hc11_frame_unwind_cache): Likewise.
* mips-tdep.c (set_reg_offset, mips_insn16_frame_cache)
(mips_micro_frame_cache, mips_insn32_frame_cache): Likewise.
(reset_saved_regs): Adjust to set realreg.
* riscv-tdep.c (riscv_scan_prologue, riscv_frame_cache): Adjust to
call member functions.
* rs6000-tdep.c (rs6000_frame_cache, rs6000_epilogue_frame_cache)
* s390-tdep.c (s390_prologue_frame_unwind_cache)
(s390_backchain_frame_unwind_cache): Likewise.
* score-tdep.c (score7_analyze_prologue)
(score3_analyze_prologue, score_make_prologue_cache): Likewise.
* sparc-netbsd-tdep.c (sparc32nbsd_sigcontext_saved_regs): Likewise.
* sparc-sol2-tdep.c (sparc32_sol2_sigtramp_frame_cache): Likewise.
* sparc64-netbsd-tdep.c (sparc64nbsd_sigcontext_saved_regs): Likewise.
* sparc64-sol2-tdep.c (sparc64_sol2_sigtramp_frame_cache): Likewise.
* tilegx-tdep.c (tilegx_analyze_prologue)
(tilegx_frame_cache): Likewise.
* v850-tdep.c (v850_frame_cache): Likewise.
* vax-tdep.c (vax_frame_cache): Likewise.
Diffstat (limited to 'gdb/trad-frame.c')
-rw-r--r-- | gdb/trad-frame.c | 93 |
1 files changed, 12 insertions, 81 deletions
diff --git a/gdb/trad-frame.c b/gdb/trad-frame.c index 53bd097..d5ad0b9 100644 --- a/gdb/trad-frame.c +++ b/gdb/trad-frame.c @@ -69,7 +69,11 @@ trad_frame_alloc_saved_regs (struct gdbarch *gdbarch) trad_frame_saved_reg *this_saved_regs = FRAME_OBSTACK_CALLOC (numregs, trad_frame_saved_reg); + /* For backwards compatibility, initialize all the register values to + REALREG, with register 0 stored in 0, register 1 stored in 1 and so + on. */ trad_frame_reset_saved_regs (gdbarch, this_saved_regs); + return this_saved_regs; } @@ -86,80 +90,27 @@ trad_frame_alloc_saved_regs (struct frame_info *this_frame) return trad_frame_alloc_saved_regs (gdbarch); } -int -trad_frame_value_p (trad_frame_saved_reg this_saved_regs[], int regnum) -{ - return this_saved_regs[regnum].is_value (); -} - -int -trad_frame_addr_p (trad_frame_saved_reg this_saved_regs[], int regnum) -{ - return this_saved_regs[regnum].is_addr (); -} - -int -trad_frame_realreg_p (trad_frame_saved_reg this_saved_regs[], - int regnum) -{ - return this_saved_regs[regnum].is_realreg (); -} - -/* See trad-frame.h. */ - -bool -trad_frame_value_bytes_p (trad_frame_saved_reg this_saved_regs[], - int regnum) -{ - return this_saved_regs[regnum].is_value_bytes (); -} - -void -trad_frame_set_value (trad_frame_saved_reg this_saved_regs[], - int regnum, LONGEST val) -{ - this_saved_regs[regnum].set_value (val); -} - -/* See trad-frame.h. */ - -void -trad_frame_set_realreg (trad_frame_saved_reg this_saved_regs[], - int regnum, int realreg) -{ - this_saved_regs[regnum].set_realreg (realreg); -} - -/* See trad-frame.h. */ - -void -trad_frame_set_addr (trad_frame_saved_reg this_saved_regs[], - int regnum, CORE_ADDR addr) -{ - this_saved_regs[regnum].set_addr (addr); -} - void trad_frame_set_reg_value (struct trad_frame_cache *this_trad_cache, int regnum, LONGEST val) { /* External interface for users of trad_frame_cache (who cannot access the prev_regs object directly). */ - trad_frame_set_value (this_trad_cache->prev_regs, regnum, val); + this_trad_cache->prev_regs[regnum].set_value (val); } void trad_frame_set_reg_realreg (struct trad_frame_cache *this_trad_cache, int regnum, int realreg) { - trad_frame_set_realreg (this_trad_cache->prev_regs, regnum, realreg); + this_trad_cache->prev_regs[regnum].set_realreg (realreg); } void trad_frame_set_reg_addr (struct trad_frame_cache *this_trad_cache, int regnum, CORE_ADDR addr) { - trad_frame_set_addr (this_trad_cache->prev_regs, regnum, addr); + this_trad_cache->prev_regs[regnum].set_addr (addr); } void @@ -218,26 +169,6 @@ trad_frame_set_reg_regmap (struct trad_frame_cache *this_trad_cache, } } -void -trad_frame_set_unknown (trad_frame_saved_reg this_saved_regs[], - int regnum) -{ - this_saved_regs[regnum].set_unknown (); -} - -/* See trad-frame.h. */ - -void -trad_frame_set_value_bytes (trad_frame_saved_reg this_saved_regs[], - int regnum, - gdb::array_view<const gdb_byte> bytes) -{ - /* Allocate the space and copy the data bytes. */ - gdb_byte *data = FRAME_OBSTACK_CALLOC (bytes.size (), gdb_byte); - memcpy (data, bytes.data (), bytes.size ()); - this_saved_regs[regnum].set_value_bytes (data); -} - /* See trad-frame.h. */ void @@ -247,7 +178,7 @@ trad_frame_set_reg_value_bytes (struct trad_frame_cache *this_trad_cache, { /* External interface for users of trad_frame_cache (who cannot access the prev_regs object directly). */ - trad_frame_set_value_bytes (this_trad_cache->prev_regs, regnum, bytes); + this_trad_cache->prev_regs[regnum].set_value_bytes (bytes); } @@ -257,18 +188,18 @@ trad_frame_get_prev_register (struct frame_info *this_frame, trad_frame_saved_reg this_saved_regs[], int regnum) { - if (trad_frame_addr_p (this_saved_regs, regnum)) + if (this_saved_regs[regnum].is_addr ()) /* The register was saved in memory. */ return frame_unwind_got_memory (this_frame, regnum, this_saved_regs[regnum].addr ()); - else if (trad_frame_realreg_p (this_saved_regs, regnum)) + else if (this_saved_regs[regnum].is_realreg ()) return frame_unwind_got_register (this_frame, regnum, this_saved_regs[regnum].realreg ()); - else if (trad_frame_value_p (this_saved_regs, regnum)) + else if (this_saved_regs[regnum].is_value ()) /* The register's value is available. */ return frame_unwind_got_constant (this_frame, regnum, this_saved_regs[regnum].value ()); - else if (trad_frame_value_bytes_p (this_saved_regs, regnum)) + else if (this_saved_regs[regnum].is_value_bytes ()) /* The register's value is available as a sequence of bytes. */ return frame_unwind_got_bytes (this_frame, regnum, this_saved_regs[regnum].value_bytes ()); |