diff options
author | dim <dim@FreeBSD.org> | 2016-01-06 22:02:08 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2016-01-06 22:02:08 +0000 |
commit | 1545bf9b100bc129c54c444b1213bf9210d855f4 (patch) | |
tree | 9fb8b9926e8d68540a6874a42127d7bd873c505f /contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD | |
parent | 90a2cc030c5633b2f7afbfda628c7663ed19571e (diff) | |
download | FreeBSD-src-1545bf9b100bc129c54c444b1213bf9210d855f4.zip FreeBSD-src-1545bf9b100bc129c54c444b1213bf9210d855f4.tar.gz |
Update lldb to trunk r256945.
Diffstat (limited to 'contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD')
-rw-r--r-- | contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h | 4 | ||||
-rw-r--r-- | contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h index 54a3e85..44eefab 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h @@ -88,7 +88,7 @@ public: DoAttachToProcessWithID (lldb::pid_t pid, const lldb_private::ProcessAttachInfo &attach_info) override; lldb_private::Error - DoLaunch (lldb_private::Module *exe_module, + DoLaunch (lldb_private::Module *exe_module, lldb_private::ProcessLaunchInfo &launch_info) override; void @@ -160,7 +160,7 @@ public: UpdateThreadListIfNeeded(); bool - UpdateThreadList(lldb_private::ThreadList &old_thread_list, + UpdateThreadList(lldb_private::ThreadList &old_thread_list, lldb_private::ThreadList &new_thread_list) override; virtual lldb::ByteOrder diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp index ceb527b..cd016fb 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp +++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp @@ -317,7 +317,7 @@ ReadRegOperation::Execute(ProcessMonitor *monitor) else if (m_size == sizeof(uint64_t)) m_value = *(uint64_t *)(((caddr_t)®s) + m_offset); else - memcpy(&m_value, (((caddr_t)®s) + m_offset), m_size); + memcpy((void *)&m_value, (((caddr_t)®s) + m_offset), m_size); m_result = true; } } @@ -393,7 +393,7 @@ ReadDebugRegOperation::Execute(ProcessMonitor *monitor) if (m_size == sizeof(uintptr_t)) m_value = *(uintptr_t *)(((caddr_t)®s) + m_offset); else - memcpy(&m_value, (((caddr_t)®s) + m_offset), m_size); + memcpy((void *)&m_value, (((caddr_t)®s) + m_offset), m_size); m_result = true; } } |