Author: Jonas Devlieghere Date: 2020-01-24T19:24:25-08:00 New Revision: d8e0f4fae7a2d6a2510d9eea21a12ed9b8948d65
URL: https://github.com/llvm/llvm-project/commit/d8e0f4fae7a2d6a2510d9eea21a12ed9b8948d65 DIFF: https://github.com/llvm/llvm-project/commit/d8e0f4fae7a2d6a2510d9eea21a12ed9b8948d65.diff LOG: [lldb/Breakpoint] Include whether or not a breakpoint is a HW BP Include whether or not a breakpoint is a hardware breakpoint in the breakpoint location. This will show up in things like the breakpoint list. Differential revision: https://reviews.llvm.org/D73389 Added: Modified: lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py lldb/source/Breakpoint/BreakpointLocation.cpp Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py index 0ea8e042c5d9..f9a916f87b86 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py @@ -101,6 +101,10 @@ def break_multi_thread(self, removal_type): # Continue the loop and test that we are stopped 4 times. count += 1 + # Check the breakpoint list. + self.expect("breakpoint list", substrs=['hw_break_function', 'hardware']) + self.expect("breakpoint list -v", substrs=['function = hw_break_function', 'hardware = true']) + if removal_type == 'delete': self.runCmd("settings set auto-confirm true") diff --git a/lldb/source/Breakpoint/BreakpointLocation.cpp b/lldb/source/Breakpoint/BreakpointLocation.cpp index ecfc8b53d92e..646c2e3c628b 100644 --- a/lldb/source/Breakpoint/BreakpointLocation.cpp +++ b/lldb/source/Breakpoint/BreakpointLocation.cpp @@ -597,7 +597,8 @@ void BreakpointLocation::GetDescription(Stream *s, s->EOL(); s->Indent(); s->Printf("resolved = %s\n", IsResolved() ? "true" : "false"); - + s->Indent(); + s->Printf("hardware = %s\n", IsHardware() ? "true" : "false"); s->Indent(); s->Printf("hit count = %-4u\n", GetHitCount()); @@ -608,8 +609,8 @@ void BreakpointLocation::GetDescription(Stream *s, } s->IndentLess(); } else if (level != eDescriptionLevelInitial) { - s->Printf(", %sresolved, hit count = %u ", (IsResolved() ? "" : "un"), - GetHitCount()); + s->Printf(", %sresolved, %shit count = %u ", (IsResolved() ? "" : "un"), + (IsHardware() ? "hardware, " : ""), GetHitCount()); if (m_options_up) { m_options_up->GetDescription(s, level); } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
