2002-11-07 Richard Henderson <rth@redhat.com>

	* sysdeps/unix/sysv/linux/alpha/sysdep.h: Re-include protect.
	Kill argument registers across the inline syscall.

diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep.h b/sysdeps/unix/sysv/linux/alpha/sysdep.h
index e56adca8eda9c38feafea29335647c16b10135dc..3bf25e6fd2e65c737b5a35dd3a6e1baf7dfcddce 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/sysdep.h
+++ b/sysdeps/unix/sysv/linux/alpha/sysdep.h
@@ -17,6 +17,9 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#ifndef _LINUX_ALPHA_SYSDEP_H
+#define _LINUX_ALPHA_SYSDEP_H 1
+
 #ifdef __ASSEMBLER__
 
 #include <asm/pal.h>
@@ -88,118 +91,114 @@
    of the hard-register variables as much as possible.  Thus we copy
    in/out as close to the asm as possible.  */
 
-#define inline_syscall0(name)                  \
-{                                              \
-       register long _sc_0 __asm__("$0");      \
-       register long _sc_19 __asm__("$19");    \
-                                               \
-       _sc_0 = __NR_##name;                    \
-       __asm__("callsys # %0 %1 <= %2"         \
-               : "=r"(_sc_0), "=r"(_sc_19)     \
-               : "0"(_sc_0)                    \
-               : inline_syscall_clobbers);     \
-       _sc_ret = _sc_0, _sc_err = _sc_19;      \
-}
-
-#define inline_syscall1(name,arg1)             \
-{                                              \
-       register long _sc_0 __asm__("$0");      \
-       register long _sc_16 __asm__("$16");    \
-       register long _sc_19 __asm__("$19");    \
-                                               \
-       _sc_0 = __NR_##name;                    \
-       _sc_16 = (long) (arg1);                 \
-       __asm__("callsys # %0 %1 <= %2 %3"      \
-               : "=r"(_sc_0), "=r"(_sc_19)     \
-               : "0"(_sc_0), "r"(_sc_16)       \
-               : inline_syscall_clobbers);     \
-       _sc_ret = _sc_0, _sc_err = _sc_19;      \
-}
-
-#define inline_syscall2(name,arg1,arg2)                        \
+#define inline_syscall0(name)                          \
 {                                                      \
-       register long _sc_0 __asm__("$0");              \
-       register long _sc_16 __asm__("$16");            \
-       register long _sc_17 __asm__("$17");            \
        register long _sc_19 __asm__("$19");            \
                                                        \
-       _sc_0 = __NR_##name;                            \
-       _sc_16 = (long) (arg1);                         \
-       _sc_17 = (long) (arg2);                         \
-       __asm__("callsys # %0 %1 <= %2 %3 %4"           \
-               : "=r"(_sc_0), "=r"(_sc_19)             \
-               : "0"(_sc_0), "r"(_sc_16), "r"(_sc_17)  \
-               : inline_syscall_clobbers);             \
-       _sc_ret = _sc_0, _sc_err = _sc_19;              \
+       __asm__("callsys # %0 %1 <= %2"                 \
+               : "=v"(_sc_ret), "=r"(_sc_19)           \
+               : "0"(__NR_##name)                      \
+               : inline_syscall_clobbers,              \
+                 "$16", "$17", "$18", "$20", "$21");   \
+       _sc_err = _sc_19;                               \
 }
 
-#define inline_syscall3(name,arg1,arg2,arg3)           \
+#define inline_syscall1(name,arg1)                     \
 {                                                      \
-       register long _sc_0 __asm__("$0");              \
        register long _sc_16 __asm__("$16");            \
-       register long _sc_17 __asm__("$17");            \
-       register long _sc_18 __asm__("$18");            \
        register long _sc_19 __asm__("$19");            \
                                                        \
-       _sc_0 = __NR_##name;                            \
        _sc_16 = (long) (arg1);                         \
-       _sc_17 = (long) (arg2);                         \
-       _sc_18 = (long) (arg3);                         \
-       __asm__("callsys # %0 %1 <= %2 %3 %4 %5"        \
-               : "=r"(_sc_0), "=r"(_sc_19)             \
-               : "0"(_sc_0), "r"(_sc_16), "r"(_sc_17), \
-                 "r"(_sc_18)                           \
-               : inline_syscall_clobbers);             \
-       _sc_ret = _sc_0, _sc_err = _sc_19;              \
+       __asm__("callsys # %0 %1 <= %2 %3"              \
+               : "=v"(_sc_ret), "=r"(_sc_19),          \
+                 "=r"(_sc_16)                          \
+               : "0"(__NR_##name), "2"(_sc_16)         \
+               : inline_syscall_clobbers,              \
+                 "$17", "$18", "$20", "$21");          \
+       _sc_err = _sc_19;                               \
 }
 
-#define inline_syscall4(name,arg1,arg2,arg3,arg4)      \
-{                                                      \
-       register long _sc_0 __asm__("$0");              \
-       register long _sc_16 __asm__("$16");            \
-       register long _sc_17 __asm__("$17");            \
-       register long _sc_18 __asm__("$18");            \
-       register long _sc_19 __asm__("$19");            \
-                                                       \
-       _sc_0 = __NR_##name;                            \
-       _sc_16 = (long) (arg1);                         \
-       _sc_17 = (long) (arg2);                         \
-       _sc_18 = (long) (arg3);                         \
-       _sc_19 = (long) (arg4);                         \
-       __asm__("callsys # %0 %1 <= %2 %3 %4 %5 %6"     \
-               : "=r"(_sc_0), "=r"(_sc_19)             \
-               : "0"(_sc_0), "r"(_sc_16), "r"(_sc_17), \
-                 "r"(_sc_18), "1"(_sc_19)              \
-               : inline_syscall_clobbers);             \
-       _sc_ret = _sc_0, _sc_err = _sc_19;              \
+#define inline_syscall2(name,arg1,arg2)                                \
+{                                                              \
+       register long _sc_16 __asm__("$16");                    \
+       register long _sc_17 __asm__("$17");                    \
+       register long _sc_19 __asm__("$19");                    \
+                                                               \
+       _sc_16 = (long) (arg1);                                 \
+       _sc_17 = (long) (arg2);                                 \
+       __asm__("callsys # %0 %1 <= %2 %3 %4"                   \
+               : "=v"(_sc_ret), "=r"(_sc_19),                  \
+                 "=r"(_sc_16), "=r"(_sc_17)                    \
+               : "0"(__NR_##name), "2"(_sc_16), "3"(_sc_17)    \
+               : inline_syscall_clobbers,                      \
+                 "$18", "$20", "$21");                         \
+       _sc_err = _sc_19;                                       \
 }
 
-#define inline_syscall5(name,arg1,arg2,arg3,arg4,arg5) \
-{                                                      \
-       register long _sc_0 __asm__("$0");              \
-       register long _sc_16 __asm__("$16");            \
-       register long _sc_17 __asm__("$17");            \
-       register long _sc_18 __asm__("$18");            \
-       register long _sc_19 __asm__("$19");            \
-       register long _sc_20 __asm__("$20");            \
-                                                       \
-       _sc_0 = __NR_##name;                            \
-       _sc_16 = (long) (arg1);                         \
-       _sc_17 = (long) (arg2);                         \
-       _sc_18 = (long) (arg3);                         \
-       _sc_19 = (long) (arg4);                         \
-       _sc_20 = (long) (arg5);                         \
-       __asm__("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7"  \
-               : "=r"(_sc_0), "=r"(_sc_19)             \
-               : "0"(_sc_0), "r"(_sc_16), "r"(_sc_17), \
-                 "r"(_sc_18), "1"(_sc_19), "r"(_sc_20) \
-               : inline_syscall_clobbers);             \
-       _sc_ret = _sc_0, _sc_err = _sc_19;              \
+#define inline_syscall3(name,arg1,arg2,arg3)                   \
+{                                                              \
+       register long _sc_16 __asm__("$16");                    \
+       register long _sc_17 __asm__("$17");                    \
+       register long _sc_18 __asm__("$18");                    \
+       register long _sc_19 __asm__("$19");                    \
+                                                               \
+       _sc_16 = (long) (arg1);                                 \
+       _sc_17 = (long) (arg2);                                 \
+       _sc_18 = (long) (arg3);                                 \
+       __asm__("callsys # %0 %1 <= %2 %3 %4 %5"                \
+               : "=v"(_sc_ret), "=r"(_sc_19),                  \
+                 "=r"(_sc_16), "=r"(_sc_17), "=r"(_sc_18)      \
+               : "0"(__NR_##name), "2"(_sc_16), "3"(_sc_17),   \
+                 "4"(_sc_18)                                   \
+               : inline_syscall_clobbers, "$20", "$21");       \
+       _sc_err = _sc_19;                                       \
+}
+
+#define inline_syscall4(name,arg1,arg2,arg3,arg4)              \
+{                                                              \
+       register long _sc_16 __asm__("$16");                    \
+       register long _sc_17 __asm__("$17");                    \
+       register long _sc_18 __asm__("$18");                    \
+       register long _sc_19 __asm__("$19");                    \
+                                                               \
+       _sc_16 = (long) (arg1);                                 \
+       _sc_17 = (long) (arg2);                                 \
+       _sc_18 = (long) (arg3);                                 \
+       _sc_19 = (long) (arg4);                                 \
+       __asm__("callsys # %0 %1 <= %2 %3 %4 %5 %6"             \
+               : "=v"(_sc_ret), "=r"(_sc_19),                  \
+                 "=r"(_sc_16), "=r"(_sc_17), "=r"(_sc_18)      \
+               : "0"(__NR_##name), "2"(_sc_16), "3"(_sc_17),   \
+                 "4"(_sc_18), "1"(_sc_19)                      \
+               : inline_syscall_clobbers, "$20", "$21");       \
+       _sc_err = _sc_19;                                       \
+}
+
+#define inline_syscall5(name,arg1,arg2,arg3,arg4,arg5)         \
+{                                                              \
+       register long _sc_16 __asm__("$16");                    \
+       register long _sc_17 __asm__("$17");                    \
+       register long _sc_18 __asm__("$18");                    \
+       register long _sc_19 __asm__("$19");                    \
+       register long _sc_20 __asm__("$20");                    \
+                                                               \
+       _sc_16 = (long) (arg1);                                 \
+       _sc_17 = (long) (arg2);                                 \
+       _sc_18 = (long) (arg3);                                 \
+       _sc_19 = (long) (arg4);                                 \
+       _sc_20 = (long) (arg5);                                 \
+       __asm__("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7"          \
+               : "=v"(_sc_ret), "=r"(_sc_19),                  \
+                 "=r"(_sc_16), "=r"(_sc_17), "=r"(_sc_18),     \
+                 "=r"(_sc_20)                                  \
+               : "0"(__NR_##name), "2"(_sc_16), "3"(_sc_17),   \
+                 "4"(_sc_18), "1"(_sc_19), "5"(_sc_20)         \
+               : inline_syscall_clobbers, "$21");              \
+       _sc_ret = _sc_0, _sc_err = _sc_19;                      \
 }
 
 #define inline_syscall6(name,arg1,arg2,arg3,arg4,arg5,arg6)    \
 {                                                              \
-       register long _sc_0 __asm__("$0");                      \
        register long _sc_16 __asm__("$16");                    \
        register long _sc_17 __asm__("$17");                    \
        register long _sc_18 __asm__("$18");                    \
@@ -207,7 +206,6 @@
        register long _sc_20 __asm__("$20");                    \
        register long _sc_21 __asm__("$21");                    \
                                                                \
-       _sc_0 = __NR_##name;                                    \
        _sc_16 = (long) (arg1);                                 \
        _sc_17 = (long) (arg2);                                 \
        _sc_18 = (long) (arg3);                                 \
@@ -215,10 +213,14 @@
        _sc_20 = (long) (arg5);                                 \
        _sc_21 = (long) (arg6);                                 \
        __asm__("callsys # %0 %1 <= %2 %3 %4 %5 %6 %7 %8"       \
-               : "=r"(_sc_0), "=r"(_sc_19)                     \
-               : "0"(_sc_0), "r"(_sc_16), "r"(_sc_17),         \
-                 "r"(_sc_18), "1"(_sc_19), "r"(_sc_20),        \
-                 "r"(_sc_21)                                   \
+               : "=v"(_sc_ret), "=r"(_sc_19)                   \
+                 "=r"(_sc_16), "=r"(_sc_17), "=r"(_sc_18),     \
+                 "=r"(_sc_20), "=r"(_sc_21)                    \
+               : "0"(__NR_##name), "2"(_sc_16), "3"(_sc_17),   \
+                 "4"(_sc_18), "1"(_sc_19), "5"(_sc_20),        \
+                 "6"(_sc_21)                                   \
                : inline_syscall_clobbers);                     \
-       _sc_ret = _sc_0, _sc_err = _sc_19;                      \
+       _sc_err = _sc_19;                                       \
 }
+
+#endif /* _LINUX_ALPHA_SYSDEP_H */