"c0", "c1", "c2", "c3", "c4", "c5", "c6", "c7",
"c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15",
"c16", "c17", "c18", "c19", "c20", "c21", "c22", "c23",
- "c24", "c25", "c26", "c27", "c28", "c29", "c30", "pcc",
- "csp", "ddc", "ctpidr", "rcsp", "rddc", "rctpidr", "cid",
+ "c24", "c25", "c26", "c27", "c28", "c29", "c30", "csp",
+ "pcc", "ddc", "ctpidr", "rcsp", "rddc", "rctpidr", "cid",
"tag_map", "cctlr"
};
if (gdbarch_tdep (gdbarch)->has_capability ())
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
- int pcc_regnum = tdep->cap_reg_base + 31;
- int csp_regnum = tdep->cap_reg_base + 32;
/* Also save the C registers. */
for (i = 0; i < AARCH64_X_REGISTER_COUNT; i++)
debug_printf ("aarch64: %s Register C%d found at offset %s\n",
__func__, i, core_addr_to_string_nz (offset));
- /* FIXME-Morello: We should really invert CSP/PCC to make them
- match the order of the X registers. Then we wouldn't need
- this conditional block. */
- if (i == AARCH64_SP_REGNUM)
- cache->saved_regs[csp_regnum].addr = offset;
- else if (i == AARCH64_PC_REGNUM)
- cache->saved_regs[pcc_regnum].addr = offset;
- else
- cache->saved_regs[tdep->cap_reg_base + i].addr = offset;
+ cache->saved_regs[tdep->cap_reg_base + i].addr = offset;
}
}
}
struct gdbarch_tdep *tdep = gdbarch_tdep (get_frame_arch (this_frame));
- int pcc_regnum = -1;
- if (tdep->has_capability ())
- pcc_regnum = tdep->cap_reg_base + 31;
-
/* If we are asked to unwind the PC, then we need to return the LR
instead. The prologue may save PC, but it will point into this
frame's prologue, not the next frame's resume location.
We do the same for PCC and CLR. */
- if (prev_regnum == AARCH64_PC_REGNUM || prev_regnum == pcc_regnum)
+ if (prev_regnum == AARCH64_PC_REGNUM || prev_regnum == tdep->cap_reg_pcc)
{
CORE_ADDR lr;
struct gdbarch *gdbarch = get_frame_arch (this_frame);
if (prev_regnum == AARCH64_PC_REGNUM)
lr_regnum = AARCH64_LR_REGNUM;
else
- lr_regnum = tdep->cap_reg_base + 30;
+ lr_regnum = tdep->cap_reg_clr;
struct value *lr_value = frame_unwind_register_value (this_frame,
lr_regnum);
= frame_unwind_got_constant (this_frame, prev_regnum, lr);
/* Copy the capability tag over, if it exists. */
- if (prev_regnum == pcc_regnum && value_tagged (lr_value))
+ if (prev_regnum == tdep->cap_reg_pcc && value_tagged (lr_value))
{
set_value_tagged (lr_value_adjusted, 1);
set_value_tag (lr_value_adjusted, value_tag (lr_value));
| |
| |<- SP
+----------+ */
- int csp_regnum = -1;
- if (tdep->has_capability ())
- csp_regnum = tdep->cap_reg_base + 32;
- if (prev_regnum == AARCH64_SP_REGNUM || prev_regnum == csp_regnum)
+ if (prev_regnum == AARCH64_SP_REGNUM || prev_regnum == tdep->cap_reg_csp)
return frame_unwind_got_constant (this_frame, prev_regnum,
cache->prev_sp);
{
struct gdbarch *gdbarch = get_frame_arch (this_frame);
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
- CORE_ADDR lr;
- int pcc_regnum = -1;
- if (tdep->has_capability ())
- pcc_regnum = tdep->cap_reg_base + 31;
-
- if (regnum == AARCH64_PC_REGNUM || regnum == pcc_regnum)
+ if (regnum == AARCH64_PC_REGNUM || regnum == tdep->cap_reg_pcc)
{
- lr = frame_unwind_register_unsigned (this_frame, AARCH64_LR_REGNUM);
+ /* Fetch LR or CLR depending on the ABI. */
+ int lr_regnum;
+ if (regnum == AARCH64_PC_REGNUM)
+ lr_regnum = AARCH64_LR_REGNUM;
+ else
+ lr_regnum = tdep->cap_reg_clr;
+
+ struct value *lr_value = frame_unwind_register_value (this_frame,
+ lr_regnum);
+
+ /* Extract only the bottom 8 bytes of CLR. This truncates the capability
+ to 8 bytes. For LR, this gets us the whole register. */
+ CORE_ADDR lr = extract_unsigned_integer (value_contents_all (lr_value), 8,
+ gdbarch_byte_order (gdbarch));
+
lr = aarch64_frame_unmask_lr (tdep, this_frame, lr);
lr = gdbarch_addr_bits_remove (gdbarch, lr);
- return frame_unwind_got_constant (this_frame, regnum, lr);
+
+ struct value *lr_value_adjusted
+ = frame_unwind_got_constant (this_frame, regnum, lr);
+
+ /* Copy the capability tag over, if it exists. */
+ if (regnum == tdep->cap_reg_pcc && value_tagged (lr_value))
+ {
+ set_value_tagged (lr_value_adjusted, 1);
+ set_value_tag (lr_value_adjusted, value_tag (lr_value));
+ }
+
+ return lr_value_adjusted;
}
internal_error (__FILE__, __LINE__, _("Unexpected register %d"), regnum);
struct frame_info *this_frame)
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
- int pcc_regnum = -1;
- int csp_regnum = -1;
-
- if (tdep->has_capability ())
- {
- pcc_regnum = tdep->cap_reg_base + 31;
- csp_regnum = tdep->cap_reg_base + 32;
- }
- if (regnum == AARCH64_PC_REGNUM || regnum == pcc_regnum)
+ if (regnum == AARCH64_PC_REGNUM || regnum == tdep->cap_reg_pcc)
{
reg->how = DWARF2_FRAME_REG_FN;
reg->loc.fn = aarch64_dwarf2_prev_register;
return;
}
- if (regnum == AARCH64_SP_REGNUM || regnum == csp_regnum)
+ if (regnum == AARCH64_SP_REGNUM || regnum == tdep->cap_reg_csp)
{
reg->how = DWARF2_FRAME_REG_CFA;
return;
return tdep->cap_reg_base + (reg - AARCH64_DWARF_C0);
if (reg == AARCH64_DWARF_CSP)
- return tdep->cap_reg_base + 32;
+ return tdep->cap_reg_csp;
}
return -1;
tdep->pauth_ra_state_regnum = (feature_pauth == NULL) ? -1
: pauth_ra_state_offset + num_regs;
+ /* Initialize the capability register numbers. */
tdep->cap_reg_base = first_cap_regnum;
tdep->cap_reg_last = last_cap_regnum;
+ tdep->cap_reg_clr = (first_cap_regnum == -1)? -1 : first_cap_regnum + 30;
+ tdep->cap_reg_csp = (first_cap_regnum == -1)? -1 : first_cap_regnum + 31;
+ tdep->cap_reg_pcc = (first_cap_regnum == -1)? -1 : first_cap_regnum + 32;
+ tdep->cap_reg_rcsp = (first_cap_regnum == -1)? -1 : first_cap_regnum + 35;
set_gdbarch_push_dummy_call (gdbarch, aarch64_push_dummy_call);
set_gdbarch_frame_align (gdbarch, aarch64_frame_align);
tdesc_create_reg (feature, "c28", regnum++, 1, "general", 128, "uintcap");
tdesc_create_reg (feature, "c29", regnum++, 1, "general", 128, "uintcap");
tdesc_create_reg (feature, "c30", regnum++, 1, "general", 128, "uintcap");
- tdesc_create_reg (feature, "pcc", regnum++, 1, "general", 128, "uintcap");
tdesc_create_reg (feature, "csp", regnum++, 1, "general", 128, "uintcap");
+ tdesc_create_reg (feature, "pcc", regnum++, 1, "general", 128, "uintcap");
tdesc_create_reg (feature, "ddc", regnum++, 1, "system", 128, "uintcap");
tdesc_create_reg (feature, "ctpidr", regnum++, 1, "system", 128, "uintcap");
tdesc_create_reg (feature, "rcsp", regnum++, 1, "system", 128, "uintcap");
projects / thirdparty / binutils-gdb.git / commitdiff
