Report stopped by trace if none of the watchpoint was hit
Some linux kernel reports a watchpoint hit after single stepping even
when no watchpoint was hit. This CL looks for a watchpoint which was hit
and reports a stop by trace if it haven't found any.
Differential revision: http://reviews.llvm.org/D8081
llvm-svn: 232482
diff --git a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp
index de7c8fc..3b60cca 100644
--- a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp
@@ -382,36 +382,51 @@
void
NativeThreadLinux::SetStoppedByWatchpoint ()
{
+ Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
+ lldb::pid_t pid = LLDB_INVALID_PROCESS_ID;
+ if (log)
+ {
+ NativeProcessProtocolSP process_sp = m_process_wp.lock ();
+ if (process_sp)
+ pid = process_sp->GetID ();
+ }
+
const StateType new_state = StateType::eStateStopped;
MaybeLogStateChange (new_state);
m_state = new_state;
- m_stop_info.reason = StopReason::eStopReasonWatchpoint;
- m_stop_info.details.signal.signo = SIGTRAP;
-
- NativeRegisterContextLinux_x86_64 *reg_ctx =
- reinterpret_cast<NativeRegisterContextLinux_x86_64*> (GetRegisterContext().get());
- const uint32_t num_hw_watchpoints =
- reg_ctx->NumSupportedHardwareWatchpoints();
+ NativeRegisterContextSP reg_ctx = GetRegisterContext ();
+ const uint32_t num_hw_watchpoints = reg_ctx->NumSupportedHardwareWatchpoints ();
m_stop_description.clear ();
for (uint32_t wp_index = 0; wp_index < num_hw_watchpoints; ++wp_index)
- if (reg_ctx->IsWatchpointHit(wp_index).Success())
+ {
+ if (reg_ctx->IsWatchpointHit (wp_index).Success())
{
+ if (log)
+ log->Printf ("NativeThreadLinux:%s (pid=%" PRIu64 ", tid=%" PRIu64 ") watchpoint found with idx: %u",
+ __FUNCTION__, pid, GetID (), wp_index);
+
std::ostringstream ostr;
- ostr << reg_ctx->GetWatchpointAddress(wp_index) << " " << wp_index;
+ ostr << reg_ctx->GetWatchpointAddress (wp_index) << " " << wp_index;
m_stop_description = ostr.str();
+
+ m_stop_info.reason = StopReason::eStopReasonWatchpoint;
+ m_stop_info.details.signal.signo = SIGTRAP;
return;
}
- Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_THREAD));
- if (log)
- {
- NativeProcessProtocolSP m_process_sp = m_process_wp.lock ();
- lldb::pid_t pid = m_process_sp ? m_process_sp->GetID () : LLDB_INVALID_PROCESS_ID;
- log->Printf ("NativeThreadLinux: thread (pid=%" PRIu64 ", tid=%" PRIu64 ") "
- "stopped by a watchpoint, but failed to find it",
- pid, GetID ());
}
+
+ // The process reported a watchpoint was hit, but we haven't found the
+ // watchpoint. Assume that a stopped by trace is reported as a hardware
+ // watchpoint what happens on some linux kernels (e.g.: android-arm64
+ // platfrom-21).
+
+ if (log)
+ log->Printf ("NativeThreadLinux:%s (pid=%" PRIu64 ", tid=%" PRIu64 ") none of the watchpoint was hit.",
+ __FUNCTION__, pid, GetID ());
+
+ SetStoppedByTrace ();
}
bool