================ @@ -492,23 +492,36 @@ NativeProcessWindows::OnDebugException(bool first_chance, } case DWORD(STATUS_BREAKPOINT): case STATUS_WX86_BREAKPOINT: - if (FindSoftwareBreakpoint(record.GetExceptionAddress())) { - LLDB_LOG(log, "Hit non-loader breakpoint at address {0:x}.", - record.GetExceptionAddress()); - - StopThread(record.GetThreadID(), StopReason::eStopReasonBreakpoint); - if (NativeThreadWindows *stop_thread = - GetThreadByID(record.GetThreadID())) { - auto ®ister_context = stop_thread->GetRegisterContext(); - uint32_t breakpoint_size = GetSoftwareBreakpointPCOffset(); - // The current PC is AFTER the BP opcode, on all architectures. - uint64_t pc = register_context.GetPC() - breakpoint_size; - register_context.SetPC(pc); + if (NativeThreadWindows *stop_thread = + GetThreadByID(record.GetThreadID())) { + auto ®_ctx = stop_thread->GetRegisterContext(); + const auto exception_addr = record.GetExceptionAddress(); + const auto thread_id = record.GetThreadID(); + + if (FindSoftwareBreakpoint(exception_addr)) { + LLDB_LOG(log, "Hit non-loader breakpoint at address {0:x}.", ---------------- DavidSpickett wrote:
What does loader mean in this context? Is it anything like the dynamic linker on Linux? If so I assume this means we hit a breakpoint that wasn't placed by the system, because if it was we should be ignoring it. https://github.com/llvm/llvm-project/pull/108072 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits