diff options
author | dim <dim@FreeBSD.org> | 2017-04-02 17:24:58 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2017-04-02 17:24:58 +0000 |
commit | 60b571e49a90d38697b3aca23020d9da42fc7d7f (patch) | |
tree | 99351324c24d6cb146b6285b6caffa4d26fce188 /contrib/llvm/tools/lldb/source/Host/common/SoftwareBreakpoint.cpp | |
parent | bea1b22c7a9bce1dfdd73e6e5b65bc4752215180 (diff) | |
download | FreeBSD-src-60b571e49a90d38697b3aca23020d9da42fc7d7f.zip FreeBSD-src-60b571e49a90d38697b3aca23020d9da42fc7d7f.tar.gz |
Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release:
MFC r309142 (by emaste):
Add WITH_LLD_AS_LD build knob
If set it installs LLD as /usr/bin/ld. LLD (as of version 3.9) is not
capable of linking the world and kernel, but can self-host and link many
substantial applications. GNU ld continues to be used for the world and
kernel build, regardless of how this knob is set.
It is on by default for arm64, and off for all other CPU architectures.
Sponsored by: The FreeBSD Foundation
MFC r310840:
Reapply 310775, now it also builds correctly if lldb is disabled:
Move llvm-objdump from CLANG_EXTRAS to installed by default
We currently install three tools from binutils 2.17.50: as, ld, and
objdump. Work is underway to migrate to a permissively-licensed
tool-chain, with one goal being the retirement of binutils 2.17.50.
LLVM's llvm-objdump is intended to be compatible with GNU objdump
although it is currently missing some options and may have formatting
differences. Enable it by default for testing and further investigation.
It may later be changed to install as /usr/bin/objdump, it becomes a
fully viable replacement.
Reviewed by: emaste
Differential Revision: https://reviews.freebsd.org/D8879
MFC r312855 (by emaste):
Rename LLD_AS_LD to LLD_IS_LD, for consistency with CLANG_IS_CC
Reported by: Dan McGregor <dan.mcgregor usask.ca>
MFC r313559 | glebius | 2017-02-10 18:34:48 +0100 (Fri, 10 Feb 2017) | 5 lines
Don't check struct rtentry on FreeBSD, it is an internal kernel structure.
On other systems it may be API structure for SIOCADDRT/SIOCDELRT.
Reviewed by: emaste, dim
MFC r314152 (by jkim):
Remove an assembler flag, which is redundant since r309124. The upstream
took care of it by introducing a macro NO_EXEC_STACK_DIRECTIVE.
http://llvm.org/viewvc/llvm-project?rev=273500&view=rev
Reviewed by: dim
MFC r314564:
Upgrade our copies of clang, llvm, lld, lldb, compiler-rt and libc++ to
4.0.0 (branches/release_40 296509). The release will follow soon.
Please note that from 3.5.0 onwards, clang, llvm and lldb require C++11
support to build; see UPDATING for more information.
Also note that as of 4.0.0, lld should be able to link the base system
on amd64 and aarch64. See the WITH_LLD_IS_LLD setting in src.conf(5).
Though please be aware that this is work in progress.
Release notes for llvm, clang and lld will be available here:
<http://releases.llvm.org/4.0.0/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/clang/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/lld/docs/ReleaseNotes.html>
Thanks to Ed Maste, Jan Beich, Antoine Brodin and Eric Fiselier for
their help.
Relnotes: yes
Exp-run: antoine
PR: 215969, 216008
MFC r314708:
For now, revert r287232 from upstream llvm trunk (by Daniil Fukalov):
[SCEV] limit recursion depth of CompareSCEVComplexity
Summary:
CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
loop) and runs almost infinite time.
Added cache of "equal" SCEV pairs to earlier cutoff of further
estimation. Recursion depth limit was also introduced as a parameter.
Reviewers: sanjoy
Subscribers: mzolotukhin, tstellarAMD, llvm-commits
Differential Revision: https://reviews.llvm.org/D26389
This commit is the cause of excessive compile times on skein_block.c
(and possibly other files) during kernel builds on amd64.
We never saw the problematic behavior described in this upstream commit,
so for now it is better to revert it. An upstream bug has been filed
here: https://bugs.llvm.org/show_bug.cgi?id=32142
Reported by: mjg
MFC r314795:
Reapply r287232 from upstream llvm trunk (by Daniil Fukalov):
[SCEV] limit recursion depth of CompareSCEVComplexity
Summary:
CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
loop) and runs almost infinite time.
Added cache of "equal" SCEV pairs to earlier cutoff of further
estimation. Recursion depth limit was also introduced as a parameter.
Reviewers: sanjoy
Subscribers: mzolotukhin, tstellarAMD, llvm-commits
Differential Revision: https://reviews.llvm.org/D26389
Pull in r296992 from upstream llvm trunk (by Sanjoy Das):
[SCEV] Decrease the recursion threshold for CompareValueComplexity
Fixes PR32142.
r287232 accidentally increased the recursion threshold for
CompareValueComplexity from 2 to 32. This change reverses that
change by introducing a separate flag for CompareValueComplexity's
threshold.
The latter revision fixes the excessive compile times for skein_block.c.
MFC r314907 | mmel | 2017-03-08 12:40:27 +0100 (Wed, 08 Mar 2017) | 7 lines
Unbreak ARMv6 world.
The new compiler_rt library imported with clang 4.0.0 have several fatal
issues (non-functional __udivsi3 for example) with ARM specific instrict
functions. As temporary workaround, until upstream solve these problems,
disable all thumb[1][2] related feature.
MFC r315016:
Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release.
We were already very close to the last release candidate, so this is a
pretty minor update.
Relnotes: yes
MFC r316005:
Revert r314907, and pull in r298713 from upstream compiler-rt trunk (by
Weiming Zhao):
builtins: Select correct code fragments when compiling for Thumb1/Thum2/ARM ISA.
Summary:
Value of __ARM_ARCH_ISA_THUMB isn't based on the actual compilation
mode (-mthumb, -marm), it reflect's capability of given CPU.
Due to this:
- use __tbumb__ and __thumb2__ insteand of __ARM_ARCH_ISA_THUMB
- use '.thumb' directive consistently in all affected files
- decorate all thumb functions using
DEFINE_COMPILERRT_THUMB_FUNCTION()
---------
Note: This patch doesn't fix broken Thumb1 variant of __udivsi3 !
Reviewers: weimingz, rengolin, compnerd
Subscribers: aemerson, dim
Differential Revision: https://reviews.llvm.org/D30938
Discussed with: mmel
Diffstat (limited to 'contrib/llvm/tools/lldb/source/Host/common/SoftwareBreakpoint.cpp')
-rw-r--r-- | contrib/llvm/tools/lldb/source/Host/common/SoftwareBreakpoint.cpp | 558 |
1 files changed, 297 insertions, 261 deletions
diff --git a/contrib/llvm/tools/lldb/source/Host/common/SoftwareBreakpoint.cpp b/contrib/llvm/tools/lldb/source/Host/common/SoftwareBreakpoint.cpp index 51cb34f..3d57b7d 100644 --- a/contrib/llvm/tools/lldb/source/Host/common/SoftwareBreakpoint.cpp +++ b/contrib/llvm/tools/lldb/source/Host/common/SoftwareBreakpoint.cpp @@ -21,296 +21,332 @@ using namespace lldb_private; // static members // ------------------------------------------------------------------- -Error -SoftwareBreakpoint::CreateSoftwareBreakpoint (NativeProcessProtocol &process, lldb::addr_t addr, size_t size_hint, NativeBreakpointSP &breakpoint_sp) -{ - Log *log (GetLogIfAnyCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); +Error SoftwareBreakpoint::CreateSoftwareBreakpoint( + NativeProcessProtocol &process, lldb::addr_t addr, size_t size_hint, + NativeBreakpointSP &breakpoint_sp) { + Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_BREAKPOINTS)); + if (log) + log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64, __FUNCTION__, addr); + + // Validate the address. + if (addr == LLDB_INVALID_ADDRESS) + return Error("SoftwareBreakpoint::%s invalid load address specified.", + __FUNCTION__); + + // Ask the NativeProcessProtocol subclass to fill in the correct software + // breakpoint + // trap for the breakpoint site. + size_t bp_opcode_size = 0; + const uint8_t *bp_opcode_bytes = NULL; + Error error = process.GetSoftwareBreakpointTrapOpcode( + size_hint, bp_opcode_size, bp_opcode_bytes); + + if (error.Fail()) { if (log) - log->Printf ("SoftwareBreakpoint::%s addr = 0x%" PRIx64, __FUNCTION__, addr); - - // Validate the address. - if (addr == LLDB_INVALID_ADDRESS) - return Error ("SoftwareBreakpoint::%s invalid load address specified.", __FUNCTION__); - - // Ask the NativeProcessProtocol subclass to fill in the correct software breakpoint - // trap for the breakpoint site. - size_t bp_opcode_size = 0; - const uint8_t *bp_opcode_bytes = NULL; - Error error = process.GetSoftwareBreakpointTrapOpcode (size_hint, bp_opcode_size, bp_opcode_bytes); - - if (error.Fail ()) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s failed to retrieve software breakpoint trap opcode: %s", __FUNCTION__, error.AsCString ()); - return error; - } - - // Validate size of trap opcode. - if (bp_opcode_size == 0) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s failed to retrieve any trap opcodes", __FUNCTION__); - return Error ("SoftwareBreakpoint::GetSoftwareBreakpointTrapOpcode() returned zero, unable to get breakpoint trap for address 0x%" PRIx64, addr); - } - - if (bp_opcode_size > MAX_TRAP_OPCODE_SIZE) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s cannot support %lu trapcode bytes, max size is %lu", __FUNCTION__, bp_opcode_size, MAX_TRAP_OPCODE_SIZE); - return Error ("SoftwareBreakpoint::GetSoftwareBreakpointTrapOpcode() returned too many trap opcode bytes: requires %lu but we only support a max of %lu", bp_opcode_size, MAX_TRAP_OPCODE_SIZE); - } - - // Validate that we received opcodes. - if (!bp_opcode_bytes) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s failed to retrieve trap opcode bytes", __FUNCTION__); - return Error ("SoftwareBreakpoint::GetSoftwareBreakpointTrapOpcode() returned NULL trap opcode bytes, unable to get breakpoint trap for address 0x%" PRIx64, addr); - } - - // Enable the breakpoint. - uint8_t saved_opcode_bytes [MAX_TRAP_OPCODE_SIZE]; - error = EnableSoftwareBreakpoint (process, addr, bp_opcode_size, bp_opcode_bytes, saved_opcode_bytes); - if (error.Fail ()) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s: failed to enable new breakpoint at 0x%" PRIx64 ": %s", __FUNCTION__, addr, error.AsCString ()); - return error; - } + log->Printf("SoftwareBreakpoint::%s failed to retrieve software " + "breakpoint trap opcode: %s", + __FUNCTION__, error.AsCString()); + return error; + } + // Validate size of trap opcode. + if (bp_opcode_size == 0) { if (log) - log->Printf ("SoftwareBreakpoint::%s addr = 0x%" PRIx64 " -- SUCCESS", __FUNCTION__, addr); - - // Set the breakpoint and verified it was written properly. Now - // create a breakpoint remover that understands how to undo this - // breakpoint. - breakpoint_sp.reset (new SoftwareBreakpoint (process, addr, saved_opcode_bytes, bp_opcode_bytes, bp_opcode_size)); - return Error (); -} - -Error -SoftwareBreakpoint::EnableSoftwareBreakpoint (NativeProcessProtocol &process, lldb::addr_t addr, size_t bp_opcode_size, const uint8_t *bp_opcode_bytes, uint8_t *saved_opcode_bytes) -{ - assert (bp_opcode_size <= MAX_TRAP_OPCODE_SIZE && "bp_opcode_size out of valid range"); - assert (bp_opcode_bytes && "bp_opcode_bytes is NULL"); - assert (saved_opcode_bytes && "saved_opcode_bytes is NULL"); - - Log *log (GetLogIfAnyCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + log->Printf("SoftwareBreakpoint::%s failed to retrieve any trap opcodes", + __FUNCTION__); + return Error("SoftwareBreakpoint::GetSoftwareBreakpointTrapOpcode() " + "returned zero, unable to get breakpoint trap for address " + "0x%" PRIx64, + addr); + } + + if (bp_opcode_size > MAX_TRAP_OPCODE_SIZE) { if (log) - log->Printf ("SoftwareBreakpoint::%s addr = 0x%" PRIx64, __FUNCTION__, addr); + log->Printf("SoftwareBreakpoint::%s cannot support %zu trapcode bytes, " + "max size is %zu", + __FUNCTION__, bp_opcode_size, MAX_TRAP_OPCODE_SIZE); + return Error("SoftwareBreakpoint::GetSoftwareBreakpointTrapOpcode() " + "returned too many trap opcode bytes: requires %zu but we " + "only support a max of %zu", + bp_opcode_size, MAX_TRAP_OPCODE_SIZE); + } + + // Validate that we received opcodes. + if (!bp_opcode_bytes) { + if (log) + log->Printf("SoftwareBreakpoint::%s failed to retrieve trap opcode bytes", + __FUNCTION__); + return Error("SoftwareBreakpoint::GetSoftwareBreakpointTrapOpcode() " + "returned NULL trap opcode bytes, unable to get breakpoint " + "trap for address 0x%" PRIx64, + addr); + } + + // Enable the breakpoint. + uint8_t saved_opcode_bytes[MAX_TRAP_OPCODE_SIZE]; + error = EnableSoftwareBreakpoint(process, addr, bp_opcode_size, + bp_opcode_bytes, saved_opcode_bytes); + if (error.Fail()) { + if (log) + log->Printf("SoftwareBreakpoint::%s: failed to enable new breakpoint at " + "0x%" PRIx64 ": %s", + __FUNCTION__, addr, error.AsCString()); + return error; + } + + if (log) + log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64 " -- SUCCESS", + __FUNCTION__, addr); + + // Set the breakpoint and verified it was written properly. Now + // create a breakpoint remover that understands how to undo this + // breakpoint. + breakpoint_sp.reset(new SoftwareBreakpoint(process, addr, saved_opcode_bytes, + bp_opcode_bytes, bp_opcode_size)); + return Error(); +} - // Save the original opcodes by reading them so we can restore later. - size_t bytes_read = 0; +Error SoftwareBreakpoint::EnableSoftwareBreakpoint( + NativeProcessProtocol &process, lldb::addr_t addr, size_t bp_opcode_size, + const uint8_t *bp_opcode_bytes, uint8_t *saved_opcode_bytes) { + assert(bp_opcode_size <= MAX_TRAP_OPCODE_SIZE && + "bp_opcode_size out of valid range"); + assert(bp_opcode_bytes && "bp_opcode_bytes is NULL"); + assert(saved_opcode_bytes && "saved_opcode_bytes is NULL"); - Error error = process.ReadMemory(addr, saved_opcode_bytes, bp_opcode_size, bytes_read); - if (error.Fail ()) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s failed to read memory while attempting to set breakpoint: %s", __FUNCTION__, error.AsCString ()); - return error; - } + Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_BREAKPOINTS)); + if (log) + log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64, __FUNCTION__, addr); - // Ensure we read as many bytes as we expected. - if (bytes_read != bp_opcode_size) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s failed to read memory while attempting to set breakpoint: attempted to read %lu bytes but only read %" PRIu64, __FUNCTION__, bp_opcode_size, (uint64_t)bytes_read); - return Error ("SoftwareBreakpoint::%s failed to read memory while attempting to set breakpoint: attempted to read %lu bytes but only read %" PRIu64, __FUNCTION__, bp_opcode_size, (uint64_t)bytes_read); - } + // Save the original opcodes by reading them so we can restore later. + size_t bytes_read = 0; - // Log what we read. + Error error = + process.ReadMemory(addr, saved_opcode_bytes, bp_opcode_size, bytes_read); + if (error.Fail()) { if (log) - { - int i = 0; - for (const uint8_t *read_byte = saved_opcode_bytes; read_byte < saved_opcode_bytes + bp_opcode_size; ++read_byte) - { - log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64 - " ovewriting byte index %d (was 0x%hhx)", - __FUNCTION__, addr, i++, *read_byte); - } - } - - // Write a software breakpoint in place of the original opcode. - size_t bytes_written = 0; - error = process.WriteMemory(addr, bp_opcode_bytes, bp_opcode_size, bytes_written); - if (error.Fail ()) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s failed to write memory while attempting to set breakpoint: %s", __FUNCTION__, error.AsCString ()); - return error; - } - - // Ensure we wrote as many bytes as we expected. - if (bytes_written != bp_opcode_size) - { - error.SetErrorStringWithFormat("SoftwareBreakpoint::%s failed write memory while attempting to set breakpoint: attempted to write %lu bytes but only wrote %" PRIu64, __FUNCTION__, bp_opcode_size, (uint64_t)bytes_written); - if (log) - log->PutCString (error.AsCString ()); - return error; - } - - uint8_t verify_bp_opcode_bytes [MAX_TRAP_OPCODE_SIZE]; - size_t verify_bytes_read = 0; - error = process.ReadMemory(addr, verify_bp_opcode_bytes, bp_opcode_size, verify_bytes_read); - if (error.Fail ()) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s failed to read memory while attempting to verify the breakpoint set: %s", __FUNCTION__, error.AsCString ()); - return error; - } + log->Printf("SoftwareBreakpoint::%s failed to read memory while " + "attempting to set breakpoint: %s", + __FUNCTION__, error.AsCString()); + return error; + } - // Ensure we read as many verification bytes as we expected. - if (verify_bytes_read != bp_opcode_size) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s failed to read memory while attempting to verify breakpoint: attempted to read %lu bytes but only read %" PRIu64, __FUNCTION__, bp_opcode_size, (uint64_t)verify_bytes_read); - return Error ("SoftwareBreakpoint::%s failed to read memory while attempting to verify breakpoint: attempted to read %lu bytes but only read %" PRIu64, __FUNCTION__, bp_opcode_size, (uint64_t)verify_bytes_read); + // Ensure we read as many bytes as we expected. + if (bytes_read != bp_opcode_size) { + if (log) + log->Printf("SoftwareBreakpoint::%s failed to read memory while " + "attempting to set breakpoint: attempted to read %zu bytes " + "but only read %zu", + __FUNCTION__, bp_opcode_size, bytes_read); + return Error("SoftwareBreakpoint::%s failed to read memory while " + "attempting to set breakpoint: attempted to read %zu bytes " + "but only read %zu", + __FUNCTION__, bp_opcode_size, bytes_read); + } + + // Log what we read. + if (log) { + int i = 0; + for (const uint8_t *read_byte = saved_opcode_bytes; + read_byte < saved_opcode_bytes + bp_opcode_size; ++read_byte) { + log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64 + " ovewriting byte index %d (was 0x%hhx)", + __FUNCTION__, addr, i++, *read_byte); } + } - if (::memcmp(bp_opcode_bytes, verify_bp_opcode_bytes, bp_opcode_size) != 0) - { - if (log) - log->Printf ("SoftwareBreakpoint::%s: verification of software breakpoint writing failed - trap opcodes not successfully read back after writing when setting breakpoint at 0x%" PRIx64, __FUNCTION__, addr); - return Error ("SoftwareBreakpoint::%s: verification of software breakpoint writing failed - trap opcodes not successfully read back after writing when setting breakpoint at 0x%" PRIx64, __FUNCTION__, addr); - } + // Write a software breakpoint in place of the original opcode. + size_t bytes_written = 0; + error = + process.WriteMemory(addr, bp_opcode_bytes, bp_opcode_size, bytes_written); + if (error.Fail()) { + if (log) + log->Printf("SoftwareBreakpoint::%s failed to write memory while " + "attempting to set breakpoint: %s", + __FUNCTION__, error.AsCString()); + return error; + } + + // Ensure we wrote as many bytes as we expected. + if (bytes_written != bp_opcode_size) { + error.SetErrorStringWithFormat( + "SoftwareBreakpoint::%s failed write memory while attempting to set " + "breakpoint: attempted to write %zu bytes but only wrote %zu", + __FUNCTION__, bp_opcode_size, bytes_written); + if (log) + log->PutCString(error.AsCString()); + return error; + } + uint8_t verify_bp_opcode_bytes[MAX_TRAP_OPCODE_SIZE]; + size_t verify_bytes_read = 0; + error = process.ReadMemory(addr, verify_bp_opcode_bytes, bp_opcode_size, + verify_bytes_read); + if (error.Fail()) { if (log) - log->Printf ("SoftwareBreakpoint::%s addr = 0x%" PRIx64 " -- SUCCESS", __FUNCTION__, addr); + log->Printf("SoftwareBreakpoint::%s failed to read memory while " + "attempting to verify the breakpoint set: %s", + __FUNCTION__, error.AsCString()); + return error; + } - return Error (); + // Ensure we read as many verification bytes as we expected. + if (verify_bytes_read != bp_opcode_size) { + if (log) + log->Printf("SoftwareBreakpoint::%s failed to read memory while " + "attempting to verify breakpoint: attempted to read %zu " + "bytes but only read %zu", + __FUNCTION__, bp_opcode_size, verify_bytes_read); + return Error("SoftwareBreakpoint::%s failed to read memory while " + "attempting to verify breakpoint: attempted to read %zu bytes " + "but only read %zu", + __FUNCTION__, bp_opcode_size, verify_bytes_read); + } + + if (::memcmp(bp_opcode_bytes, verify_bp_opcode_bytes, bp_opcode_size) != 0) { + if (log) + log->Printf("SoftwareBreakpoint::%s: verification of software breakpoint " + "writing failed - trap opcodes not successfully read back " + "after writing when setting breakpoint at 0x%" PRIx64, + __FUNCTION__, addr); + return Error("SoftwareBreakpoint::%s: verification of software breakpoint " + "writing failed - trap opcodes not successfully read back " + "after writing when setting breakpoint at 0x%" PRIx64, + __FUNCTION__, addr); + } + + if (log) + log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64 " -- SUCCESS", + __FUNCTION__, addr); + + return Error(); } // ------------------------------------------------------------------- // instance-level members // ------------------------------------------------------------------- -SoftwareBreakpoint::SoftwareBreakpoint (NativeProcessProtocol &process, lldb::addr_t addr, const uint8_t *saved_opcodes, const uint8_t *trap_opcodes, size_t opcode_size) : - NativeBreakpoint (addr), - m_process (process), - m_saved_opcodes (), - m_trap_opcodes (), - m_opcode_size (opcode_size) -{ - assert ( opcode_size > 0 && "setting software breakpoint with no trap opcodes"); - assert ( opcode_size <= MAX_TRAP_OPCODE_SIZE && "trap opcode size too large"); - - ::memcpy (m_saved_opcodes, saved_opcodes, opcode_size); - ::memcpy (m_trap_opcodes, trap_opcodes, opcode_size); +SoftwareBreakpoint::SoftwareBreakpoint(NativeProcessProtocol &process, + lldb::addr_t addr, + const uint8_t *saved_opcodes, + const uint8_t *trap_opcodes, + size_t opcode_size) + : NativeBreakpoint(addr), m_process(process), m_saved_opcodes(), + m_trap_opcodes(), m_opcode_size(opcode_size) { + assert(opcode_size > 0 && "setting software breakpoint with no trap opcodes"); + assert(opcode_size <= MAX_TRAP_OPCODE_SIZE && "trap opcode size too large"); + + ::memcpy(m_saved_opcodes, saved_opcodes, opcode_size); + ::memcpy(m_trap_opcodes, trap_opcodes, opcode_size); } -Error -SoftwareBreakpoint::DoEnable () -{ - return EnableSoftwareBreakpoint (m_process, m_addr, m_opcode_size, m_trap_opcodes, m_saved_opcodes); +Error SoftwareBreakpoint::DoEnable() { + return EnableSoftwareBreakpoint(m_process, m_addr, m_opcode_size, + m_trap_opcodes, m_saved_opcodes); } -Error -SoftwareBreakpoint::DoDisable () -{ - Error error; - assert (m_addr && (m_addr != LLDB_INVALID_ADDRESS) && "can't remove a software breakpoint for an invalid address"); +Error SoftwareBreakpoint::DoDisable() { + Error error; + assert(m_addr && (m_addr != LLDB_INVALID_ADDRESS) && + "can't remove a software breakpoint for an invalid address"); - Log *log (GetLogIfAnyCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); - if (log) - log->Printf ("SoftwareBreakpoint::%s addr = 0x%" PRIx64, __FUNCTION__, m_addr); - - assert ( (m_opcode_size > 0) && "cannot restore opcodes when there are no opcodes"); - - if (m_opcode_size > 0) - { - // Clear a software breakpoint instruction - uint8_t curr_break_op [MAX_TRAP_OPCODE_SIZE]; - bool break_op_found = false; - assert (m_opcode_size <= sizeof (curr_break_op)); - - // Read the breakpoint opcode - size_t bytes_read = 0; - error = m_process.ReadMemory (m_addr, curr_break_op, m_opcode_size, bytes_read); - if (error.Success() && bytes_read < m_opcode_size) - { - error.SetErrorStringWithFormat ("SoftwareBreakpointr::%s addr=0x%" PRIx64 ": tried to read %lu bytes but only read %" PRIu64, __FUNCTION__, m_addr, m_opcode_size, (uint64_t)bytes_read); - } - if (error.Success ()) - { - bool verify = false; - // Make sure the breakpoint opcode exists at this address - if (::memcmp (curr_break_op, m_trap_opcodes, m_opcode_size) == 0) - { - break_op_found = true; - // We found a valid breakpoint opcode at this address, now restore - // the saved opcode. - size_t bytes_written = 0; - error = m_process.WriteMemory (m_addr, m_saved_opcodes, m_opcode_size, bytes_written); - if (error.Success() && bytes_written < m_opcode_size) - { - error.SetErrorStringWithFormat ("SoftwareBreakpoint::%s addr=0x%" PRIx64 ": tried to write %lu bytes but only wrote %" PRIu64, __FUNCTION__, m_addr, m_opcode_size, (uint64_t)bytes_written); - } - if (error.Success ()) - { - verify = true; - } - } - else - { - error.SetErrorString("Original breakpoint trap is no longer in memory."); - // Set verify to true and so we can check if the original opcode has already been restored - verify = true; - } + Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_BREAKPOINTS)); + if (log) + log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64, __FUNCTION__, + m_addr); - if (verify) - { - uint8_t verify_opcode [MAX_TRAP_OPCODE_SIZE]; - assert (m_opcode_size <= sizeof (verify_opcode)); - // Verify that our original opcode made it back to the inferior - - size_t verify_bytes_read = 0; - error = m_process.ReadMemory (m_addr, verify_opcode, m_opcode_size, verify_bytes_read); - if (error.Success() && verify_bytes_read < m_opcode_size) - { - error.SetErrorStringWithFormat ("SoftwareBreakpoint::%s addr=0x%" PRIx64 ": tried to read %lu verification bytes but only read %" PRIu64, __FUNCTION__, m_addr, m_opcode_size, (uint64_t)verify_bytes_read); - } - if (error.Success ()) - { - // compare the memory we just read with the original opcode - if (::memcmp (m_saved_opcodes, verify_opcode, m_opcode_size) == 0) - { - // SUCCESS - if (log) - { - int i = 0; - for (const uint8_t *verify_byte = verify_opcode; verify_byte < verify_opcode + m_opcode_size; ++verify_byte) - { - log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64 - " replaced byte index %d with 0x%hhx", - __FUNCTION__, m_addr, i++, *verify_byte); - } - log->Printf ("SoftwareBreakpoint::%s addr = 0x%" PRIx64 " -- SUCCESS", __FUNCTION__, m_addr); - } - return error; - } - else - { - if (break_op_found) - error.SetErrorString("Failed to restore original opcode."); - } - } - else - error.SetErrorString("Failed to read memory to verify that breakpoint trap was restored."); - } + assert((m_opcode_size > 0) && + "cannot restore opcodes when there are no opcodes"); + + if (m_opcode_size > 0) { + // Clear a software breakpoint instruction + uint8_t curr_break_op[MAX_TRAP_OPCODE_SIZE]; + bool break_op_found = false; + assert(m_opcode_size <= sizeof(curr_break_op)); + + // Read the breakpoint opcode + size_t bytes_read = 0; + error = + m_process.ReadMemory(m_addr, curr_break_op, m_opcode_size, bytes_read); + if (error.Success() && bytes_read < m_opcode_size) { + error.SetErrorStringWithFormat( + "SoftwareBreakpointr::%s addr=0x%" PRIx64 + ": tried to read %zu bytes but only read %zu", + __FUNCTION__, m_addr, m_opcode_size, bytes_read); + } + if (error.Success()) { + bool verify = false; + // Make sure the breakpoint opcode exists at this address + if (::memcmp(curr_break_op, m_trap_opcodes, m_opcode_size) == 0) { + break_op_found = true; + // We found a valid breakpoint opcode at this address, now restore + // the saved opcode. + size_t bytes_written = 0; + error = m_process.WriteMemory(m_addr, m_saved_opcodes, m_opcode_size, + bytes_written); + if (error.Success() && bytes_written < m_opcode_size) { + error.SetErrorStringWithFormat( + "SoftwareBreakpoint::%s addr=0x%" PRIx64 + ": tried to write %zu bytes but only wrote %zu", + __FUNCTION__, m_addr, m_opcode_size, bytes_written); } + if (error.Success()) { + verify = true; + } + } else { + error.SetErrorString( + "Original breakpoint trap is no longer in memory."); + // Set verify to true and so we can check if the original opcode has + // already been restored + verify = true; + } + + if (verify) { + uint8_t verify_opcode[MAX_TRAP_OPCODE_SIZE]; + assert(m_opcode_size <= sizeof(verify_opcode)); + // Verify that our original opcode made it back to the inferior + + size_t verify_bytes_read = 0; + error = m_process.ReadMemory(m_addr, verify_opcode, m_opcode_size, + verify_bytes_read); + if (error.Success() && verify_bytes_read < m_opcode_size) { + error.SetErrorStringWithFormat( + "SoftwareBreakpoint::%s addr=0x%" PRIx64 + ": tried to read %zu verification bytes but only read %zu", + __FUNCTION__, m_addr, m_opcode_size, verify_bytes_read); + } + if (error.Success()) { + // compare the memory we just read with the original opcode + if (::memcmp(m_saved_opcodes, verify_opcode, m_opcode_size) == 0) { + // SUCCESS + if (log) { + int i = 0; + for (const uint8_t *verify_byte = verify_opcode; + verify_byte < verify_opcode + m_opcode_size; ++verify_byte) { + log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64 + " replaced byte index %d with 0x%hhx", + __FUNCTION__, m_addr, i++, *verify_byte); + } + log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64 + " -- SUCCESS", + __FUNCTION__, m_addr); + } + return error; + } else { + if (break_op_found) + error.SetErrorString("Failed to restore original opcode."); + } + } else + error.SetErrorString("Failed to read memory to verify that " + "breakpoint trap was restored."); + } } + } - if (log && error.Fail ()) - log->Printf ("SoftwareBreakpoint::%s addr = 0x%" PRIx64 " -- FAILED: %s", - __FUNCTION__, - m_addr, - error.AsCString()); - return error; -} - -bool -SoftwareBreakpoint::IsSoftwareBreakpoint () const -{ - return true; + if (log && error.Fail()) + log->Printf("SoftwareBreakpoint::%s addr = 0x%" PRIx64 " -- FAILED: %s", + __FUNCTION__, m_addr, error.AsCString()); + return error; } +bool SoftwareBreakpoint::IsSoftwareBreakpoint() const { return true; } |