From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1585) id 523DB385700D; Wed, 18 May 2022 10:25:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 523DB385700D Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Luis Machado To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Rename PAUTH_RA_STATE to RA_SIGN_STATE X-Act-Checkin: binutils-gdb X-Git-Author: Luis Machado X-Git-Refname: refs/heads/master X-Git-Oldrev: a2ff75485c2db439923450dad90caa25615781ae X-Git-Newrev: c9cd8ca4652393e0b324f447dd1c64d0f2a83ef3 Message-Id: <20220518102518.523DB385700D@sourceware.org> Date: Wed, 18 May 2022 10:25:18 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2022 10:25:18 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dc9cd8ca46523= 93e0b324f447dd1c64d0f2a83ef3 commit c9cd8ca4652393e0b324f447dd1c64d0f2a83ef3 Author: Luis Machado Date: Fri May 6 15:25:59 2022 +0100 Rename PAUTH_RA_STATE to RA_SIGN_STATE =20 The aadwarf64 [1] names this register RA_SIGN_STATE, so update the code= to use the same name. =20 [1] https://github.com/ARM-software/abi-aa/blob/main/aadwarf64/aadwarf6= 4.rst Diff: --- gdb/aarch64-tdep.c | 32 ++++++++++++++++---------------- gdb/aarch64-tdep.h | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 9d06ebfe27c..d85c406069b 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -253,7 +253,7 @@ aarch64_frame_unmask_lr (aarch64_gdbarch_tdep *tdep, { if (tdep->has_pauth () && frame_unwind_register_unsigned (this_frame, - tdep->pauth_ra_state_regnum)) + tdep->ra_sign_state_regnum)) { int cmask_num =3D AARCH64_PAUTH_CMASK_REGNUM (tdep->pauth_reg_base); CORE_ADDR cmask =3D frame_unwind_register_unsigned (this_frame, cmas= k_num); @@ -529,7 +529,7 @@ aarch64_analyze_prologue (struct gdbarch *gdbarch, =20 if (tdep->has_pauth () && cache !=3D nullptr) { - int regnum =3D tdep->pauth_ra_state_regnum; + int regnum =3D tdep->ra_sign_state_regnum; cache->saved_regs[regnum].set_value (ra_state_val); } } @@ -869,7 +869,7 @@ aarch64_analyze_prologue_test (void) =20 if (tdep->has_pauth ()) { - int regnum =3D tdep->pauth_ra_state_regnum; + int regnum =3D tdep->ra_sign_state_regnum; SELF_CHECK (cache.saved_regs[regnum].is_value ()); } } @@ -1124,7 +1124,7 @@ aarch64_prologue_prev_register (struct frame_info *th= is_frame, lr =3D frame_unwind_register_unsigned (this_frame, AARCH64_LR_REGNUM= ); =20 if (tdep->has_pauth () - && cache->saved_regs[tdep->pauth_ra_state_regnum].is_value ()) + && cache->saved_regs[tdep->ra_sign_state_regnum].is_value ()) lr =3D aarch64_frame_unmask_lr (tdep, this_frame, lr); =20 return frame_unwind_got_constant (this_frame, prev_regnum, lr); @@ -1331,7 +1331,7 @@ aarch64_dwarf2_frame_init_reg (struct gdbarch *gdbarc= h, int regnum, /* Init pauth registers. */ if (tdep->has_pauth ()) { - if (regnum =3D=3D tdep->pauth_ra_state_regnum) + if (regnum =3D=3D tdep->ra_sign_state_regnum) { /* Initialize RA_STATE to zero. */ reg->how =3D DWARF2_FRAME_REG_SAVED_VAL_EXP; @@ -1364,10 +1364,10 @@ aarch64_execute_dwarf_cfa_vendor_op (struct gdbarch= *gdbarch, gdb_byte op, return true; =20 /* Allocate RA_STATE column if it's not allocated yet. */ - fs->regs.alloc_regs (AARCH64_DWARF_PAUTH_RA_STATE + 1); + fs->regs.alloc_regs (AARCH64_DWARF_RA_SIGN_STATE + 1); =20 /* Toggle the status of RA_STATE between 0 and 1. */ - ra_state =3D &(fs->regs.reg[AARCH64_DWARF_PAUTH_RA_STATE]); + ra_state =3D &(fs->regs.reg[AARCH64_DWARF_RA_SIGN_STATE]); ra_state->how =3D DWARF2_FRAME_REG_SAVED_VAL_EXP; =20 if (ra_state->loc.exp.start =3D=3D nullptr @@ -2239,8 +2239,8 @@ aarch64_dwarf_reg_to_regnum (struct gdbarch *gdbarch,= int reg) if (reg >=3D AARCH64_DWARF_PAUTH_DMASK && reg <=3D AARCH64_DWARF_PAU= TH_CMASK) return tdep->pauth_reg_base + reg - AARCH64_DWARF_PAUTH_DMASK; =20 - if (reg =3D=3D AARCH64_DWARF_PAUTH_RA_STATE) - return tdep->pauth_ra_state_regnum; + if (reg =3D=3D AARCH64_DWARF_RA_SIGN_STATE) + return tdep->ra_sign_state_regnum; } =20 return -1; @@ -2647,7 +2647,7 @@ aarch64_pseudo_register_name (struct gdbarch *gdbarch= , int regnum) /* RA_STATE is used for unwinding only. Do not assign it a name - this prevents it from being read by methods such as mi_cmd_trace_frame_collected. */ - if (tdep->has_pauth () && regnum =3D=3D tdep->pauth_ra_state_regnum) + if (tdep->has_pauth () && regnum =3D=3D tdep->ra_sign_state_regnum) return ""; =20 internal_error (__FILE__, __LINE__, @@ -2683,7 +2683,7 @@ aarch64_pseudo_register_type (struct gdbarch *gdbarch= , int regnum) && p_regnum < AARCH64_SVE_V0_REGNUM + AARCH64_V_REGS_NUM) return aarch64_vnv_type (gdbarch); =20 - if (tdep->has_pauth () && regnum =3D=3D tdep->pauth_ra_state_regnum) + if (tdep->has_pauth () && regnum =3D=3D tdep->ra_sign_state_regnum) return builtin_type (gdbarch)->builtin_uint64; =20 internal_error (__FILE__, __LINE__, @@ -2717,7 +2717,7 @@ aarch64_pseudo_register_reggroup_p (struct gdbarch *g= dbarch, int regnum, && p_regnum < AARCH64_SVE_V0_REGNUM + AARCH64_V_REGS_NUM) return group =3D=3D all_reggroup || group =3D=3D vector_reggroup; /* RA_STATE is used for unwinding only. Do not assign it to any groups.= */ - if (tdep->has_pauth () && regnum =3D=3D tdep->pauth_ra_state_regnum) + if (tdep->has_pauth () && regnum =3D=3D tdep->ra_sign_state_regnum) return 0; =20 return group =3D=3D all_reggroup; @@ -3417,7 +3417,7 @@ aarch64_gdbarch_init (struct gdbarch_info info, struc= t gdbarch_list *arches) const struct tdesc_feature *feature_pauth; bool valid_p =3D true; int i, num_regs =3D 0, num_pseudo_regs =3D 0; - int first_pauth_regnum =3D -1, pauth_ra_state_offset =3D -1; + int first_pauth_regnum =3D -1, ra_sign_state_offset =3D -1; int first_mte_regnum =3D -1, tls_regnum =3D -1; =20 /* Use the vector length passed via the target info. Here -1 is used fo= r no @@ -3531,7 +3531,7 @@ aarch64_gdbarch_init (struct gdbarch_info info, struc= t gdbarch_list *arches) if (feature_pauth !=3D NULL) { first_pauth_regnum =3D num_regs; - pauth_ra_state_offset =3D num_pseudo_regs; + ra_sign_state_offset =3D num_pseudo_regs; /* Validate the descriptor provides the mandatory PAUTH registers and allocate their numbers. */ for (i =3D 0; i < ARRAY_SIZE (aarch64_pauth_register_names); i++) @@ -3572,8 +3572,8 @@ aarch64_gdbarch_init (struct gdbarch_info info, struc= t gdbarch_list *arches) tdep->jb_elt_size =3D 8; tdep->vq =3D vq; tdep->pauth_reg_base =3D first_pauth_regnum; - tdep->pauth_ra_state_regnum =3D (feature_pauth =3D=3D NULL) ? -1 - : pauth_ra_state_offset + num_regs; + tdep->ra_sign_state_regnum =3D (feature_pauth =3D=3D NULL) ? -1 + : ra_sign_state_offset + num_regs; tdep->mte_reg_base =3D first_mte_regnum; tdep->tls_regnum =3D tls_regnum; =20 diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h index e4cdebb6311..9ca3aee1ed1 100644 --- a/gdb/aarch64-tdep.h +++ b/gdb/aarch64-tdep.h @@ -34,7 +34,7 @@ struct regset; /* AArch64 Dwarf register numbering. */ #define AARCH64_DWARF_X0 0 #define AARCH64_DWARF_SP 31 -#define AARCH64_DWARF_PAUTH_RA_STATE 34 +#define AARCH64_DWARF_RA_SIGN_STATE 34 #define AARCH64_DWARF_PAUTH_DMASK 35 #define AARCH64_DWARF_PAUTH_CMASK 36 #define AARCH64_DWARF_V0 64 @@ -95,7 +95,7 @@ struct aarch64_gdbarch_tdep : gdbarch_tdep } =20 int pauth_reg_base =3D 0; - int pauth_ra_state_regnum =3D 0; + int ra_sign_state_regnum =3D 0; =20 /* Returns true if the target supports pauth. */ bool has_pauth () const