This is an archive of the discontinued LLVM Phabricator instance.

Differential D108548

[lldb] Support "eflags" register name in generic reg fallback
ClosedPublic

Authored by mgorny on Aug 23 2021, 5:22 AM.

Details

Reviewers
labath
krytarowski
jasonmolenda
JDevlieghere
emaste
Commits
rGc01b76e733d6: [lldb] Support "eflags" register name in generic reg fallback
Summary

Enhance the generic register fallback code to support "eflags" register
name in addition to "rflags", as the former is used by gdbserver. This
permits lldb-server to recognize the generic flags register when
interfacing with gdbserver-style target.xml (i.e. without generic=""
attributes), and therefore aligns ABI plugins' AugmentRegisterInfo()
between lldb-server and gdbserver.

Diff Detail

Event Timeline

mgorny requested review of this revision.Aug 23 2021, 5:22 AM
mgorny created this revision.
Harbormaster completed remote builds in B120766: Diff 368072.Aug 23 2021, 5:45 AM
labath accepted this revision.Sep 7 2021, 6:06 AM

seems reasonable

This revision is now accepted and ready to land.Sep 7 2021, 6:06 AM
This revision was landed with ongoing or failed builds.Sep 8 2021, 2:33 AM
Closed by commit rGc01b76e733d6: [lldb] Support "eflags" register name in generic reg fallback (authored by mgorny). · Explain Why
This revision was automatically updated to reflect the committed changes.
mgorny added a commit: rGc01b76e733d6: [lldb] Support "eflags" register name in generic reg fallback.
Herald added a project: Restricted Project. · View Herald TranscriptSep 8 2021, 2:33 AM

Revision Contents

PathSize
lldb/
source/
Plugins/
ABI/
X86/
2 lines
2 lines
Process/
Utility/
1 line

Diff 371290

lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp

Show First 20 Lines • Show All 927 Lines • ▼ Show 20 Lines
} }
uint32_t ABISysV_x86_64::GetGenericNum(llvm::StringRef name) { uint32_t ABISysV_x86_64::GetGenericNum(llvm::StringRef name) {
return llvm::StringSwitch<uint32_t>(name) return llvm::StringSwitch<uint32_t>(name)
.Case("rip", LLDB_REGNUM_GENERIC_PC) .Case("rip", LLDB_REGNUM_GENERIC_PC)
.Case("rsp", LLDB_REGNUM_GENERIC_SP) .Case("rsp", LLDB_REGNUM_GENERIC_SP)
.Case("rbp", LLDB_REGNUM_GENERIC_FP) .Case("rbp", LLDB_REGNUM_GENERIC_FP)
.Case("rflags", LLDB_REGNUM_GENERIC_FLAGS) .Case("rflags", LLDB_REGNUM_GENERIC_FLAGS)
// gdbserver uses eflags
.Case("eflags", LLDB_REGNUM_GENERIC_FLAGS)
.Case("rdi", LLDB_REGNUM_GENERIC_ARG1) .Case("rdi", LLDB_REGNUM_GENERIC_ARG1)
.Case("rsi", LLDB_REGNUM_GENERIC_ARG2) .Case("rsi", LLDB_REGNUM_GENERIC_ARG2)
.Case("rdx", LLDB_REGNUM_GENERIC_ARG3) .Case("rdx", LLDB_REGNUM_GENERIC_ARG3)
.Case("rcx", LLDB_REGNUM_GENERIC_ARG4) .Case("rcx", LLDB_REGNUM_GENERIC_ARG4)
.Case("r8", LLDB_REGNUM_GENERIC_ARG5) .Case("r8", LLDB_REGNUM_GENERIC_ARG5)
.Case("r9", LLDB_REGNUM_GENERIC_ARG6) .Case("r9", LLDB_REGNUM_GENERIC_ARG6)
.Default(LLDB_INVALID_REGNUM); .Default(LLDB_INVALID_REGNUM);
} }
Show All 22 Lines

lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp

Show First 20 Lines • Show All 800 Lines • ▼ Show 20 Lines
} }
uint32_t ABIWindows_x86_64::GetGenericNum(llvm::StringRef reg) { uint32_t ABIWindows_x86_64::GetGenericNum(llvm::StringRef reg) {
return llvm::StringSwitch<uint32_t>(reg) return llvm::StringSwitch<uint32_t>(reg)
.Case("rip", LLDB_REGNUM_GENERIC_PC) .Case("rip", LLDB_REGNUM_GENERIC_PC)
.Case("rsp", LLDB_REGNUM_GENERIC_SP) .Case("rsp", LLDB_REGNUM_GENERIC_SP)
.Case("rbp", LLDB_REGNUM_GENERIC_FP) .Case("rbp", LLDB_REGNUM_GENERIC_FP)
.Case("rflags", LLDB_REGNUM_GENERIC_FLAGS) .Case("rflags", LLDB_REGNUM_GENERIC_FLAGS)
// gdbserver uses eflags
.Case("eflags", LLDB_REGNUM_GENERIC_FLAGS)
.Case("rcx", LLDB_REGNUM_GENERIC_ARG1) .Case("rcx", LLDB_REGNUM_GENERIC_ARG1)
.Case("rdx", LLDB_REGNUM_GENERIC_ARG2) .Case("rdx", LLDB_REGNUM_GENERIC_ARG2)
.Case("r8", LLDB_REGNUM_GENERIC_ARG3) .Case("r8", LLDB_REGNUM_GENERIC_ARG3)
.Case("r9", LLDB_REGNUM_GENERIC_ARG4) .Case("r9", LLDB_REGNUM_GENERIC_ARG4)
.Default(LLDB_INVALID_REGNUM); .Default(LLDB_INVALID_REGNUM);
} }
void ABIWindows_x86_64::Initialize() { void ABIWindows_x86_64::Initialize() {
Show All 22 Lines

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

Show First 20 Lines • Show All 597 Lines • ▼ Show 20 Lines case llvm::Triple::x86_64:
reg.kinds[eRegisterKindGeneric] = LLDB_REGNUM_GENERIC_PC; reg.kinds[eRegisterKindGeneric] = LLDB_REGNUM_GENERIC_PC;
else if ((strcmp(reg.name, "rsp") == 0) || else if ((strcmp(reg.name, "rsp") == 0) ||
(strcmp(reg.name, "sp") == 0)) (strcmp(reg.name, "sp") == 0))
reg.kinds[eRegisterKindGeneric] = LLDB_REGNUM_GENERIC_SP; reg.kinds[eRegisterKindGeneric] = LLDB_REGNUM_GENERIC_SP;
else if ((strcmp(reg.name, "rbp") == 0) || else if ((strcmp(reg.name, "rbp") == 0) ||
(strcmp(reg.name, "fp") == 0)) (strcmp(reg.name, "fp") == 0))
reg.kinds[eRegisterKindGeneric] = LLDB_REGNUM_GENERIC_FP; reg.kinds[eRegisterKindGeneric] = LLDB_REGNUM_GENERIC_FP;
else if ((strcmp(reg.name, "rflags") == 0) || else if ((strcmp(reg.name, "rflags") == 0) ||
(strcmp(reg.name, "eflags") == 0) ||
(strcmp(reg.name, "flags") == 0)) (strcmp(reg.name, "flags") == 0))
reg.kinds[eRegisterKindGeneric] = LLDB_REGNUM_GENERIC_FLAGS; reg.kinds[eRegisterKindGeneric] = LLDB_REGNUM_GENERIC_FLAGS;
} }
break; break;
default: default:
break; break;
} }
▲ Show 20 Lines • Show All 198 Lines • Show Last 20 Lines