lldb gdb inspired use of ptrace on arm64

[pawelo]

Summary

I looked how it is done in gdb, and found that this piece of code must be rewritten.

[pawelo]

improved version that covers ProcessMonitor too

[tfiala]

Thanks Paul. I'll have a look today.

[tfiala]

Looking at this now.

[tfiala]

Hey Paul,

I have just a few questions that all boil down to checking if we need a guard #ifdef around a particular pattern in the code above. (See code-inlined comments).

Aside from that, LGTM.

Tested:
Ubuntu 14.04 x86_64, clang-3.5-built lldb, all tests passed.

source/Plugins/Process/Linux/ProcessMonitor.cpp

581

Do we need an analog of #ifdef PT_GETREGS (as the x86 side has) here?

621

The x86 code is guarded by a #ifdef PT_GETFPREGS. Do we have/need an analog for that here?

690

The x86-based call was guarded by an ifdef on the PT_SETREGS define. Do we need an analog here for PTRACE_SETREGSET?

730

Do we need an analog of #ifdef PT_SETFPREGS here?

[pawelo]

All those PT_* ifdefs were related to ARM64, so I suppose they can be safely removed.

[tfiala]

Ok - that sounds good. Would you like to pull those out and put it in this
patch, since they seem to be atomically related?

[pawelo]

Improved version (I hope I did it well).

[tfiala]

Hey Paul - I'll be looking to get your patches in today (I was OOO
yesterday).

[tfiala]

Ok - those were the changes I was looking for. Thanks for cleaning up those other #ifdefs, Paul. Testing now.

[tfiala]

LGTM.

Tested:
Ubuntu 14.04 x86_64: clang-3.5-built lldb. All local tests passed.

[tfiala]

svn commit
Sending source/Plugins/Process/Linux/NativeProcessLinux.cpp
Sending source/Plugins/Process/Linux/ProcessMonitor.cpp
Transmitting file data ..
Committed revision 216185.

source/Plugins/Process/Linux/NativeProcessLinux.cpp

 // C Includes
 #include <errno.h>
 #include <poll.h>
 #include <string.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <linux/unistd.h>
 #include <sys/ptrace.h>
+#include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/user.h>
 #include <sys/wait.h>
 
