Changeset 2501

Timestamp:

07/01/08 01:26:12 (5 years ago)

Author:

sam

Message:

• Preparing the amd64 port of grab.c by first making the current i386-specific code compile.

File:

• neercs/trunk/src/grab.c (modified) (11 diffs)

neercs/trunk/src/grab.c

@@ -39 +39 @@
 #include "neercs.h"
 
+#if defined __x86_64__
+#   define RAX rax
+#   define RBX rbx
+#   define RCX rcx
+#   define RDX rdx
+#   define RSP rsp
+#   define RIP rip
+#else
+#   define RAX eax
+#   define RBX ebx
+#   define RCX ecx
+#   define RDX edx
+#   define RSP esp
+#   define RIP eip
+#endif
+
 #if defined USE_GRAB
 static int memcpy_from_target(pid_t pid, void* dest, void* src, size_t n)
@@ -83 +99 @@
     }
 
-    regs->esp = oregs.esp-4;
-
-    oinst = ptrace(PTRACE_PEEKTEXT, pid, regs->esp, 0);
+    regs->RSP = oregs.RSP - 4;
+
+    oinst = ptrace(PTRACE_PEEKTEXT, pid, regs->RSP, 0);
     if (errno) {
         fprintf(stderr, "PTRACE_PEEKTEXT failed\n");
@@ -91 +107 @@
     }
 
-    if (ptrace(PTRACE_POKETEXT, pid, regs->esp, 0x80cd) < 0) { /* int 0x80 */
+    if (ptrace(PTRACE_POKETEXT, pid, regs->RSP, 0x80cd) < 0) { /* int 0x80 */
         fprintf(stderr, "PTRACE_POKETEXT failed\n");
         return errno;
     }
 
-    regs->eip = regs->esp;
+    regs->RIP = regs->RSP;
     if(ptrace(PTRACE_SETREGS, pid, NULL, regs) < 0)
     {
@@ -119 +135 @@
     }
 
-    if(ptrace(PTRACE_POKETEXT, pid, oregs.esp-4 , oinst) < 0)
+    if(ptrace(PTRACE_POKETEXT, pid, oregs.RSP-4 , oinst) < 0)
     {
         fprintf(stderr, "PTRACE_POKETEXT failed\n");
@@ -137 +153 @@
     }
 
-    regs.eax = SYS_close;
-    regs.ebx = fd;
+    regs.RAX = SYS_close;
+    regs.RBX = fd;
 
     return do_syscall(pid, &regs);
@@ -152 +168 @@
     }
 
-    regs.eax = SYS_dup2;
-    regs.ebx = oldfd;
-    regs.ecx = newfd;
+    regs.RAX = SYS_dup2;
+    regs.RBX = oldfd;
+    regs.RCX = newfd;
 
     return do_syscall(pid, &regs);
@@ -181 +197 @@
     memcpy_into_target(pid, target_page, path, strlen(path)+4);
 
-    regs.eax = SYS_open;
-    regs.ebx = (long)target_page;
-    regs.ecx = O_RDWR;
-    regs.edx = 0755;
+    regs.RAX = SYS_open;
+    regs.RBX = (long)target_page;
+    regs.RCX = O_RDWR;
+    regs.RDX = 0755;
 
     if((ret = do_syscall(pid, &regs)) != 0)
@@ -194 +210 @@
     memcpy_into_target(pid, target_page, backup_page, size);
 
-    *fd  = regs.eax;
+    *fd  = regs.RAX;
 
     return 0;
@@ -211 +227 @@
     debug("Running setsid on process %d (sid=%d)", pid, getsid(pid));
 
-    regs.eax = SYS_setpgid;
-    regs.ebx = 0;
-    regs.ecx = getsid(pid);
+    regs.RAX = SYS_setpgid;
+    regs.RBX = 0;
+    regs.RCX = getsid(pid);
 
     if((ret = do_syscall(pid, &regs)) != 0)
@@ -220 +236 @@
     }
 
-    if (regs.eax != 0) {
+    if (regs.RAX != 0) {
         fprintf(stderr, "setpgid failed\n");
-        return -regs.eax;
-    }
-
-    regs.eax = SYS_setsid;
+        return -regs.RAX;
+    }
+
+    regs.RAX = SYS_setsid;
 
     if((ret = do_syscall(pid, &regs)) != 0)
@@ -234 +250 @@
     debug("pid %d has now sid %d", pid, getsid(pid));
 
-    if (regs.eax == -1) {
+    if (regs.RAX == -1) {
         fprintf(stderr, "getsid failed\n");
-        return -regs.eax;
+        return -regs.RAX;
     }