preparing for ARM

4 files changed, 133 insertions, 114 deletions

diff --git a/Makefile b/Makefile
index 92cc0c2..6025b29 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 CC = gcc
 CFLAGS = -Wall
 SOURCES = $(addprefix src/, whatfiles.c attach.c utilities.c hashmap.c strings.c)
+ARCH_DIR = $(shell uname -p)
 
 all: bin/whatfiles
 
 bin/whatfiles: $(SOURCES)
-	$(CC) $(CFLAGS) -o $@ $(SOURCES)
+	$(CC) $(CFLAGS) -o $@ $(SOURCES) src/$(ARCH_DIR)/registers.c
 
 # utils
 
diff --git a/src/whatfiles.c b/src/whatfiles.c
index 67d4e92..b9d6025 100644
--- a/src/whatfiles.c
+++ b/src/whatfiles.c
@@ -18,83 +18,6 @@ int Debug = 0;
 LastSyscall_t LastSyscall;
 DebugStats_t DebugStats;
 
-// looks at the current syscall and outputs its information if it's one we're interested in
-void check_syscall(pid_t current_pid, struct user_regs_struct regs, HashMap map)
-{
-    struct String filename = {0};
-    struct String output = {0};
-    init_string(&filename, 64);
-    init_string(&output, 64);
-    char mode[MODE_LEN] = {0};
-
-    pid_t parent_tid, child_tid;
-    unsigned long flags;
-    unsigned long newsp;
-
-    size_t index;
-    HashError err = find_index(current_pid, map, &index);
-    if (err) DEBUG("unknown pid %d, syscall %lld\n", current_pid, regs.orig_rax);
-    // struct String *proc_string = err ? NULL : &map->names[index];
-    // char *proc_name = proc_string && proc_string->data && *proc_string->data
-    //     ? proc_string->data
-    //     : "[unknown]";
-
-    switch (regs.orig_rax)
-    {
-    case SYS_execve:
-        DEBUG("PID %d exec'd. orig_rax: %lld, rax: %lld\n", current_pid, regs.orig_rax, regs.rax);
-        if (peek_filename(current_pid, regs.rdi, &filename)) {
-            DEBUG("associated process %d with name \"%s\"\n", current_pid, filename.data);
-            set_name(current_pid, filename.data, map);
-        }
-        break;
-    case SYS_fork:
-        DEBUG("PID %d forked. orig_rax: %lld, rax: %lld\n", current_pid, regs.orig_rax, regs.rax);
-        break;
-    case SYS_clone:
-        flags = regs.rdi;
-        newsp = regs.rsi;
-        parent_tid = ptrace(PTRACE_PEEKDATA, current_pid, (void*)regs.rdx, 0);
-        child_tid = ptrace(PTRACE_PEEKDATA, current_pid, (void*)regs.r10, 0);
-        DEBUG("PID %d cloned. orig_rax: %lld, rax: %lld, flags: 0x%ld, newsp: 0x%ld, parent pid: %d, child pid: %d\n", 
-            current_pid, regs.orig_rax, regs.rax, flags, newsp, parent_tid, child_tid);
-        break;
-    case SYS_creat:
-        peek_filename(current_pid, regs.rdi, &filename);
-        get_mode(regs.rsi, mode);
-        build_output(mode, "creat()", regs.rsi, current_pid, &filename, &output, map);
-        OUTPUT("%s", output.data);
-        break;
-    case SYS_open:
-        peek_filename(current_pid, regs.rdi, &filename);
-        get_mode(regs.rdx, mode);
-        build_output(mode, "open()", regs.rdx, current_pid, &filename, &output, map);
-        OUTPUT("%s", output.data);
-        break;
-    case SYS_openat:
-        peek_filename(current_pid, regs.rsi, &filename);
-        get_mode(regs.r10, mode);
-        build_output(mode, "openat()", regs.r10, current_pid, &filename, &output, map);
-        OUTPUT("%s", output.data);
-        break;
-    case SYS_unlink:
-        peek_filename(current_pid, regs.rdi, &filename);
-        build_output("delete", "unlink()", 0, current_pid, &filename, &output, map);
-        OUTPUT("%s", output.data);
-        break;
-    case SYS_unlinkat:
-        peek_filename(current_pid, regs.rsi, &filename);
-        build_output("delete", "unlinkat()", 0, current_pid, &filename, &output, map);
-        OUTPUT("%s", output.data);
-        break;
-    default:
-        // DEBUG("syscall: %lld, pid: %d, %s\n", regs.orig_rax, current_pid, proc_name);
-        break;
-    }
-    free(filename.data);
-    free(output.data);
-}
-
 // responsible for seeing new processes and threads created by forks, clones, or vforks, and inserting them into the hashmap
 void check_ptrace_event(pid_t current_pid, int proc_status, HashMap map)
 {
@@ -158,42 +81,6 @@ void check_ptrace_event(pid_t current_pid, int proc_status, HashMap map)
     free(new_proc.data);
 }
 
