Skip to content

Commit a3ce967

Browse files
committed
Add SI_KERNEL into the description as well.
1 parent 157b5a5 commit a3ce967

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

lldb/source/Host/common/NativeProcessProtocol.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,9 @@ void NativeProcessProtocol::NotifyDidExec() {
340340

341341
Status NativeProcessProtocol::SetSoftwareBreakpoint(lldb::addr_t addr,
342342
uint32_t size_hint) {
343+
344+
volatile bool debug = true;
345+
while (debug) {}
343346
Log *log = GetLog(LLDBLog::Breakpoints);
344347
LLDB_LOG(log, "addr = {0:x}, size_hint = {1}", addr, size_hint);
345348

@@ -362,9 +365,10 @@ Status NativeProcessProtocol::RemoveSoftwareBreakpoint(lldb::addr_t addr) {
362365
auto it = m_software_breakpoints.find(addr);
363366
if (it == m_software_breakpoints.end())
364367
return Status::FromErrorString("Breakpoint not found.");
365-
assert(it->second.ref_count > 0);
366-
if (--it->second.ref_count > 0)
368+
if (it->second.ref_count > 0) {
369+
--it->second.ref_count;
367370
return Status();
371+
}
368372

369373
// This is the last reference. Let's remove the breakpoint.
370374
Status error;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
AddSignal(signo, name, __VA_ARGS__); \
6868
ADD_SIGCODE(signo, signo, SI_USER, 0, "sent by kill, sigsend or raise", \
6969
SignalCodePrintOption::Sender); \
70-
ADD_SIGCODE(signo, signo, SI_KERNEL, 0x80, "sent by kernel", \
70+
ADD_SIGCODE(signo, signo, SI_KERNEL, 0x80, "sent by kernel (SI_KERNEL)", \
7171
SignalCodePrintOption::Sender); \
7272
ADD_SIGCODE(signo, signo, SI_QUEUE, -1, "sent by sigqueue", \
7373
SignalCodePrintOption::Sender); \

0 commit comments

Comments
 (0)