labath added a comment. The real issue here is that there are two implementations in the first place. The lldb-server method is supposed to be the new thing, and the old should go away as soon as the new one is good enough. Therefore I wouldn't spend too much time trying to unify these. Rather, if anyone has the time, I'd recommend seeing what features does the lldb-server thing lack so it can be made the default one.
================ Comment at: lldb/source/Plugins/Process/Windows/Common/NativeProcessWindows.cpp:495-514 + int breakpoint_size = 1; + switch (GetArchitecture().GetMachine()) { + case llvm::Triple::aarch64: + breakpoint_size = 4; + break; + + case llvm::Triple::arm: ---------------- This should be the job of `GetSoftwareBreakpointPCOffset`, although the default implementation of that function returns zero for arm. If that is not desired (does windows automatically increment the PC or something?), then I guess you should override that function. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D109777/new/ https://reviews.llvm.org/D109777 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits