Build fixes for FreeBSD 9.1.
- TODO: Support extended register sets on FreeBSD.
Patch by Samuel Jacob.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@180879 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Host/common/Host.cpp b/source/Host/common/Host.cpp
index 6631faf..f5f8dd2 100644
--- a/source/Host/common/Host.cpp
+++ b/source/Host/common/Host.cpp
@@ -150,6 +150,9 @@
delete info;
int status = -1;
+#if defined (__FreeBSD__)
+ #define __WALL 0
+#endif
const int options = __WALL;
while (1)
@@ -1392,7 +1395,7 @@
static uint32_t g_num_cores = UINT32_MAX;
if (g_num_cores == UINT32_MAX)
{
-#if defined(__APPLE__) or defined (__linux__)
+#if defined(__APPLE__) or defined (__linux__) or defined (__FreeBSD__)
g_num_cores = ::sysconf(_SC_NPROCESSORS_ONLN);
diff --git a/source/Host/freebsd/Host.cpp b/source/Host/freebsd/Host.cpp
index 7671cce..12d8110 100644
--- a/source/Host/freebsd/Host.cpp
+++ b/source/Host/freebsd/Host.cpp
@@ -185,7 +185,7 @@
if (::sysctl (mib, 4, arg_data, &arg_data_size , NULL, 0) == 0)
{
DataExtractor data (arg_data, arg_data_size, lldb::endian::InlHostByteOrder(), sizeof(void *));
- uint32_t offset = 0;
+ lldb::offset_t offset = 0;
const char *cstr;
cstr = data.GetCStr (&offset);
diff --git a/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp b/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
index b92e772..f2b1e9d 100644
--- a/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
+++ b/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
@@ -117,11 +117,11 @@
// Wrapper for ptrace when logging is not required.
// Sets errno to 0 prior to calling ptrace.
extern long
-PtraceWrapper(__ptrace_request req, lldb::pid_t pid, void *addr, int data)
+PtraceWrapper(int req, lldb::pid_t pid, void *addr, int data)
{
long result = 0;
errno = 0;
- result = ptrace(req, pid, addr, data);
+ result = ptrace(req, pid, (caddr_t)addr, data);
return result;
}
@@ -980,7 +980,7 @@
goto FINISH;
// Update the process thread list with this new thread.
- inferior.reset(new POSIXThread(processSP, pid));
+ inferior.reset(new POSIXThread(*processSP, pid));
process.GetThreadList().AddThread(inferior);
// Let our process instance know the thread has stopped.
@@ -1066,7 +1066,7 @@
}
// Update the process thread list with the attached thread.
- inferior.reset(new POSIXThread(processSP, pid));
+ inferior.reset(new POSIXThread(*processSP, pid));
tl.AddThread(inferior);
// Let our process instance know the thread has stopped.
@@ -1457,6 +1457,19 @@
}
bool
+ProcessMonitor::ReadRegisterSet(lldb::tid_t tid, void *buf, size_t buf_size, unsigned int regset)
+{
+ return false;
+}
+
+bool
+ProcessMonitor::WriteRegisterSet(lldb::tid_t tid, void *buf, size_t buf_size, unsigned int regset)
+{
+ return false;
+}
+
+
+bool
ProcessMonitor::ReadGPR(lldb::tid_t tid, void *buf, size_t buf_size)
{
bool result;
diff --git a/source/Plugins/Process/FreeBSD/ProcessMonitor.h b/source/Plugins/Process/FreeBSD/ProcessMonitor.h
index bc0fbdf..0762ef9 100644
--- a/source/Plugins/Process/FreeBSD/ProcessMonitor.h
+++ b/source/Plugins/Process/FreeBSD/ProcessMonitor.h
@@ -132,6 +132,14 @@
bool
ReadFPR(lldb::tid_t tid, void *buf, size_t buf_size);
+ /// Reads the specified register set into the specified buffer.
+ ///
+ /// This method is provided for use by RegisterContextFreeBSD derivatives.
+ /// FIXME: The FreeBSD implementation of this function should use tid in order
+ /// to enable support for debugging threaded programs.
+ bool
+ ReadRegisterSet(lldb::tid_t tid, void *buf, size_t buf_size, unsigned int regset);
+
/// Writes all general purpose registers into the specified buffer.
/// FIXME: The FreeBSD implementation of this function should use tid in order
/// to enable support for debugging threaded programs.
@@ -142,12 +150,20 @@
/// FIXME: The FreeBSD implementation of this function should use tid in order
/// to enable support for debugging threaded programs.
bool
- WriteFPR(lldb::tid_t tid, void *buf);
+ WriteFPR(lldb::tid_t tid, void *buf, size_t buf_size);
+
+ /// Writes the specified register set into the specified buffer.
+ ///
+ /// This method is provided for use by RegisterContextFreeBSD derivatives.
+ /// FIXME: The FreeBSD implementation of this function should use tid in order
+ /// to enable support for debugging threaded programs.
+ bool
+ WriteRegisterSet(lldb::tid_t tid, void *buf, size_t buf_size, unsigned int regset);
/// Writes a siginfo_t structure corresponding to the given thread ID to the
/// memory region pointed to by @p siginfo.
bool
- GetSignalInfo(lldb::tid_t tid, void *siginfo, int &errno);
+ GetSignalInfo(lldb::tid_t tid, void *siginfo, int &error_no);
/// Writes the raw event message code (vis-a-vis PTRACE_GETEVENTMSG)
/// corresponding to the given thread IDto the memory pointed to by @p