-bool step_syscall(pid_t current_pid, int proc_status, HashMap map)
-{
-    long res;
-    struct user_regs_struct regs;
-    bool could_read = false;
-    // get current register values
-    // TODO: make this fault tolerant to a dead PID
-    res = ptrace(PTRACE_GETREGS, current_pid, &regs, &regs);
-    if (res == -1L) {
-        DEBUG("CURRENT PID: %d, failed to get registers\n", current_pid);
-    }
-
-    // can't get some registers for some reason
-    if (regs.orig_rax != -1) {
-        could_read = true;
-        // If it's the same PID performing the same syscall (has same orig_rax) as last time, we don't care. Just means it's exiting the syscall.
-        // Might want to keep for debug mode? This might result in missing some output, in the case where two threads of the same process enter the same syscall before either exits,
-        // because they will both return the same PID to wait() when given SIGTRAP as part of the syscall-enter-exit loop. Might also result in double-printing,
-        // because if two threads (that report the same PID) enter two different syscalls before either exits, the "last" syscall for the PID won't be the entry by that thread.
-        if (!is_exiting(current_pid, regs.orig_rax) /*|| Debug*/) {
-            check_syscall(current_pid, regs, map);
-        }
-        LastSyscall.pid = current_pid;
-        LastSyscall.syscall = regs.orig_rax;
-        check_ptrace_event(current_pid, proc_status, map);
-        // continue, catching next entry or exit from syscall
-        res = ptrace(PTRACE_SYSCALL, current_pid, 0, 0);
-        if (res == -1L) DEBUG("ptrace() failed to resume");
-    } else {
-        DEBUG("can't get registers, detaching from %d\n", current_pid);
-        res = ptrace(PTRACE_DETACH, current_pid, 0, 0); // "Under Linux, a tracee can be detached in this way regardless of which method was used to initiate tracing."
-        if (res == -1L) DEBUG("ptrace() failed to detach from %d\n", current_pid);
-    }
-    return could_read;
-}
-
 int main(int argc, char* argv[])
 {
     int pid, status;
@@ -331,6 +218,7 @@ int main(int argc, char* argv[])
 
 /*
 TODO:
+confirm process exists for -p flag
 debug flag for use by hashdriver
 more hashmap tests?
 better allocator/destructor for String
diff --git a/src/whatfiles.h b/src/whatfiles.h
index 1738010..e1fd6c5 100644
--- a/src/whatfiles.h
+++ b/src/whatfiles.h
@@ -30,6 +30,9 @@ typedef struct {
 
 extern LastSyscall_t LastSyscall;
 
+// whatfiles.c
+void check_ptrace_event(pid_t current_pid, int proc_status, HashMap map);
+
 // utilities.c
 void build_output(
     char *mode,
@@ -58,4 +61,9 @@ void read_file(struct String *str, size_t size, FILE *file);
 char read_status(pid_t pid);
 bool read_task(pid_t tid, struct String *str);
 
+// architecture-specific, registers.c
+void check_syscall(pid_t current_pid, void *registers, HashMap map);
+bool step_syscall(pid_t current_pid, int proc_status, HashMap map);
+
+
 #endif /* !WHATFILES_H */
diff --git a/src/x86_64/registers.c b/src/x86_64/registers.c
new file mode 100644
index 0000000..f975f01
--- /dev/null
+++ b/src/x86_64/registers.c
@@ -0,0 +1,122 @@
+
+#include <sys/ptrace.h>
+#include <sys/user.h>
+#include <sys/syscall.h>
+#include <sys/wait.h>
+
+#include "../whatfiles.h"
+
+// looks at the current syscall and outputs its information if it's one we're interested in
+void check_syscall(pid_t current_pid, void *registers, HashMap map)
+{
+    struct user_regs_struct *regs = (struct user_regs_struct*)registers;
+    struct String filename = {0};
+    struct String output = {0};
+    init_string(&filename, 64);
+    init_string(&output, 64);
+    char mode[MODE_LEN] = {0};
+
+    pid_t parent_tid, child_tid;
+    unsigned long flags;
+    unsigned long newsp;
+
+    size_t index;
+    HashError err = find_index(current_pid, map, &index);
+    if (err) DEBUG("unknown pid %d, syscall %lld\n", current_pid, regs->orig_rax);
+    // struct String *proc_string = err ? NULL : &map->names[index];
+    // char *proc_name = proc_string && proc_string->data && *proc_string->data
+    //     ? proc_string->data
+    //     : "[unknown]";
+
+    switch (regs->orig_rax)
+    {
+    case SYS_execve:
+        DEBUG("PID %d exec'd. orig_rax: %lld, rax: %lld\n", current_pid, regs->orig_rax, regs->rax);
+        if (peek_filename(current_pid, regs->rdi, &filename)) {
+            DEBUG("associated process %d with name \"%s\"\n", current_pid, filename.data);
+            set_name(current_pid, filename.data, map);
+        }
+        break;
+    case SYS_fork:
+        DEBUG("PID %d forked. orig_rax: %lld, rax: %lld\n", current_pid, regs->orig_rax, regs->rax);
+        break;
+    case SYS_clone:
+        flags = regs->rdi;
+        newsp = regs->rsi;
+        parent_tid = ptrace(PTRACE_PEEKDATA, current_pid, (void*)regs->rdx, 0);
+        child_tid = ptrace(PTRACE_PEEKDATA, current_pid, (void*)regs->r10, 0);
+        DEBUG("PID %d cloned. orig_rax: %lld, rax: %lld, flags: 0x%ld, newsp: 0x%ld, parent pid: %d, child pid: %d\n", 
+            current_pid, regs->orig_rax, regs->rax, flags, newsp, parent_tid, child_tid);
+        break;
+    case SYS_creat:
+        peek_filename(current_pid, regs->rdi, &filename);
+        get_mode(regs->rsi, mode);
+        build_output(mode, "creat()", regs->rsi, current_pid, &filename, &output, map);
+        OUTPUT("%s", output.data);
+        break;
+    case SYS_open:
+        peek_filename(current_pid, regs->rdi, &filename);
+        get_mode(regs->rdx, mode);
+        build_output(mode, "open()", regs->rdx, current_pid, &filename, &output, map);
+        OUTPUT("%s", output.data);
+        break;
+    case SYS_openat:
+        peek_filename(current_pid, regs->rsi, &filename);
+        get_mode(regs->r10, mode);
+        build_output(mode, "openat()", regs->r10, current_pid, &filename, &output, map);
+        OUTPUT("%s", output.data);
+        break;
+    case SYS_unlink:
+        peek_filename(current_pid, regs->rdi, &filename);
+        build_output("delete", "unlink()", 0, current_pid, &filename, &output, map);
+        OUTPUT("%s", output.data);
+        break;
+    case SYS_unlinkat:
+        peek_filename(current_pid, regs->rsi, &filename);
+        build_output("delete", "unlinkat()", 0, current_pid, &filename, &output, map);
+        OUTPUT("%s", output.data);
+        break;
+    default:
+        // DEBUG("syscall: %lld, pid: %d, %s\n", regs->orig_rax, current_pid, proc_name);
+        break;
+    }
+    free(filename.data);
+    free(output.data);
+}
+
+
+bool step_syscall(pid_t current_pid, int proc_status, HashMap map)
+{
+    long res;
+    struct user_regs_struct regs;
+    bool could_read = false;
+    // get current register values
+    // TODO: make this fault tolerant to a dead PID
+    res = ptrace(PTRACE_GETREGS, current_pid, &regs, &regs);
+    if (res == -1L) {
+        DEBUG("CURRENT PID: %d, failed to get registers\n", current_pid);
+    }
+
+    // can't get some registers for some reason
+    if (regs.orig_rax != -1) {
+        could_read = true;
+        // If it's the same PID performing the same syscall (has same orig_rax) as last time, we don't care. Just means it's exiting the syscall.
+        // Might want to keep for debug mode? This might result in missing some output, in the case where two threads of the same process enter the same syscall before either exits,
+        // because they will both return the same PID to wait() when given SIGTRAP as part of the syscall-enter-exit loop. Might also result in double-printing,
+        // because if two threads (that report the same PID) enter two different syscalls before either exits, the "last" syscall for the PID won't be the entry by that thread.
+        if (!is_exiting(current_pid, regs.orig_rax) /*|| Debug*/) {
+            check_syscall(current_pid, (void*)&regs, map);
+        }
+        LastSyscall.pid = current_pid;
+        LastSyscall.syscall = regs.orig_rax;
+        check_ptrace_event(current_pid, proc_status, map);
+        // continue, catching next entry or exit from syscall
+        res = ptrace(PTRACE_SYSCALL, current_pid, 0, 0);
+        if (res == -1L) DEBUG("ptrace() failed to resume");
+    } else {
+        DEBUG("can't get registers, detaching from %d\n", current_pid);
+        res = ptrace(PTRACE_DETACH, current_pid, 0, 0); // "Under Linux, a tracee can be detached in this way regardless of which method was used to initiate tracing."
+        if (res == -1L) DEBUG("ptrace() failed to detach from %d\n", current_pid);
+    }
+    return could_read;
+}