I've merged this in r244964: http://llvm.org/viewvc/llvm-project?rev=244964&view=rev
There was a merge conflict in ProcessGDBRemote.cpp, so I'd appreciate if someone could double check that I got it right. I did verify that it compiles, but I haven't been able to get the tests running on my machine. Thanks, Hans On Thu, Aug 13, 2015 at 9:54 AM, Greg Clayton <gclay...@apple.com> wrote: > Fine to merge. > >> On Aug 13, 2015, at 9:33 AM, Hans Wennborg <h...@chromium.org> wrote: >> >> Greg: you're the owner. Approved for 3.7? >> >> On Wed, Aug 12, 2015 at 10:21 PM, Jaydeep Patil >> <jaydeep.pa...@imgtec.com> wrote: >>> Hi Hans, >>> >>> Could you please merge it to release branch? >>> >>> Thanks, >>> Jaydeep >>> >>> -----Original Message----- >>> From: Jaydeep Patil >>> Sent: 13 August 2015 AM 09:15 >>> To: Jaydeep Patil >>> Subject: Re: [Diffusion] rL244864: [LLDB][MIPS] Handle false positives for >>> MIPS hardware watchpoints >>> >>> jaydeep committed rL244864: [LLDB][MIPS] Handle false positives for MIPS >>> hardware watchpoints. >>> >>> [LLDB][MIPS] Handle false positives for MIPS hardware watchpoints >>> >>> SUMMARY: >>> Last 3bits of the watchpoint address are masked by the kernel. For >>> example, n is >>> at 0x120010d00 and m is 0x120010d04. When a watchpoint is set at m, then >>> watch >>> exception is generated even when n is read/written. To handle this case, >>> instruction >>> at PC is emulated to find the base address of the load/store instruction. >>> This address >>> is then appended to the description of the stop-info packet. Client then >>> reads this >>> information to check whether the user has set a watchpoint on this address. >>> >>> Reviewers: jingham, clayborg >>> Subscribers: nitesh.jain, mohit.bhakkad, sagar, bhushan and lldb-commits >>> Differential Revision: http://reviews.llvm.org/D11672 >>> >>> >>> Files: >>> /lldb/trunk/include/lldb/Host/common/NativeRegisterContext.h >>> /lldb/trunk/include/lldb/Target/StopInfo.h >>> /lldb/trunk/source/Host/common/NativeRegisterContext.cpp >>> /lldb/trunk/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.cpp >>> /lldb/trunk/source/Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h >>> >>> /lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.cpp >>> >>> /lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_mips64.h >>> /lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp >>> /lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp >>> /lldb/trunk/source/Target/StopInfo.cpp >>> >>> Users: >>> jaydeep (Author) >>> >>> http://reviews.llvm.org/rL244864 >>> >>> >>> > _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits