vendor/lldb/lldb-trunk-r256945

5 files changed, 38 insertions, 7 deletions

diff --git a/source/Plugins/Process/FreeBSD/CMakeLists.txt b/source/Plugins/Process/FreeBSD/CMakeLists.txt
new file mode 100644
index 0000000000000..c0e3374fef89e
--- /dev/null
+++ b/source/Plugins/Process/FreeBSD/CMakeLists.txt
@@ -0,0 +1,16 @@
+include_directories(.)
+include_directories(../POSIX)
+include_directories(../Utility)
+
+add_lldb_library(lldbPluginProcessFreeBSD
+  ProcessFreeBSD.cpp
+  FreeBSDThread.cpp
+  ProcessMonitor.cpp
+
+  POSIXStopInfo.cpp
+  RegisterContextPOSIXProcessMonitor_arm.cpp
+  RegisterContextPOSIXProcessMonitor_arm64.cpp
+  RegisterContextPOSIXProcessMonitor_powerpc.cpp
+  RegisterContextPOSIXProcessMonitor_x86.cpp
+  RegisterContextPOSIXProcessMonitor_mips64.cpp
+  )
diff --git a/source/Plugins/Process/FreeBSD/Makefile b/source/Plugins/Process/FreeBSD/Makefile
new file mode 100644
index 0000000000000..7f546540e5566
--- /dev/null
+++ b/source/Plugins/Process/FreeBSD/Makefile
@@ -0,0 +1,17 @@
+##===- source/Plugins/Process/FreeBSD/Makefile ---------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../../..
+LIBRARYNAME := lldbPluginProcessFreeBSD
+BUILD_ARCHIVE = 1
+
+# Extend the include path so we may locate UnwindLLDB.h
+CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Utility
+
+include $(LLDB_LEVEL)/Makefile
diff --git a/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h b/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
index 3cc46f4898756..5f9365418d7af 100644
--- a/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
+++ b/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/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp b/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
index ceb527b61d80e..cd016fbd4b8c5 100644
--- a/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
+++ b/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)&regs) + m_offset);
         else
-            memcpy(&m_value, (((caddr_t)&regs) + m_offset), m_size);
+            memcpy((void *)&m_value, (((caddr_t)&regs) + 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)&regs) + m_offset);
         else
-            memcpy(&m_value, (((caddr_t)&regs) + m_offset), m_size);
+            memcpy((void *)&m_value, (((caddr_t)&regs) + m_offset), m_size);
         m_result = true;
     }
 }
diff --git a/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp b/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp
index 012f4b6e15554..a1a0cab82a150 100644
--- a/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp
+++ b/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp
@@ -260,9 +260,7 @@ RegisterContextPOSIXProcessMonitor_arm64::HardwareSingleStep(bool enable)
 bool
 RegisterContextPOSIXProcessMonitor_arm64::UpdateAfterBreakpoint()
 {
-    lldb::addr_t pc;
-
-    if ((pc = GetPC()) == LLDB_INVALID_ADDRESS)
+    if (GetPC() == LLDB_INVALID_ADDRESS)
         return false;
 
     return true;