Changeset 342 for asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src

Timestamp:

Apr 27, 2018, 2:26:14 PM (6 years ago)

Author:

coas-nagasima

Message:

syscallが関数呼びになるよう変更
他更新

Location:

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src

Files:

• internal/syscall.h (modified) (4 diffs)
• misc/syscall.c (modified) (1 diff)
• thread/__syscall_cp.c (modified) (2 diffs)
• thread/pthread_cancel.c (modified) (1 diff)
• unistd/setegid.c (modified) (1 diff)
• unistd/seteuid.c (modified) (1 diff)
• unistd/setgid.c (modified) (1 diff)
• unistd/setregid.c (modified) (1 diff)
• unistd/setresgid.c (modified) (1 diff)
• unistd/setresuid.c (modified) (1 diff)
• unistd/setreuid.c (modified) (1 diff)
• unistd/setuid.c (modified) (1 diff)
• unistd/setxid.c (modified) (1 diff)

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/internal/syscall.h

@@ -21 +21 @@
 typedef long syscall_arg_t;
 #endif
-
+#if 0
 __attribute__((visibility("hidden")))
 long __syscall_ret(unsigned long), __syscall(syscall_arg_t, ...),
@@ -44 +44 @@
 #endif
 #define __syscall7(n,a,b,c,d,e,f,g) (__syscall)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f),__scc(g))
-
+#endif
 #define __SYSCALL_NARGS_X(a,b,c,d,e,f,g,h,n,...) n
 #define __SYSCALL_NARGS(...) __SYSCALL_NARGS_X(__VA_ARGS__,7,6,5,4,3,2,1,0,)
@@ -50 +50 @@
 #define __SYSCALL_CONCAT(a,b) __SYSCALL_CONCAT_X(a,b)
 #define __SYSCALL_DISP(b,...) __SYSCALL_CONCAT(b,__SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__)
-
+#if 0
 #define __syscall(...) __SYSCALL_DISP(__syscall,__VA_ARGS__)
 #define syscall(...) __syscall_ret(__syscall(__VA_ARGS__))
-
+#endif
 #define socketcall __socketcall
 #define socketcall_cp __socketcall_cp
-
+#if 0
 #define __syscall_cp0(n) (__syscall_cp)(n,0,0,0,0,0,0)
 #define __syscall_cp1(n,a) (__syscall_cp)(n,__scc(a),0,0,0,0,0)
@@ -67 +67 @@
 #define __syscall_cp(...) __SYSCALL_DISP(__syscall_cp,__VA_ARGS__)
 #define syscall_cp(...) __syscall_ret(__syscall_cp(__VA_ARGS__))
+#endif
 
 #ifndef SYSCALL_USE_SOCKETCALL

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/misc/syscall.c

@@ -16 +16 @@
         f=va_arg(ap, syscall_arg_t);
         va_end(ap);
-        return __syscall_ret(__syscall(n,a,b,c,d,e,f));
+        return __syscall_ret(__syscall_nr(n,a,b,c,d,e,f));
 }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/thread/__syscall_cp.c

@@ -2 +2 @@
 #include "syscall.h"
 
+#undef sccp
 __attribute__((__visibility__("hidden")))
 long __syscall_cp_c();
@@ -9 +10 @@
                  syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
 {
-        return (__syscall)(nr, u, v, w, x, y, z);
+        return (__syscall_nr)(nr, u, v, w, x, y, z);
 }
 
 #ifndef __c2__
 weak_alias(sccp, __syscall_cp_c);
+#else
+long __syscall_cp_c(syscall_arg_t nr,
+        syscall_arg_t u, syscall_arg_t v, syscall_arg_t w,
+        syscall_arg_t x, syscall_arg_t y, syscall_arg_t z)
+{
+        return sccp(nr, u, v, w, x, y, z);
+}
 #endif
 

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/thread/pthread_cancel.c

@@ -31 +31 @@
         if ((st=(self=__pthread_self())->canceldisable)
             && (st==PTHREAD_CANCEL_DISABLE || nr==SYS_close))
-                return __syscall(nr, u, v, w, x, y, z);
+                return __syscall_nr(nr, u, v, w, x, y, z);
 
         r = __syscall_cp_asm(&self->cancel, nr, u, v, w, x, y, z);

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/unistd/setegid.c

@@ -5 +5 @@
 int setegid(gid_t egid)
 {
-        return __setxid(SYS_setresgid, -1, egid, -1);
+        return __setxid(__NR_setresgid, -1, egid, -1);
 }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/unistd/seteuid.c

@@ -5 +5 @@
 int seteuid(uid_t euid)
 {
-        return __setxid(SYS_setresuid, -1, euid, -1);
+        return __setxid(__NR_setresuid, -1, euid, -1);
 }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/unistd/setgid.c

@@ -5 +5 @@
 int setgid(gid_t gid)
 {
-        return __setxid(SYS_setgid, gid, 0, 0);
+        return __setxid(__NR_setgid, gid, 0, 0);
 }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/unistd/setregid.c

@@ -5 +5 @@
 int setregid(gid_t rgid, gid_t egid)
 {
-        return __setxid(SYS_setregid, rgid, egid, 0);
+        return __setxid(__NR_setregid, rgid, egid, 0);
 }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/unistd/setresgid.c

@@ -6 +6 @@
 int setresgid(gid_t rgid, gid_t egid, gid_t sgid)
 {
-        return __setxid(SYS_setresgid, rgid, egid, sgid);
+        return __setxid(__NR_setresgid, rgid, egid, sgid);
 }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/unistd/setresuid.c

@@ -6 +6 @@
 int setresuid(uid_t ruid, uid_t euid, uid_t suid)
 {
-        return __setxid(SYS_setresuid, ruid, euid, suid);
+        return __setxid(__NR_setresuid, ruid, euid, suid);
 }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/unistd/setreuid.c

@@ -5 +5 @@
 int setreuid(uid_t ruid, uid_t euid)
 {
-        return __setxid(SYS_setreuid, ruid, euid, 0);
+        return __setxid(__NR_setreuid, ruid, euid, 0);
 }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/unistd/setuid.c

@@ -5 +5 @@
 int setuid(uid_t uid)
 {
-        return __setxid(SYS_setuid, uid, 0, 0);
+        return __setxid(__NR_setuid, uid, 0, 0);
 }

asp3_tinet_ecnl_rx/trunk/musl-1.1.18/src/unistd/setxid.c

@@ -14 +14 @@
         struct ctx *c = p;
         if (c->err>0) return;
-        int ret = -__syscall(c->nr, c->id, c->eid, c->sid);
+        int ret = -__syscall_nr(c->nr, c->id, c->eid, c->sid);
         if (ret && !c->err) {
                 /* If one thread fails to set ids after another has already