diff options
Diffstat (limited to 'lldb/source/Plugins/Process')
| -rw-r--r-- | lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.h | 6 | ||||
| -rw-r--r-- | lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp | 49 |
2 files changed, 35 insertions, 20 deletions
diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.h b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.h index b671a322226..0e9d721959b 100644 --- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.h +++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_x86_64.h @@ -46,10 +46,10 @@ namespace lldb_private WriteAllRegisterValues (const lldb::DataBufferSP &data_sp) override; Error - IsWatchpointHit(uint8_t wp_index); + IsWatchpointHit(uint8_t wp_index) override; Error - IsWatchpointVacant(uint32_t wp_index); + IsWatchpointVacant(uint32_t wp_index) override; bool ClearHardwareWatchpoint(uint32_t wp_index) override; @@ -66,7 +66,7 @@ namespace lldb_private uint32_t watch_flags) override; lldb::addr_t - GetWatchpointAddress(uint32_t wp_index); + GetWatchpointAddress(uint32_t wp_index) override; uint32_t NumSupportedHardwareWatchpoints() override; diff --git a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp index de7c8fc2620..3b60cca2e8f 100644 --- a/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp +++ b/lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp @@ -382,36 +382,51 @@ NativeThreadLinux::SetStoppedByBreakpoint () 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 |
