Skip to content

Commit 2fa8e36

Browse files
committed
Refactor defines
1 parent 84f48ee commit 2fa8e36

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_arm64.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,7 @@ static lldb_private::RegisterInfo g_register_infos_mte[] = {
7979
DEFINE_EXTENSION_REG(mte_ctrl)};
8080

8181
static lldb_private::RegisterInfo g_register_infos_tls[] = {
82-
{"tpidr",
83-
nullptr,
84-
8,
85-
0,
86-
lldb::eEncodingUint,
87-
lldb::eFormatHex,
88-
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_REGNUM_GENERIC_TP},
89-
nullptr,
90-
nullptr,
91-
nullptr},
82+
DEFINE_EXTENSION_REG_GENERIC(tpidr, LLDB_REGNUM_GENERIC_TP),
9283
// Only present when SME is present
9384
DEFINE_EXTENSION_REG(tpidr2)};
9485

lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,9 @@ static uint32_t g_d31_invalidates[] = {fpu_v31, fpu_s31, LLDB_INVALID_REGNUM};
470470
LLDB_INVALID_REGNUM, lldb_kind \
471471
}
472472

473+
#define GENERIC_KIND(genenric_kind) \
474+
{LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, genenric_kind, \
475+
LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM}
473476
// Generates register kinds array for registers with only lldb kind
474477
#define KIND_ALL_INVALID \
475478
{ \
@@ -540,6 +543,13 @@ static uint32_t g_d31_invalidates[] = {fpu_v31, fpu_s31, LLDB_INVALID_REGNUM};
540543
#reg, nullptr, 8, 0, lldb::eEncodingUint, lldb::eFormatHex, \
541544
KIND_ALL_INVALID, nullptr, nullptr, nullptr, \
542545
}
546+
547+
// Used to define tpidr as a generic tp register
548+
#define DEFINE_EXTENSION_REG_GENERIC(reg, generic_kind) \
549+
{ \
550+
#reg, nullptr, 8, 0, lldb::eEncodingUint, lldb::eFormatHex, \
551+
GENERIC_KIND(generic_kind), nullptr, nullptr, nullptr, \
552+
}
543553

544554
static lldb_private::RegisterInfo g_register_infos_arm64_le[] = {
545555
// DEFINE_GPR64(name, GENERIC KIND)

0 commit comments

Comments
 (0)