lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2026-01-06 11:51:29 +03:00
Code Activity

mips: Use 'long int' and 'long long int' in linux syscall code

Browse Source 
Style fixes only, no functional change.
This commit is contained in:
WANG Xuerui
2020-02-13 00:57:02 +08:00
committed by Joseph Myers
parent c953219420
commit d3fbb18aa3
14 changed files with 230 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
View File

@@ -52,7 +52,7 @@
#undef INLINE_SYSCALL
#define INLINE_SYSCALL(name, nr, args...) \
({ INTERNAL_SYSCALL_DECL (_sc_err); \
long result_var = INTERNAL_SYSCALL (name, _sc_err, nr, args); \
long int result_var = INTERNAL_SYSCALL (name, _sc_err, nr, args); \
if ( INTERNAL_SYSCALL_ERROR_P (result_var, _sc_err) ) \
{ \
__set_errno (INTERNAL_SYSCALL_ERRNO (result_var, _sc_err)); \
@@ -61,10 +61,10 @@
result_var; })
#undef INTERNAL_SYSCALL_DECL
#define INTERNAL_SYSCALL_DECL(err) long err __attribute__ ((unused))
#define INTERNAL_SYSCALL_DECL(err) long int err __attribute__ ((unused))
#undef INTERNAL_SYSCALL_ERROR_P
#define INTERNAL_SYSCALL_ERROR_P(val, err) ((void) (val), (long) (err))
#define INTERNAL_SYSCALL_ERROR_P(val, err) ((void) (val), (long int) (err))
#undef INTERNAL_SYSCALL_ERRNO
#define INTERNAL_SYSCALL_ERRNO(val, err) ((void) (err), val)
@@ -103,11 +103,11 @@
union __mips_syscall_return
{
long long val;
long long int val;
struct
{
long v0;
long v1;
long int v0;
long int v1;
}
reg;
};
@@ -152,13 +152,13 @@ union __mips_syscall_return
#define internal_syscall0(v0_init, input, number, err, dummy...) \
({ \
long _sys_result; \
long int _sys_result; \
\
{ \
register long __s0 asm ("$16") __attribute__ ((unused)) \
register long int __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
register long __v0 asm ("$2"); \
register long __a3 asm ("$7"); \
register long int __v0 asm ("$2"); \
register long int __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -175,14 +175,14 @@ union __mips_syscall_return
#define internal_syscall1(v0_init, input, number, err, arg1) \
({ \
long _sys_result; \
long int _sys_result; \
\
{ \
register long __s0 asm ("$16") __attribute__ ((unused)) \
register long int __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
register long __v0 asm ("$2"); \
register long __a0 asm ("$4") = (long) (arg1); \
register long __a3 asm ("$7"); \
register long int __v0 asm ("$2"); \
register long int __a0 asm ("$4") = (long int) (arg1); \
register long int __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -199,15 +199,15 @@ union __mips_syscall_return
#define internal_syscall2(v0_init, input, number, err, arg1, arg2) \
({ \
long _sys_result; \
long int _sys_result; \
\
{ \
register long __s0 asm ("$16") __attribute__ ((unused)) \
register long int __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
register long __v0 asm ("$2"); \
register long __a0 asm ("$4") = (long) (arg1); \
register long __a1 asm ("$5") = (long) (arg2); \
register long __a3 asm ("$7"); \
register long int __v0 asm ("$2"); \
register long int __a0 asm ("$4") = (long int) (arg1); \
register long int __a1 asm ("$5") = (long int) (arg2); \
register long int __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -225,16 +225,16 @@ union __mips_syscall_return
#define internal_syscall3(v0_init, input, number, err, \
arg1, arg2, arg3) \
({ \
long _sys_result; \
long int _sys_result; \
\
{ \
register long __s0 asm ("$16") __attribute__ ((unused)) \
register long int __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
register long __v0 asm ("$2"); \
register long __a0 asm ("$4") = (long) (arg1); \
register long __a1 asm ("$5") = (long) (arg2); \
register long __a2 asm ("$6") = (long) (arg3); \
register long __a3 asm ("$7"); \
register long int __v0 asm ("$2"); \
register long int __a0 asm ("$4") = (long int) (arg1); \
register long int __a1 asm ("$5") = (long int) (arg2); \
register long int __a2 asm ("$6") = (long int) (arg3); \
register long int __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -252,16 +252,16 @@ union __mips_syscall_return
#define internal_syscall4(v0_init, input, number, err, \
arg1, arg2, arg3, arg4) \
({ \
long _sys_result; \
long int _sys_result; \
\
{ \
register long __s0 asm ("$16") __attribute__ ((unused)) \
register long int __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
register long __v0 asm ("$2"); \
register long __a0 asm ("$4") = (long) (arg1); \
register long __a1 asm ("$5") = (long) (arg2); \
register long __a2 asm ("$6") = (long) (arg3); \
register long __a3 asm ("$7") = (long) (arg4); \
register long int __v0 asm ("$2"); \
register long int __a0 asm ("$4") = (long int) (arg1); \
register long int __a1 asm ("$5") = (long int) (arg2); \
register long int __a2 asm ("$6") = (long int) (arg3); \
register long int __a3 asm ("$7") = (long int) (arg4); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -285,63 +285,66 @@ union __mips_syscall_return
compiler specifics required for the stack arguments to be pushed,
which would be the case if these syscalls were inlined. */
long long __nomips16 __mips_syscall5 (long arg1, long arg2, long arg3,
long arg4, long arg5,
long number);
long long int __nomips16 __mips_syscall5 (long int arg1, long int arg2,
long int arg3, long int arg4,
long int arg5,
long int number);
libc_hidden_proto (__mips_syscall5, nomips16)
#define internal_syscall5(v0_init, input, number, err, \
arg1, arg2, arg3, arg4, arg5) \
({ \
union __mips_syscall_return _sc_ret; \
_sc_ret.val = __mips_syscall5 ((long) (arg1), \
(long) (arg2), \
(long) (arg3), \
(long) (arg4), \
(long) (arg5), \
(long) (number)); \
_sc_ret.val = __mips_syscall5 ((long int) (arg1), \
(long int) (arg2), \
(long int) (arg3), \
(long int) (arg4), \
(long int) (arg5), \
(long int) (number)); \
err = _sc_ret.reg.v1; \
_sc_ret.reg.v0; \
})
long long __nomips16 __mips_syscall6 (long arg1, long arg2, long arg3,
long arg4, long arg5, long arg6,
long number);
long long int __nomips16 __mips_syscall6 (long int arg1, long int arg2,
long int arg3, long int arg4,
long int arg5, long int arg6,
long int number);
libc_hidden_proto (__mips_syscall6, nomips16)
#define internal_syscall6(v0_init, input, number, err, \
arg1, arg2, arg3, arg4, arg5, arg6) \
({ \
union __mips_syscall_return _sc_ret; \
_sc_ret.val = __mips_syscall6 ((long) (arg1), \
(long) (arg2), \
(long) (arg3), \
(long) (arg4), \
(long) (arg5), \
(long) (arg6), \
(long) (number)); \
_sc_ret.val = __mips_syscall6 ((long int) (arg1), \
(long int) (arg2), \
(long int) (arg3), \
(long int) (arg4), \
(long int) (arg5), \
(long int) (arg6), \
(long int) (number)); \
err = _sc_ret.reg.v1; \
_sc_ret.reg.v0; \
})
long long __nomips16 __mips_syscall7 (long arg1, long arg2, long arg3,
long arg4, long arg5, long arg6,
long arg7,
long number);
long long int __nomips16 __mips_syscall7 (long int arg1, long int arg2,
long int arg3, long int arg4,
long int arg5, long int arg6,
long int arg7,
long int number);
libc_hidden_proto (__mips_syscall7, nomips16)
#define internal_syscall7(v0_init, input, number, err, \
arg1, arg2, arg3, arg4, arg5, arg6, arg7) \
({ \
union __mips_syscall_return _sc_ret; \
_sc_ret.val = __mips_syscall7 ((long) (arg1), \
(long) (arg2), \
(long) (arg3), \
(long) (arg4), \
(long) (arg5), \
(long) (arg6), \
(long) (arg7), \
(long) (number)); \
_sc_ret.val = __mips_syscall7 ((long int) (arg1), \
(long int) (arg2), \
(long int) (arg3), \
(long int) (arg4), \
(long int) (arg5), \
(long int) (arg6), \
(long int) (arg7), \
(long int) (number)); \
err = _sc_ret.reg.v1; \
_sc_ret.reg.v0; \
})