Skip to content

Commit

Permalink
[LLDB][RISCV] Allow accessing registers through ABI names
Browse files Browse the repository at this point in the history 
This patch uses RISCV ABI register name as `alt_name` in `RegisterInfo` in `lldb-private-types.h`

Reviewed By: DavidSpickett

Differential Revision: https://reviews.llvm.org/D137508
  • Loading branch information
@SEmmmer
SEmmmer committed Nov 17, 2022
1 parent ec78295 commit 4113e98
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 30 deletions.
58 changes: 29 additions & 29 deletions lldb/source/Plugins/Process/Utility/RegisterInfos_riscv64.h
View file
Expand Up @@ -67,36 +67,36 @@ static lldb_private::RegisterInfo g_register_infos_riscv64_le[] = {
DEFINE_GPR64(pc, LLDB_REGNUM_GENERIC_PC),
DEFINE_GPR64_ALT(ra, x1, LLDB_REGNUM_GENERIC_RA),
DEFINE_GPR64_ALT(sp, x2, LLDB_REGNUM_GENERIC_SP),
DEFINE_GPR64(x3, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x4, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x5, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x6, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x7, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(gp, x3, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(tp, x4, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(t0, x5, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(t1, x6, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(t2, x7, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(fp, x8, LLDB_REGNUM_GENERIC_FP),
DEFINE_GPR64(x9, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x10, LLDB_REGNUM_GENERIC_ARG1),
DEFINE_GPR64(x11, LLDB_REGNUM_GENERIC_ARG2),
DEFINE_GPR64(x12, LLDB_REGNUM_GENERIC_ARG3),
DEFINE_GPR64(x13, LLDB_REGNUM_GENERIC_ARG4),
DEFINE_GPR64(x14, LLDB_REGNUM_GENERIC_ARG5),
DEFINE_GPR64(x15, LLDB_REGNUM_GENERIC_ARG6),
DEFINE_GPR64(x16, LLDB_REGNUM_GENERIC_ARG7),
DEFINE_GPR64(x17, LLDB_REGNUM_GENERIC_ARG8),
DEFINE_GPR64(x18, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x19, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x20, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x21, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x22, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x23, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x24, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x25, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x26, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x27, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x28, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x29, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x30, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x31, LLDB_INVALID_REGNUM),
DEFINE_GPR64(x0, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(s1, x9, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(a0, x10, LLDB_REGNUM_GENERIC_ARG1),
DEFINE_GPR64_ALT(a1, x11, LLDB_REGNUM_GENERIC_ARG2),
DEFINE_GPR64_ALT(a2, x12, LLDB_REGNUM_GENERIC_ARG3),
DEFINE_GPR64_ALT(a3, x13, LLDB_REGNUM_GENERIC_ARG4),
DEFINE_GPR64_ALT(a4, x14, LLDB_REGNUM_GENERIC_ARG5),
DEFINE_GPR64_ALT(a5, x15, LLDB_REGNUM_GENERIC_ARG6),
DEFINE_GPR64_ALT(a6, x16, LLDB_REGNUM_GENERIC_ARG7),
DEFINE_GPR64_ALT(a7, x17, LLDB_REGNUM_GENERIC_ARG8),
DEFINE_GPR64_ALT(s2, x18, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(s3, x19, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(s4, x20, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(s5, x21, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(s6, x22, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(s7, x23, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(s8, x24, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(s9, x25, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(s10, x26, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(s11, x27, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(t3, x28, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(t4, x29, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(t5, x30, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(t6, x31, LLDB_INVALID_REGNUM),
DEFINE_GPR64_ALT(zero, x0, LLDB_INVALID_REGNUM),

DEFINE_FPR64(f0, LLDB_INVALID_REGNUM),
DEFINE_FPR64(f1, LLDB_INVALID_REGNUM),
Expand Down
29 changes: 29 additions & 0 deletions lldb/source/Plugins/Process/Utility/lldb-riscv-register-enums.h
View file
Expand Up @@ -50,9 +50,38 @@ enum {
gpr_x31_riscv,
gpr_x0_riscv,
gpr_last_riscv = gpr_x0_riscv,
gpr_zero_riscv = gpr_x0_riscv,
gpr_ra_riscv = gpr_x1_riscv,
gpr_sp_riscv = gpr_x2_riscv,
gpr_gp_riscv = gpr_x3_riscv,
gpr_tp_riscv = gpr_x4_riscv,
gpr_t0_riscv = gpr_x5_riscv,
gpr_t1_riscv = gpr_x6_riscv,
gpr_t2_riscv = gpr_x7_riscv,
gpr_fp_riscv = gpr_x8_riscv,
gpr_s1_riscv = gpr_x9_riscv,
gpr_a0_riscv = gpr_x10_riscv,
gpr_a1_riscv = gpr_x11_riscv,
gpr_a2_riscv = gpr_x12_riscv,
gpr_a3_riscv = gpr_x13_riscv,
gpr_a4_riscv = gpr_x14_riscv,
gpr_a5_riscv = gpr_x15_riscv,
gpr_a6_riscv = gpr_x16_riscv,
gpr_a7_riscv = gpr_x17_riscv,
gpr_s2_riscv = gpr_x18_riscv,
gpr_s3_riscv = gpr_x19_riscv,
gpr_s4_riscv = gpr_x20_riscv,
gpr_s5_riscv = gpr_x21_riscv,
gpr_s6_riscv = gpr_x22_riscv,
gpr_s7_riscv = gpr_x23_riscv,
gpr_s8_riscv = gpr_x24_riscv,
gpr_s9_riscv = gpr_x25_riscv,
gpr_s10_riscv = gpr_x26_riscv,
gpr_s11_riscv = gpr_x27_riscv,
gpr_t3_riscv = gpr_x28_riscv,
gpr_t4_riscv = gpr_x29_riscv,
gpr_t5_riscv = gpr_x30_riscv,
gpr_t6_riscv = gpr_x31_riscv,

fpr_first_riscv = 33,
fpr_f0_riscv = fpr_first_riscv,
Expand Down
31 changes: 30 additions & 1 deletion lldb/source/Utility/RISCV_DWARF_Registers.h
View file
Expand Up @@ -118,10 +118,39 @@ enum {
dwarf_first_csr = 4096,
dwarf_last_csr = 8191,

// register name alias
// register ABI name
dwarf_gpr_zero = dwarf_gpr_x0,
dwarf_gpr_ra = dwarf_gpr_x1,
dwarf_gpr_sp = dwarf_gpr_x2,
dwarf_gpr_gp = dwarf_gpr_x3,
dwarf_gpr_tp = dwarf_gpr_x4,
dwarf_gpr_t0 = dwarf_gpr_x5,
dwarf_gpr_t1 = dwarf_gpr_x6,
dwarf_gpr_t2 = dwarf_gpr_x7,
dwarf_gpr_fp = dwarf_gpr_x8,
dwarf_gpr_s1 = dwarf_gpr_x9,
dwarf_gpr_a0 = dwarf_gpr_x10,
dwarf_gpr_a1 = dwarf_gpr_x11,
dwarf_gpr_a2 = dwarf_gpr_x12,
dwarf_gpr_a3 = dwarf_gpr_x13,
dwarf_gpr_a4 = dwarf_gpr_x14,
dwarf_gpr_a5 = dwarf_gpr_x15,
dwarf_gpr_a6 = dwarf_gpr_x16,
dwarf_gpr_a7 = dwarf_gpr_x17,
dwarf_gpr_s2 = dwarf_gpr_x18,
dwarf_gpr_s3 = dwarf_gpr_x19,
dwarf_gpr_s4 = dwarf_gpr_x20,
dwarf_gpr_s5 = dwarf_gpr_x21,
dwarf_gpr_s6 = dwarf_gpr_x22,
dwarf_gpr_s7 = dwarf_gpr_x23,
dwarf_gpr_s8 = dwarf_gpr_x24,
dwarf_gpr_s9 = dwarf_gpr_x25,
dwarf_gpr_s10 = dwarf_gpr_x26,
dwarf_gpr_s11 = dwarf_gpr_x27,
dwarf_gpr_t3 = dwarf_gpr_x28,
dwarf_gpr_t4 = dwarf_gpr_x29,
dwarf_gpr_t5 = dwarf_gpr_x30,
dwarf_gpr_t6 = dwarf_gpr_x31,

// mock pc regnum
dwarf_gpr_pc = 11451,
Expand Down

0 comments on commit 4113e98

Please sign in to comment.