+#if defined (__arm64__) || defined (__aarch64__)
+// NT_PRSTATUS and NT_FPREGSET definition
+#include <elf.h>
+#endif
+
 // C++ Includes
 #include <fstream>
 #include <string>
 
 // Other libraries and framework includes
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Module.h"
private:
         void *m_buf;
         size_t m_buf_size;
         bool &m_result;
     };
 
     void
     ReadGPROperation::Execute(NativeProcessLinux *monitor)
     {
+#if defined (__arm64__) || defined (__aarch64__)
+        int regset = NT_PRSTATUS;
+        struct iovec ioVec;
+
+        ioVec.iov_base = m_buf;
+        ioVec.iov_len = m_buf_size;
+        if (PTRACE(PTRACE_GETREGSET, m_tid, &regset, &ioVec, m_buf_size) < 0)
+            m_result = false;
+        else
+            m_result = true;
+#else
         if (PTRACE(PTRACE_GETREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
             m_result = false;
         else
             m_result = true;
+#endif
     }
 
     //------------------------------------------------------------------------------
     /// @class ReadFPROperation
     /// @brief Implements NativeProcessLinux::ReadFPR.
     class ReadFPROperation : public Operation
     {
     public:
         ReadFPROperation(lldb::tid_t tid, void *buf, size_t buf_size, bool &result)
             : m_tid(tid), m_buf(buf), m_buf_size(buf_size), m_result(result)
             { }
 
         void Execute(NativeProcessLinux *monitor);
 
     private:
         lldb::tid_t m_tid;
         void *m_buf;
         size_t m_buf_size;
         bool &m_result;
     };
 
     void
     ReadFPROperation::Execute(NativeProcessLinux *monitor)
     {
+#if defined (__arm64__) || defined (__aarch64__)
+        int regset = NT_FPREGSET;
+        struct iovec ioVec;
+
+        ioVec.iov_base = m_buf;
+        ioVec.iov_len = m_buf_size;
+        if (PTRACE(PTRACE_GETREGSET, m_tid, &regset, &ioVec, m_buf_size) < 0)
+            m_result = false;
+        else
+            m_result = true;
+#else
         if (PTRACE(PTRACE_GETFPREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
             m_result = false;
         else
             m_result = true;
+#endif
     }
 
     //------------------------------------------------------------------------------
     /// @class ReadRegisterSetOperation
     /// @brief Implements NativeProcessLinux::ReadRegisterSet.
     class ReadRegisterSetOperation : public Operation
     {
     public:
private:
         void *m_buf;
         size_t m_buf_size;
         bool &m_result;
     };
 
     void
     WriteGPROperation::Execute(NativeProcessLinux *monitor)
     {
+#if defined (__arm64__) || defined (__aarch64__)
+        int regset = NT_PRSTATUS;
+        struct iovec ioVec;
+
+        ioVec.iov_base = m_buf;
+        ioVec.iov_len = m_buf_size;
+        if (PTRACE(PTRACE_SETREGSET, m_tid, &regset, &ioVec, m_buf_size) < 0)
+            m_result = false;
+        else
+            m_result = true;
+#else
         if (PTRACE(PTRACE_SETREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
             m_result = false;
         else
             m_result = true;
+#endif
     }
 
     //------------------------------------------------------------------------------
     /// @class WriteFPROperation
     /// @brief Implements NativeProcessLinux::WriteFPR.
     class WriteFPROperation : public Operation
     {
     public:
         WriteFPROperation(lldb::tid_t tid, void *buf, size_t buf_size, bool &result)
             : m_tid(tid), m_buf(buf), m_buf_size(buf_size), m_result(result)
             { }
 
         void Execute(NativeProcessLinux *monitor);
 
     private:
         lldb::tid_t m_tid;
         void *m_buf;
         size_t m_buf_size;
         bool &m_result;
     };
 
     void
     WriteFPROperation::Execute(NativeProcessLinux *monitor)
     {
+#if defined (__arm64__) || defined (__aarch64__)
+        int regset = NT_FPREGSET;
+        struct iovec ioVec;
+
+        ioVec.iov_base = m_buf;
+        ioVec.iov_len = m_buf_size;
+        if (PTRACE(PTRACE_SETREGSET, m_tid, &regset, &ioVec, m_buf_size) < 0)
+            m_result = false;
+        else
+            m_result = true;
+#else
         if (PTRACE(PTRACE_SETFPREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
             m_result = false;
         else
             m_result = true;
+#endif
     }
 
     //------------------------------------------------------------------------------
     /// @class WriteRegisterSetOperation
     /// @brief Implements NativeProcessLinux::WriteRegisterSet.
     class WriteRegisterSetOperation : public Operation
     {
     public:

source/Plugins/Process/Linux/ProcessMonitor.cpp

 
 // C Includes
 #include <errno.h>
 #include <poll.h>
 #include <string.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <sys/ptrace.h>
+#include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/user.h>
 #include <sys/wait.h>
 
+#if defined (__arm64__) || defined (__aarch64__)
+// NT_PRSTATUS and NT_FPREGSET definition
+#include <elf.h>
+#endif
+
 // C++ Includes
 // Other libraries and framework includes
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Core/RegisterValue.h"
 #include "lldb/Core/Scalar.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Target/Thread.h"
if (verbose_log)
                 break;
             }
         case PTRACE_POKEUSER:
             {
                 DisplayBytes(buf, &data, 8);
                 verbose_log->Printf("PTRACE_POKEUSER %s", buf.GetData());
                 break;
             }
-#ifdef PT_SETREGS
+#if !defined (__arm64__) && !defined (__aarch64__)
         case PTRACE_SETREGS:
             {
                 DisplayBytes(buf, data, data_size);
                 verbose_log->Printf("PTRACE_SETREGS %s", buf.GetData());
                 break;
             }
-#endif
-#ifdef PT_SETFPREGS
         case PTRACE_SETFPREGS:
             {
                 DisplayBytes(buf, data, data_size);
                 verbose_log->Printf("PTRACE_SETFPREGS %s", buf.GetData());
                 break;
             }
 #endif
         case PTRACE_SETSIGINFO:
private:
     void *m_buf;
     size_t m_buf_size;
     bool &m_result;
 };
 
 void
 ReadGPROperation::Execute(ProcessMonitor *monitor)
 {
-#ifdef PT_GETREGS
-    if (PTRACE(PTRACE_GETREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
+#if defined (__arm64__) || defined (__aarch64__)
+    int regset = NT_PRSTATUS;
+    struct iovec ioVec;
+
+    ioVec.iov_base = m_buf;
+    ioVec.iov_len = m_buf_size;
+    if (PTRACE(PTRACE_GETREGSET, m_tid, &regset, &ioVec, m_buf_size) < 0)
         m_result = false;
     else
         m_result = true;
 #else
+    if (PTRACE(PTRACE_GETREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
         m_result = false;
+    else
+        m_result = true;
 #endif
 }
 
 //------------------------------------------------------------------------------
 /// @class ReadFPROperation
 /// @brief Implements ProcessMonitor::ReadFPR.
 class ReadFPROperation : public Operation
 {
private:
     void *m_buf;
     size_t m_buf_size;
     bool &m_result;
 };
 
 void
 ReadFPROperation::Execute(ProcessMonitor *monitor)
 {
-#ifdef PT_GETFPREGS
-    if (PTRACE(PTRACE_GETFPREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
+#if defined (__arm64__) || defined (__aarch64__)
+    int regset = NT_FPREGSET;
+    struct iovec ioVec;
+
+    ioVec.iov_base = m_buf;
+    ioVec.iov_len = m_buf_size;
+    if (PTRACE(PTRACE_GETREGSET, m_tid, &regset, &ioVec, m_buf_size) < 0)
         m_result = false;
     else
         m_result = true;
 #else
+    if (PTRACE(PTRACE_GETFPREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
         m_result = false;
+    else
+        m_result = true;
 #endif
 }
 
 //------------------------------------------------------------------------------
 /// @class ReadRegisterSetOperation
 /// @brief Implements ProcessMonitor::ReadRegisterSet.
 class ReadRegisterSetOperation : public Operation
 {
private:
     void *m_buf;
     size_t m_buf_size;
     bool &m_result;
 };
 
 void
 WriteGPROperation::Execute(ProcessMonitor *monitor)
 {
-#ifdef PT_SETREGS
-    if (PTRACE(PTRACE_SETREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
+#if defined (__arm64__) || defined (__aarch64__)
+    int regset = NT_PRSTATUS;
+    struct iovec ioVec;
+
+    ioVec.iov_base = m_buf;
+    ioVec.iov_len = m_buf_size;
+    if (PTRACE(PTRACE_SETREGSET, m_tid, &regset, &ioVec, m_buf_size) < 0)
         m_result = false;
     else
         m_result = true;
 #else
+    if (PTRACE(PTRACE_SETREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
         m_result = false;
+    else
+        m_result = true;
 #endif
 }
 
 //------------------------------------------------------------------------------
 /// @class WriteFPROperation
 /// @brief Implements ProcessMonitor::WriteFPR.
 class WriteFPROperation : public Operation
 {
private:
     void *m_buf;
     size_t m_buf_size;
     bool &m_result;
 };
 
 void
 WriteFPROperation::Execute(ProcessMonitor *monitor)
 {
-#ifdef PT_SETFPREGS
-    if (PTRACE(PTRACE_SETFPREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
+#if defined (__arm64__) || defined (__aarch64__)
+    int regset = NT_FPREGSET;
+    struct iovec ioVec;
+
+    ioVec.iov_base = m_buf;
+    ioVec.iov_len = m_buf_size;
+    if (PTRACE(PTRACE_SETREGSET, m_tid, &regset, &ioVec, m_buf_size) < 0)
         m_result = false;
     else
         m_result = true;
 #else
+    if (PTRACE(PTRACE_SETFPREGS, m_tid, NULL, m_buf, m_buf_size) < 0)
         m_result = false;
+    else
+        m_result = true;
 #endif
 }
 
 //------------------------------------------------------------------------------
 /// @class WriteRegisterSetOperation
 /// @brief Implements ProcessMonitor::WriteRegisterSet.
 class WriteRegisterSetOperation : public Operation
 {