projects / platform / upstream / glibc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 86c5d2c)
sparc: Avoid clobbering register parameters in syscall
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Mon, 10 Feb 2020 15:57:28 +0000 (12:57 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Sat, 15 Feb 2020 00:09:12 +0000 (21:09 -0300)
The sparc INTERNAL_SYSCALL macro might clobber the register
parameter if the argument itself might clobber any register (a function
call for instance).

This patch fixes it by using temporary variables for the expressions
between the register assignments (as indicated by GCC documentation,
6.47.5.2 Specifying Registers for Local Variables).

It is similar to the fix done for MIPS (bug 25523).

Checked on sparc64-linux-gnu and sparcv9-linux-gnu.

sysdeps/unix/sysv/linux/sparc/sysdep.h patch | blob | history

diff --git a/sysdeps/unix/sysv/linux/sparc/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sysdep.h
index 10dad89..e43f2bd 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sysdep.h
@@ -87,8 +87,9 @@
 
 #define internal_syscall1(string,err,name,arg1)                                \
 ({                                                                     \
+       long int _arg1 = (long int) (arg1);                             \
        register long int __g1 __asm__("g1") = (name);                  \
-       register long __o0 __asm__ ("o0") = (long)(arg1);               \
+       register long int  __o0 __asm__ ("o0") = _arg1;                 \
        __asm __volatile (string : "=r" (__o0) :                        \
                          "r" (__g1), "0" (__o0) :                      \
                          __SYSCALL_CLOBBERS);                          \
@@ -97,9 +98,11 @@
 
 #define internal_syscall2(string,err,name,arg1,arg2)                   \
 ({                                                                     \
+       long int _arg1 = (long int) (arg1);                             \
+       long int _arg2 = (long int) (arg2);                             \
        register long int __g1 __asm__("g1") = (name);                  \
-       register long __o0 __asm__ ("o0") = (long)(arg1);               \
-       register long __o1 __asm__ ("o1") = (long)(arg2);               \
+       register long int __o0 __asm__ ("o0") = _arg1;                  \
+       register long int __o1 __asm__ ("o1") = _arg2;                  \
        __asm __volatile (string : "=r" (__o0) :                        \
                          "r" (__g1), "0" (__o0), "r" (__o1) :          \
                          __SYSCALL_CLOBBERS);                          \
@@ -108,10 +111,13 @@
 
 #define internal_syscall3(string,err,name,arg1,arg2,arg3)              \
 ({                                                                     \
+       long int _arg1 = (long int) (arg1);                             \
+       long int _arg2 = (long int) (arg2);                             \
+       long int _arg3 = (long int) (arg3);                             \
        register long int __g1 __asm__("g1") = (name);                  \
-       register long __o0 __asm__ ("o0") = (long)(arg1);               \
-       register long __o1 __asm__ ("o1") = (long)(arg2);               \
-       register long __o2 __asm__ ("o2") = (long)(arg3);               \
+       register long int __o0 __asm__ ("o0") = _arg1;                  \
+       register long int __o1 __asm__ ("o1") = _arg2;                  \
+       register long int __o2 __asm__ ("o2") = _arg3;                  \
        __asm __volatile (string : "=r" (__o0) :                        \
                          "r" (__g1), "0" (__o0), "r" (__o1),           \
                          "r" (__o2) :                                  \
@@ -121,11 +127,15 @@
 
 #define internal_syscall4(string,err,name,arg1,arg2,arg3,arg4)         \
 ({                                                                     \
+       long int _arg1 = (long int) (arg1);                             \
+       long int _arg2 = (long int) (arg2);                             \
+       long int _arg3 = (long int) (arg3);                             \
+       long int _arg4 = (long int) (arg4);                             \
        register long int __g1 __asm__("g1") = (name);                  \
-       register long __o0 __asm__ ("o0") = (long)(arg1);               \
-       register long __o1 __asm__ ("o1") = (long)(arg2);               \
-       register long __o2 __asm__ ("o2") = (long)(arg3);               \
-       register long __o3 __asm__ ("o3") = (long)(arg4);               \
+       register long int __o0 __asm__ ("o0") = _arg1;                  \
+       register long int __o1 __asm__ ("o1") = _arg2;                  \
+       register long int __o2 __asm__ ("o2") = _arg3;                  \
+       register long int __o3 __asm__ ("o3") = _arg4;                  \
        __asm __volatile (string : "=r" (__o0) :                        \
                          "r" (__g1), "0" (__o0), "r" (__o1),           \
                          "r" (__o2), "r" (__o3) :                      \
@@ -135,12 +145,17 @@
 
 #define internal_syscall5(string,err,name,arg1,arg2,arg3,arg4,arg5)    \
 ({                                                                     \
+       long int _arg1 = (long int) (arg1);                             \
+       long int _arg2 = (long int) (arg2);                             \
+       long int _arg3 = (long int) (arg3);                             \
+       long int _arg4 = (long int) (arg4);                             \
+       long int _arg5 = (long int) (arg5);                             \
        register long int __g1 __asm__("g1") = (name);                  \
-       register long __o0 __asm__ ("o0") = (long)(arg1);               \
-       register long __o1 __asm__ ("o1") = (long)(arg2);               \
-       register long __o2 __asm__ ("o2") = (long)(arg3);               \
-       register long __o3 __asm__ ("o3") = (long)(arg4);               \
-       register long __o4 __asm__ ("o4") = (long)(arg5);               \
+       register long int __o0 __asm__ ("o0") = _arg1;                  \
+       register long int __o1 __asm__ ("o1") = _arg2;                  \
+       register long int __o2 __asm__ ("o2") = _arg3;                  \
+       register long int __o3 __asm__ ("o3") = _arg4;                  \
+       register long int __o4 __asm__ ("o4") = _arg5;                  \
        __asm __volatile (string : "=r" (__o0) :                        \
                          "r" (__g1), "0" (__o0), "r" (__o1),           \
                          "r" (__o2), "r" (__o3), "r" (__o4) :          \
@@ -150,13 +165,19 @@
 
 #define internal_syscall6(string,err,name,arg1,arg2,arg3,arg4,arg5,arg6)\
 ({                                                                     \
+       long int _arg1 = (long int) (arg1);                             \
+       long int _arg2 = (long int) (arg2);                             \
+       long int _arg3 = (long int) (arg3);                             \
+       long int _arg4 = (long int) (arg4);                             \
+       long int _arg5 = (long int) (arg5);                             \
+       long int _arg6 = (long int) (arg6);                             \
        register long int __g1 __asm__("g1") = (name);                  \
-       register long __o0 __asm__ ("o0") = (long)(arg1);               \
-       register long __o1 __asm__ ("o1") = (long)(arg2);               \
-       register long __o2 __asm__ ("o2") = (long)(arg3);               \
-       register long __o3 __asm__ ("o3") = (long)(arg4);               \
-       register long __o4 __asm__ ("o4") = (long)(arg5);               \
-       register long __o5 __asm__ ("o5") = (long)(arg6);               \
+       register long int __o0 __asm__ ("o0") = _arg1;                  \
+       register long int __o1 __asm__ ("o1") = _arg2;                  \
+       register long int __o2 __asm__ ("o2") = _arg3;                  \
+       register long int __o3 __asm__ ("o3") = _arg4;                  \
+       register long int __o4 __asm__ ("o4") = _arg5;                  \
+       register long int __o5 __asm__ ("o5") = _arg6;                  \
        __asm __volatile (string : "=r" (__o0) :                        \
                          "r" (__g1), "0" (__o0), "r" (__o1),           \
                          "r" (__o2), "r" (__o3), "r" (__o4),           \
@@ -167,12 +188,17 @@
 
 #define INLINE_CLONE_SYSCALL(arg1,arg2,arg3,arg4,arg5)                 \
 ({                                                                     \
-       register long __o0 __asm__ ("o0") = (long)(arg1);               \
-       register long __o1 __asm__ ("o1") = (long)(arg2);               \
-       register long __o2 __asm__ ("o2") = (long)(arg3);               \
-       register long __o3 __asm__ ("o3") = (long)(arg4);               \
-       register long __o4 __asm__ ("o4") = (long)(arg5);               \
-       register long __g1 __asm__ ("g1") = __NR_clone;                 \
+       long int _arg1 = (long int) (arg1);                             \
+       long int _arg2 = (long int) (arg2);                             \
+       long int _arg3 = (long int) (arg3);                             \
+       long int _arg4 = (long int) (arg4);                             \
+       long int _arg5 = (long int) (arg5);                             \
+       register long int __o0 __asm__ ("o0") = _arg1;                  \
+       register long int __o1 __asm__ ("o1") = _arg2;                  \
+       register long int __o2 __asm__ ("o2") = _arg3;                  \
+       register long int __o3 __asm__ ("o3") = _arg4;                  \
+       register long int __o4 __asm__ ("o4") = _arg5;                  \
+       register long int __g1 __asm__ ("g1") = __NR_clone;             \
        __asm __volatile (__SYSCALL_STRING :                            \
                          "=r" (__o0), "=r" (__o1) :                    \
                          "r" (__g1), "0" (__o0), "1" (__o1),           \
Domain: System / Toolchain;