diff options
Diffstat (limited to 'src/basic/raw-clone.h')
| -rw-r--r-- | src/basic/raw-clone.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h index d35540903..c801939d1 100644 --- a/src/basic/raw-clone.h +++ b/src/basic/raw-clone.h @@ -8,6 +8,7 @@ Copyright 2016 Michael Karcher ***/ +//#include <errno.h> #include <sched.h> #include <sys/syscall.h> @@ -47,23 +48,28 @@ static inline pid_t raw_clone(unsigned long flags) { * %o1. Inline assembly is needed to get the flag returned * in %o1. */ - int in_child, child_pid; + int in_child, child_pid, error; - asm volatile("mov %2, %%g1\n\t" - "mov %3, %%o0\n\t" + asm volatile("mov %3, %%g1\n\t" + "mov %4, %%o0\n\t" "mov 0 , %%o1\n\t" #if defined(__arch64__) "t 0x6d\n\t" #else "t 0x10\n\t" #endif + "addx %%g0, 0, %2\n\t" "mov %%o1, %0\n\t" "mov %%o0, %1" : - "=r"(in_child), "=r"(child_pid) : + "=r"(in_child), "=r"(child_pid), "=r"(error) : "i"(__NR_clone), "r"(flags) : - "%o1", "%o0", "%g1" ); + "%o1", "%o0", "%g1" "cc" ); - ret = in_child ? 0 : child_pid; + if (error) { + errno = child_pid; + ret = -1; + } else + ret = in_child ? 0 : child_pid; } #else ret = (pid_t) syscall(__NR_clone, flags, NULL); |