Merge pull request #149 from amboar/arm32

ptrace: Abstract over user_regs_struct name, which differs on ARM32

Author: eklitzke

src/ptrace.cc

@@ -122,8 +122,8 @@ void PtraceInterrupt(pid_t pid) {
   DoWait(pid);
 }
 
-struct user_regs_struct PtraceGetRegs(pid_t pid) {
-  struct user_regs_struct regs;
+user_regs_struct PtraceGetRegs(pid_t pid) {
+  user_regs_struct regs;
   if (ptrace(PTRACE_GETREGS, pid, 0, &regs)) {
     std::ostringstream ss;
     ss << "Failed to PTRACE_GETREGS: " << strerror(errno);
@@ -132,7 +132,7 @@ struct user_regs_struct PtraceGetRegs(pid_t pid) {
   return regs;
 }
 
-void PtraceSetRegs(pid_t pid, struct user_regs_struct regs) {
+void PtraceSetRegs(pid_t pid, user_regs_struct regs) {
   if (ptrace(PTRACE_SETREGS, pid, 0, &regs)) {
     std::ostringstream ss;
     ss << "Failed to PTRACE_SETREGS: " << strerror(errno);

src/ptrace.h

@@ -23,6 +23,12 @@
 
 #include "./config.h"
 
+#if defined(__arm__)
+typedef struct user_regs user_regs_struct;
+#else
+typedef struct user_regs_struct user_regs_struct;
+#endif
+
 namespace pyflame {
 
 int DoWait(pid_t pid, int options = 0);
@@ -39,10 +45,10 @@ void PtraceSeize(pid_t pid);
 void PtraceInterrupt(pid_t pid);
 
 // get regs from a process
-struct user_regs_struct PtraceGetRegs(pid_t pid);
+user_regs_struct PtraceGetRegs(pid_t pid);
 
 // set regs in a process
-void PtraceSetRegs(pid_t pid, struct user_regs_struct regs);
+void PtraceSetRegs(pid_t pid, user_regs_struct regs);
 
 // poke a long word into an address
 void PtracePoke(pid_t pid, unsigned long addr, long data);