diff options
Diffstat (limited to 'lldb/source/Plugins')
5 files changed, 22 insertions, 22 deletions
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp index 7d33ccec68a..da1e059460d 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -593,7 +593,7 @@ ProcessKDP::DoDeallocateMemory (lldb::addr_t addr) } Error -ProcessKDP::EnableBreakpoint (BreakpointSite *bp_site) +ProcessKDP::EnableBreakpointSite (BreakpointSite *bp_site) { if (m_comm.LocalBreakpointsAreSupported ()) { @@ -616,7 +616,7 @@ ProcessKDP::EnableBreakpoint (BreakpointSite *bp_site) } Error -ProcessKDP::DisableBreakpoint (BreakpointSite *bp_site) +ProcessKDP::DisableBreakpointSite (BreakpointSite *bp_site) { if (m_comm.LocalBreakpointsAreSupported ()) { diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h index bc26f6eea9e..520c62e0e68 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.h @@ -174,10 +174,10 @@ public: // Process Breakpoints //---------------------------------------------------------------------- virtual lldb_private::Error - EnableBreakpoint (lldb_private::BreakpointSite *bp_site); + EnableBreakpointSite (lldb_private::BreakpointSite *bp_site); virtual lldb_private::Error - DisableBreakpoint (lldb_private::BreakpointSite *bp_site); + DisableBreakpointSite (lldb_private::BreakpointSite *bp_site); //---------------------------------------------------------------------- // Process Watchpoints diff --git a/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp b/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp index 77bc7116b8a..58b6a4e91e4 100644 --- a/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp +++ b/lldb/source/Plugins/Process/Utility/StopInfoMachException.cpp @@ -345,8 +345,8 @@ StopInfoMachException::CreateStopReasonWithMachException case 6: // EXC_BREAKPOINT { - bool is_software_breakpoint = false; - bool is_trace_if_software_breakpoint_missing = false; + bool is_actual_breakpoint = false; + bool is_trace_if_actual_breakpoint_missing = false; switch (cpu) { case llvm::Triple::x86: @@ -375,9 +375,9 @@ StopInfoMachException::CreateStopReasonWithMachException { // KDP returns EXC_I386_BPTFLT for trace breakpoints if (exc_code == 3) - is_trace_if_software_breakpoint_missing = true; + is_trace_if_actual_breakpoint_missing = true; - is_software_breakpoint = true; + is_actual_breakpoint = true; if (!pc_already_adjusted) pc_decrement = 1; } @@ -385,7 +385,7 @@ StopInfoMachException::CreateStopReasonWithMachException case llvm::Triple::ppc: case llvm::Triple::ppc64: - is_software_breakpoint = exc_code == 1; // EXC_PPC_BREAKPOINT + is_actual_breakpoint = exc_code == 1; // EXC_PPC_BREAKPOINT break; case llvm::Triple::arm: @@ -410,8 +410,8 @@ StopInfoMachException::CreateStopReasonWithMachException } else if (exc_code == 1) // EXC_ARM_BREAKPOINT { - is_software_breakpoint = true; - is_trace_if_software_breakpoint_missing = true; + is_actual_breakpoint = true; + is_trace_if_actual_breakpoint_missing = true; } break; @@ -419,7 +419,7 @@ StopInfoMachException::CreateStopReasonWithMachException break; } - if (is_software_breakpoint) + if (is_actual_breakpoint) { RegisterContextSP reg_ctx_sp (thread.GetRegisterContext()); addr_t pc = reg_ctx_sp->GetPC() - pc_decrement; @@ -447,7 +447,7 @@ StopInfoMachException::CreateStopReasonWithMachException } // Don't call this a trace if we weren't single stepping this thread. - if (is_trace_if_software_breakpoint_missing && thread.GetTemporaryResumeState() == eStateStepping) + if (is_trace_if_actual_breakpoint_missing && thread.GetTemporaryResumeState() == eStateStepping) { return StopInfo::CreateStopReasonToTrace (thread); } diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 96662f61d24..07f4d7b70c1 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -2172,7 +2172,7 @@ ProcessGDBRemote::PutSTDIN (const char *src, size_t src_len, Error &error) } Error -ProcessGDBRemote::EnableBreakpoint (BreakpointSite *bp_site) +ProcessGDBRemote::EnableBreakpointSite (BreakpointSite *bp_site) { Error error; assert (bp_site != NULL); @@ -2181,12 +2181,12 @@ ProcessGDBRemote::EnableBreakpoint (BreakpointSite *bp_site) user_id_t site_id = bp_site->GetID(); const addr_t addr = bp_site->GetLoadAddress(); if (log) - log->Printf ("ProcessGDBRemote::EnableBreakpoint (size_id = %" PRIu64 ") address = 0x%" PRIx64, site_id, (uint64_t)addr); + log->Printf ("ProcessGDBRemote::EnableBreakpointSite (size_id = %" PRIu64 ") address = 0x%" PRIx64, site_id, (uint64_t)addr); if (bp_site->IsEnabled()) { if (log) - log->Printf ("ProcessGDBRemote::EnableBreakpoint (size_id = %" PRIu64 ") address = 0x%" PRIx64 " -- SUCCESS (already enabled)", site_id, (uint64_t)addr); + log->Printf ("ProcessGDBRemote::EnableBreakpointSite (size_id = %" PRIu64 ") address = 0x%" PRIx64 " -- SUCCESS (already enabled)", site_id, (uint64_t)addr); return error; } else @@ -2224,7 +2224,7 @@ ProcessGDBRemote::EnableBreakpoint (BreakpointSite *bp_site) if (log) { const char *err_string = error.AsCString(); - log->Printf ("ProcessGDBRemote::EnableBreakpoint() error for breakpoint at 0x%8.8" PRIx64 ": %s", + log->Printf ("ProcessGDBRemote::EnableBreakpointSite () error for breakpoint at 0x%8.8" PRIx64 ": %s", bp_site->GetLoadAddress(), err_string ? err_string : "NULL"); } @@ -2235,7 +2235,7 @@ ProcessGDBRemote::EnableBreakpoint (BreakpointSite *bp_site) } Error -ProcessGDBRemote::DisableBreakpoint (BreakpointSite *bp_site) +ProcessGDBRemote::DisableBreakpointSite (BreakpointSite *bp_site) { Error error; assert (bp_site != NULL); @@ -2243,7 +2243,7 @@ ProcessGDBRemote::DisableBreakpoint (BreakpointSite *bp_site) user_id_t site_id = bp_site->GetID(); LogSP log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet(GDBR_LOG_BREAKPOINTS)); if (log) - log->Printf ("ProcessGDBRemote::DisableBreakpoint (site_id = %" PRIu64 ") addr = 0x%8.8" PRIx64, site_id, (uint64_t)addr); + log->Printf ("ProcessGDBRemote::DisableBreakpointSite (site_id = %" PRIu64 ") addr = 0x%8.8" PRIx64, site_id, (uint64_t)addr); if (bp_site->IsEnabled()) { @@ -2272,7 +2272,7 @@ ProcessGDBRemote::DisableBreakpoint (BreakpointSite *bp_site) else { if (log) - log->Printf ("ProcessGDBRemote::DisableBreakpoint (site_id = %" PRIu64 ") addr = 0x%8.8" PRIx64 " -- SUCCESS (already disabled)", site_id, (uint64_t)addr); + log->Printf ("ProcessGDBRemote::DisableBreakpointSite (site_id = %" PRIu64 ") addr = 0x%8.8" PRIx64 " -- SUCCESS (already disabled)", site_id, (uint64_t)addr); return error; } diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h index 7684607b7f7..957a84f2909 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h @@ -193,10 +193,10 @@ public: // Process Breakpoints //---------------------------------------------------------------------- virtual lldb_private::Error - EnableBreakpoint (lldb_private::BreakpointSite *bp_site); + EnableBreakpointSite (lldb_private::BreakpointSite *bp_site); virtual lldb_private::Error - DisableBreakpoint (lldb_private::BreakpointSite *bp_site); + DisableBreakpointSite (lldb_private::BreakpointSite *bp_site); //---------------------------------------------------------------------- // Process Watchpoints |
