diff options
| -rw-r--r-- | sysdeps/unix/mips/mips64/n64/sysdep.h | 64 | ||||
| -rw-r--r-- | sysdeps/unix/mips/mips64/sysdep.h (renamed from sysdeps/unix/mips/mips64/n32/sysdep.h) | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h | 328 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/sysdep.h (renamed from sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h) | 130 |
4 files changed, 70 insertions, 455 deletions
diff --git a/sysdeps/unix/mips/mips64/n64/sysdep.h b/sysdeps/unix/mips/mips64/n64/sysdep.h deleted file mode 100644 index 3d8b254017..0000000000 --- a/sysdeps/unix/mips/mips64/n64/sysdep.h +++ /dev/null @@ -1,64 +0,0 @@ -/* Copyright (C) 1992-2020 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Alexandre Oliva <aoliva@redhat.com>. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - <https://www.gnu.org/licenses/>. */ - -#include <sysdeps/unix/mips/sysdep.h> - -#ifdef __ASSEMBLER__ - -/* Note that while it's better structurally, going back to call __syscall_error - can make things confusing if you're debugging---it looks like it's jumping - backwards into the previous fn. */ -#ifdef __PIC__ -#define PSEUDO(name, syscall_name, args) \ - .align 2; \ - .set nomips16; \ - cfi_startproc; \ - 99:; \ - .set noat; \ - .cpsetup t9, $1, name; \ - cfi_register (gp, $1); \ - .set at; \ - dla t9,__syscall_error; \ - .cpreturn; \ - cfi_restore (gp); \ - jr t9; \ - cfi_endproc; \ - ENTRY(name) \ - li v0, SYS_ify(syscall_name); \ - syscall; \ - bne a3, zero, 99b; \ -L(syse1): -#else -#define PSEUDO(name, syscall_name, args) \ - .set noreorder; \ - .align 2; \ - .set nomips16; \ - cfi_startproc; \ - 99: j __syscall_error; \ - nop; \ - cfi_endproc; \ - ENTRY(name) \ - .set noreorder; \ - li v0, SYS_ify(syscall_name); \ - syscall; \ - .set reorder; \ - bne a3, zero, 99b; \ -L(syse1): -#endif - -#endif diff --git a/sysdeps/unix/mips/mips64/n32/sysdep.h b/sysdeps/unix/mips/mips64/sysdep.h index 65ce7c5406..fb5f27daf3 100644 --- a/sysdeps/unix/mips/mips64/n32/sysdep.h +++ b/sysdeps/unix/mips/mips64/sysdep.h @@ -19,6 +19,7 @@ #include <sysdeps/unix/mips/sysdep.h> #ifdef __ASSEMBLER__ +#include <sys/asm.h> /* Note that while it's better structurally, going back to call __syscall_error can make things confusing if you're debugging---it looks like it's jumping @@ -33,7 +34,7 @@ .cpsetup t9, $1, name; \ cfi_register (gp, $1); \ .set at; \ - la t9,__syscall_error; \ + PTR_LA t9,__syscall_error; \ .cpreturn; \ cfi_restore (gp); \ jr t9; \ diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h deleted file mode 100644 index 3e1f1cc3c5..0000000000 --- a/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h +++ /dev/null @@ -1,328 +0,0 @@ -/* Copyright (C) 2000-2020 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - <https://www.gnu.org/licenses/>. */ - -#ifndef _LINUX_MIPS_SYSDEP_H -#define _LINUX_MIPS_SYSDEP_H 1 - -/* There is some commonality. */ -#include <sysdeps/unix/sysv/linux/mips/sysdep.h> -#include <sysdeps/unix/sysv/linux/sysdep.h> -#include <sysdeps/unix/mips/mips64/n64/sysdep.h> - -#include <tls.h> - -/* In order to get __set_errno() definition in INLINE_SYSCALL. */ -#ifndef __ASSEMBLER__ -#include <errno.h> -#endif - -/* For Linux we can use the system call table in the header file - /usr/include/asm/unistd.h - of the kernel. But these symbols do not follow the SYS_* syntax - so we have to redefine the `SYS_ify' macro here. */ -#undef SYS_ify -#define SYS_ify(syscall_name) __NR_##syscall_name - -#ifdef __ASSEMBLER__ - -/* We don't want the label for the error handler to be visible in the symbol - table when we define it here. */ -# define SYSCALL_ERROR_LABEL 99b - -#else /* ! __ASSEMBLER__ */ - -/* Define a macro which expands into the inline wrapper code for a system - call. */ -#undef INLINE_SYSCALL -#define INLINE_SYSCALL(name, nr, args...) \ - ({ INTERNAL_SYSCALL_DECL (_sc_err); \ - 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)); \ - result_var = -1L; \ - } \ - result_var; }) - -#undef INTERNAL_SYSCALL_DECL -#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 int) (err)) - -#undef INTERNAL_SYSCALL_ERRNO -#define INTERNAL_SYSCALL_ERRNO(val, err) ((void) (err), val) - -/* Note that the original Linux syscall restart convention required the - instruction immediately preceding SYSCALL to initialize $v0 with the - syscall number. Then if a restart triggered, $v0 would have been - clobbered by the syscall interrupted, and needed to be reinititalized. - The kernel would decrement the PC by 4 before switching back to the - user mode so that $v0 had been reloaded before SYSCALL was executed - again. This implied the place $v0 was loaded from must have been - preserved across a syscall, e.g. an immediate, static register, stack - slot, etc. - - The convention was relaxed in Linux with a change applied to the kernel - GIT repository as commit 96187fb0bc30cd7919759d371d810e928048249d, that - first appeared in the 2.6.36 release. Since then the kernel has had - code that reloads $v0 upon syscall restart and resumes right at the - SYSCALL instruction, so no special arrangement is needed anymore. - - For backwards compatibility with existing kernel binaries we support - the old convention by choosing the instruction preceding SYSCALL - carefully. This also means we have to force a 32-bit encoding of the - microMIPS MOVE instruction if one is used. */ - -#ifdef __mips_micromips -# define MOVE32 "move32" -#else -# define MOVE32 "move" -#endif - -#undef INTERNAL_SYSCALL -#define INTERNAL_SYSCALL(name, err, nr, args...) \ - internal_syscall##nr ("li\t%0, %2\t\t\t# " #name "\n\t", \ - "IK" (SYS_ify (name)), \ - 0, err, args) - -#undef INTERNAL_SYSCALL_NCS -#define INTERNAL_SYSCALL_NCS(number, err, nr, args...) \ - internal_syscall##nr (MOVE32 "\t%0, %2\n\t", \ - "r" (__s0), \ - number, err, args) - -#define internal_syscall0(v0_init, input, number, err, dummy...) \ -({ \ - long int _sys_result; \ - \ - { \ - register long int __s0 asm ("$16") __attribute__ ((unused)) \ - = (number); \ - register long int __v0 asm ("$2"); \ - register long int __a3 asm ("$7"); \ - __asm__ volatile ( \ - ".set\tnoreorder\n\t" \ - v0_init \ - "syscall\n\t" \ - ".set reorder" \ - : "=r" (__v0), "=r" (__a3) \ - : input \ - : __SYSCALL_CLOBBERS); \ - err = __a3; \ - _sys_result = __v0; \ - } \ - _sys_result; \ -}) - -#define internal_syscall1(v0_init, input, number, err, arg1) \ -({ \ - long int _sys_result; \ - \ - { \ - long int _arg1 = (long int) (arg1); \ - register long int __s0 asm ("$16") __attribute__ ((unused)) \ - = (number); \ - register long int __v0 asm ("$2"); \ - register long int __a0 asm ("$4") = _arg1; \ - register long int __a3 asm ("$7"); \ - __asm__ volatile ( \ - ".set\tnoreorder\n\t" \ - v0_init \ - "syscall\n\t" \ - ".set reorder" \ - : "=r" (__v0), "=r" (__a3) \ - : input, "r" (__a0) \ - : __SYSCALL_CLOBBERS); \ - err = __a3; \ - _sys_result = __v0; \ - } \ - _sys_result; \ -}) - -#define internal_syscall2(v0_init, input, number, err, arg1, arg2) \ -({ \ - long int _sys_result; \ - \ - { \ - long int _arg1 = (long int) (arg1); \ - long int _arg2 = (long int) (arg2); \ - register long int __s0 asm ("$16") __attribute__ ((unused)) \ - = (number); \ - register long int __v0 asm ("$2"); \ - register long int __a0 asm ("$4") = _arg1; \ - register long int __a1 asm ("$5") = _arg2; \ - register long int __a3 asm ("$7"); \ - __asm__ volatile ( \ - ".set\tnoreorder\n\t" \ - v0_init \ - "syscall\n\t" \ - ".set\treorder" \ - : "=r" (__v0), "=r" (__a3) \ - : input, "r" (__a0), "r" (__a1) \ - : __SYSCALL_CLOBBERS); \ - err = __a3; \ - _sys_result = __v0; \ - } \ - _sys_result; \ -}) - -#define internal_syscall3(v0_init, input, number, err, \ - arg1, arg2, arg3) \ -({ \ - long int _sys_result; \ - \ - { \ - long int _arg1 = (long int) (arg1); \ - long int _arg2 = (long int) (arg2); \ - long int _arg3 = (long int) (arg3); \ - register long int __s0 asm ("$16") __attribute__ ((unused)) \ - = (number); \ - register long int __v0 asm ("$2"); \ - register long int __a0 asm ("$4") = _arg1; \ - register long int __a1 asm ("$5") = _arg2; \ - register long int __a2 asm ("$6") = _arg3; \ - register long int __a3 asm ("$7"); \ - __asm__ volatile ( \ - ".set\tnoreorder\n\t" \ - v0_init \ - "syscall\n\t" \ - ".set\treorder" \ - : "=r" (__v0), "=r" (__a3) \ - : input, "r" (__a0), "r" (__a1), "r" (__a2) \ - : __SYSCALL_CLOBBERS); \ - err = __a3; \ - _sys_result = __v0; \ - } \ - _sys_result; \ -}) - -#define internal_syscall4(v0_init, input, number, err, \ - arg1, arg2, arg3, arg4) \ -({ \ - long int _sys_result; \ - \ - { \ - 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 __s0 asm ("$16") __attribute__ ((unused)) \ - = (number); \ - register long int __v0 asm ("$2"); \ - register long int __a0 asm ("$4") = _arg1; \ - register long int __a1 asm ("$5") = _arg2; \ - register long int __a2 asm ("$6") = _arg3; \ - register long int __a3 asm ("$7") = _arg4; \ - __asm__ volatile ( \ - ".set\tnoreorder\n\t" \ - v0_init \ - "syscall\n\t" \ - ".set\treorder" \ - : "=r" (__v0), "+r" (__a3) \ - : input, "r" (__a0), "r" (__a1), "r" (__a2) \ - : __SYSCALL_CLOBBERS); \ - err = __a3; \ - _sys_result = __v0; \ - } \ - _sys_result; \ -}) - -#define internal_syscall5(v0_init, input, number, err, \ - arg1, arg2, arg3, arg4, arg5) \ -({ \ - long int _sys_result; \ - \ - { \ - 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 __s0 asm ("$16") __attribute__ ((unused)) \ - = (number); \ - register long int __v0 asm ("$2"); \ - register long int __a0 asm ("$4") = _arg1; \ - register long int __a1 asm ("$5") = _arg2; \ - register long int __a2 asm ("$6") = _arg3; \ - register long int __a3 asm ("$7") = _arg4; \ - register long int __a4 asm ("$8") = _arg5; \ - __asm__ volatile ( \ - ".set\tnoreorder\n\t" \ - v0_init \ - "syscall\n\t" \ - ".set\treorder" \ - : "=r" (__v0), "+r" (__a3) \ - : input, "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a4) \ - : __SYSCALL_CLOBBERS); \ - err = __a3; \ - _sys_result = __v0; \ - } \ - _sys_result; \ -}) - -#define internal_syscall6(v0_init, input, number, err, \ - arg1, arg2, arg3, arg4, arg5, arg6) \ -({ \ - long int _sys_result; \ - \ - { \ - 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 __s0 asm ("$16") __attribute__ ((unused)) \ - = (number); \ - register long int __v0 asm ("$2"); \ - register long int __a0 asm ("$4") = _arg1; \ - register long int __a1 asm ("$5") = _arg2; \ - register long int __a2 asm ("$6") = _arg3; \ - register long int __a3 asm ("$7") = _arg4; \ - register long int __a4 asm ("$8") = _arg5; \ - register long int __a5 asm ("$9") = _arg6; \ - __asm__ volatile ( \ - ".set\tnoreorder\n\t" \ - v0_init \ - "syscall\n\t" \ - ".set\treorder" \ - : "=r" (__v0), "+r" (__a3) \ - : input, "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a4), \ - "r" (__a5) \ - : __SYSCALL_CLOBBERS); \ - err = __a3; \ - _sys_result = __v0; \ - } \ - _sys_result; \ -}) - -#if __mips_isa_rev >= 6 -# define __SYSCALL_CLOBBERS "$1", "$3", "$10", "$11", "$12", "$13", \ - "$14", "$15", "$24", "$25", "memory" -#else -# define __SYSCALL_CLOBBERS "$1", "$3", "$10", "$11", "$12", "$13", \ - "$14", "$15", "$24", "$25", "hi", "lo", "memory" -#endif - -#endif /* __ASSEMBLER__ */ - -/* Pointer mangling is not yet supported for MIPS. */ -#define PTR_MANGLE(var) (void) (var) -#define PTR_DEMANGLE(var) (void) (var) - -#endif /* linux/mips/sysdep.h */ diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h b/sysdeps/unix/sysv/linux/mips/mips64/sysdep.h index 4a9d7054f9..0c1fda50ce 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h +++ b/sysdeps/unix/sysv/linux/mips/mips64/sysdep.h @@ -21,7 +21,7 @@ /* There is some commonality. */ #include <sysdeps/unix/sysv/linux/mips/sysdep.h> #include <sysdeps/unix/sysv/linux/sysdep.h> -#include <sysdeps/unix/mips/mips64/n32/sysdep.h> +#include <sysdeps/unix/mips/mips64/sysdep.h> #include <tls.h> @@ -45,9 +45,15 @@ #else /* ! __ASSEMBLER__ */ +#if _MIPS_SIM == _ABIN32 /* Convert X to a long long, without losing any bits if it is one already or warning if it is a 32-bit pointer. */ -#define ARGIFY(X) ((long long int) (__typeof__ ((X) - (X))) (X)) +# define ARGIFY(X) ((long long int) (__typeof__ ((X) - (X))) (X)) +typedef long long int __syscall_arg_t; +#else +# define ARGIFY(X) ((long int) (X)) +typedef long int __syscall_arg_t; +#endif /* Define a macro which expands into the inline wrapper code for a system call. */ @@ -115,10 +121,10 @@ long int _sys_result; \ \ { \ - register long long int __s0 asm ("$16") __attribute__ ((unused))\ + register __syscall_arg_t __s0 asm ("$16") __attribute__ ((unused))\ = (number); \ - register long long int __v0 asm ("$2"); \ - register long long int __a3 asm ("$7"); \ + register __syscall_arg_t __v0 asm ("$2"); \ + register __syscall_arg_t __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -138,12 +144,12 @@ long int _sys_result; \ \ { \ - long long int _arg1 = ARGIFY (arg1); \ - register long long int __s0 asm ("$16") __attribute__ ((unused))\ + __syscall_arg_t _arg1 = ARGIFY (arg1); \ + register __syscall_arg_t __s0 asm ("$16") __attribute__ ((unused))\ = (number); \ - register long long int __v0 asm ("$2"); \ - register long long int __a0 asm ("$4") = _arg1; \ - register long long int __a3 asm ("$7"); \ + register __syscall_arg_t __v0 asm ("$2"); \ + register __syscall_arg_t __a0 asm ("$4") = _arg1; \ + register __syscall_arg_t __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -163,14 +169,14 @@ long int _sys_result; \ \ { \ - long long int _arg1 = ARGIFY (arg1); \ - long long int _arg2 = ARGIFY (arg2); \ - register long long int __s0 asm ("$16") __attribute__ ((unused))\ + __syscall_arg_t _arg1 = ARGIFY (arg1); \ + __syscall_arg_t _arg2 = ARGIFY (arg2); \ + register __syscall_arg_t __s0 asm ("$16") __attribute__ ((unused))\ = (number); \ - register long long int __v0 asm ("$2"); \ - register long long int __a0 asm ("$4") = _arg1; \ - register long long int __a1 asm ("$5") = _arg2; \ - register long long int __a3 asm ("$7"); \ + register __syscall_arg_t __v0 asm ("$2"); \ + register __syscall_arg_t __a0 asm ("$4") = _arg1; \ + register __syscall_arg_t __a1 asm ("$5") = _arg2; \ + register __syscall_arg_t __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -191,16 +197,16 @@ long int _sys_result; \ \ { \ - long long int _arg1 = ARGIFY (arg1); \ - long long int _arg2 = ARGIFY (arg2); \ - long long int _arg3 = ARGIFY (arg3); \ - register long long int __s0 asm ("$16") __attribute__ ((unused))\ + __syscall_arg_t _arg1 = ARGIFY (arg1); \ + __syscall_arg_t _arg2 = ARGIFY (arg2); \ + __syscall_arg_t _arg3 = ARGIFY (arg3); \ + register __syscall_arg_t __s0 asm ("$16") __attribute__ ((unused))\ = (number); \ - register long long int __v0 asm ("$2"); \ - register long long int __a0 asm ("$4") = _arg1; \ - register long long int __a1 asm ("$5") = _arg2; \ - register long long int __a2 asm ("$6") = _arg3; \ - register long long int __a3 asm ("$7"); \ + register __syscall_arg_t __v0 asm ("$2"); \ + register __syscall_arg_t __a0 asm ("$4") = _arg1; \ + register __syscall_arg_t __a1 asm ("$5") = _arg2; \ + register __syscall_arg_t __a2 asm ("$6") = _arg3; \ + register __syscall_arg_t __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -221,17 +227,17 @@ long int _sys_result; \ \ { \ - long long int _arg1 = ARGIFY (arg1); \ - long long int _arg2 = ARGIFY (arg2); \ - long long int _arg3 = ARGIFY (arg3); \ - long long int _arg4 = ARGIFY (arg4); \ - register long long int __s0 asm ("$16") __attribute__ ((unused))\ + __syscall_arg_t _arg1 = ARGIFY (arg1); \ + __syscall_arg_t _arg2 = ARGIFY (arg2); \ + __syscall_arg_t _arg3 = ARGIFY (arg3); \ + __syscall_arg_t _arg4 = ARGIFY (arg4); \ + register __syscall_arg_t __s0 asm ("$16") __attribute__ ((unused))\ = (number); \ - register long long int __v0 asm ("$2"); \ - register long long int __a0 asm ("$4") = _arg1; \ - register long long int __a1 asm ("$5") = _arg2; \ - register long long int __a2 asm ("$6") = _arg3; \ - register long long int __a3 asm ("$7") = _arg4; \ + register __syscall_arg_t __v0 asm ("$2"); \ + register __syscall_arg_t __a0 asm ("$4") = _arg1; \ + register __syscall_arg_t __a1 asm ("$5") = _arg2; \ + register __syscall_arg_t __a2 asm ("$6") = _arg3; \ + register __syscall_arg_t __a3 asm ("$7") = _arg4; \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -252,19 +258,19 @@ long int _sys_result; \ \ { \ - long long int _arg1 = ARGIFY (arg1); \ - long long int _arg2 = ARGIFY (arg2); \ - long long int _arg3 = ARGIFY (arg3); \ - long long int _arg4 = ARGIFY (arg4); \ - long long int _arg5 = ARGIFY (arg5); \ - register long long int __s0 asm ("$16") __attribute__ ((unused))\ + __syscall_arg_t _arg1 = ARGIFY (arg1); \ + __syscall_arg_t _arg2 = ARGIFY (arg2); \ + __syscall_arg_t _arg3 = ARGIFY (arg3); \ + __syscall_arg_t _arg4 = ARGIFY (arg4); \ + __syscall_arg_t _arg5 = ARGIFY (arg5); \ + register __syscall_arg_t __s0 asm ("$16") __attribute__ ((unused))\ = (number); \ - register long long int __v0 asm ("$2"); \ - register long long int __a0 asm ("$4") = _arg1; \ - register long long int __a1 asm ("$5") = _arg2; \ - register long long int __a2 asm ("$6") = _arg3; \ - register long long int __a3 asm ("$7") = _arg4; \ - register long long int __a4 asm ("$8") = _arg5; \ + register __syscall_arg_t __v0 asm ("$2"); \ + register __syscall_arg_t __a0 asm ("$4") = _arg1; \ + register __syscall_arg_t __a1 asm ("$5") = _arg2; \ + register __syscall_arg_t __a2 asm ("$6") = _arg3; \ + register __syscall_arg_t __a3 asm ("$7") = _arg4; \ + register __syscall_arg_t __a4 asm ("$8") = _arg5; \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -285,21 +291,21 @@ long int _sys_result; \ \ { \ - long long int _arg1 = ARGIFY (arg1); \ - long long int _arg2 = ARGIFY (arg2); \ - long long int _arg3 = ARGIFY (arg3); \ - long long int _arg4 = ARGIFY (arg4); \ - long long int _arg5 = ARGIFY (arg5); \ - long long int _arg6 = ARGIFY (arg6); \ - register long long int __s0 asm ("$16") __attribute__ ((unused))\ + __syscall_arg_t _arg1 = ARGIFY (arg1); \ + __syscall_arg_t _arg2 = ARGIFY (arg2); \ + __syscall_arg_t _arg3 = ARGIFY (arg3); \ + __syscall_arg_t _arg4 = ARGIFY (arg4); \ + __syscall_arg_t _arg5 = ARGIFY (arg5); \ + __syscall_arg_t _arg6 = ARGIFY (arg6); \ + register __syscall_arg_t __s0 asm ("$16") __attribute__ ((unused))\ = (number); \ - register long long int __v0 asm ("$2"); \ - register long long int __a0 asm ("$4") = _arg1; \ - register long long int __a1 asm ("$5") = _arg2; \ - register long long int __a2 asm ("$6") = _arg3; \ - register long long int __a3 asm ("$7") = _arg4; \ - register long long int __a4 asm ("$8") = _arg5; \ - register long long int __a5 asm ("$9") = _arg6; \ + register __syscall_arg_t __v0 asm ("$2"); \ + register __syscall_arg_t __a0 asm ("$4") = _arg1; \ + register __syscall_arg_t __a1 asm ("$5") = _arg2; \ + register __syscall_arg_t __a2 asm ("$6") = _arg3; \ + register __syscall_arg_t __a3 asm ("$7") = _arg4; \ + register __syscall_arg_t __a4 asm ("$8") = _arg5; \ + register __syscall_arg_t __a5 asm ("$9") = _arg6; \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ |