Merge pull request #1 from Tangdongle/master

Fixed up package

ptrace.nim

@@ -201,10 +201,10 @@ template syscall*(p: Pid) =
 template singleStep*(p: Pid) =
   ptrace(PTRACE_SINGLESTEP, p, 0, 0)
 
-template peekUser*(p: Pid, a: clong): expr =
+template peekUser*(p: Pid, a: clong): untyped =
   ptrace(PTRACE_PEEKUSER, p, a, 0)
 
-template getData*(p: Pid, a: clong): expr =
+template getData*(p: Pid, a: clong): untyped  =
   ptrace(PTRACE_PEEKDATA, p, a, 0)
 
 proc getData*[T: string|cstring|array|seq](p: Pid, a: clong, buf: var T, length: int) =

ptrace.nimble

@@ -1,11 +1,8 @@
-[Package]
-name          = "ptrace"
 version       = "0.0.3"
 author        = "Huy Doan"
 description   = "ptrace wrapper and helpers for Nim"
 license       = "MIT"
 
-skipDirs      = "tests"
+skipDirs      = @["tests"]
 
-[Deps]
-Requires: "nim >= 0.10.0"
+requires "nim >= 0.10.0"

tests/config.nims

@@ -0,0 +1 @@
+switch("path", "$projectDir/../")

tests/test1.nim

@@ -1,6 +1,6 @@
 import posix
-import ../ptrace/ptrace
-import ../ptrace/syscall
+import ptrace
+import private/syscall
 
 
 var child: Pid
@@ -29,7 +29,8 @@ else:
         params[2] = peekUser(child, SYSCALL_ARG3)
         echo "Write called with ", params[0], ", ", params[1], ", ", params[2]
 
-        let regs: Registers = getRegs(child)
+        var regs: Registers
+        getRegs(child, addr regs)
         echo regs.rdi, " ", regs.rsi, " ", regs.rdx
 
       else:

tests/test2.nim

@@ -1,7 +1,7 @@
 import posix
 import unicode
-import ../ptrace/ptrace
-import ../ptrace/syscall
+import ptrace
+import private/syscall
 
 var child: Pid
 var syscallNo: clong

tests/test3.nim

@@ -1,7 +1,7 @@
 import posix
 import strutils
-import ../ptrace/ptrace
-import ../ptrace/syscall
+import ptrace
+import private/syscall
 
 proc c_printf(frmt: cstring) {.importc: "printf", header: "<stdio.h>", varargs.}
 
@@ -25,7 +25,7 @@ else:
     if WIFEXITED(status):
       break
 
-    regs = getRegs(child)
+    getRegs(child, addr regs)
     if start == 1:
       ins = getData(child, regs.rip.clong)
       c_printf("RIP: %lx Instruction executed: %lx\n", regs.rip, ins)