From f9834ea4774532f13c49a527c64eda1c0587f910 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 5 Feb 2013 15:31:08 +0000 Subject: MIPS: Correct formatting of syscall wrapper `asm' specifiers. --- ports/ChangeLog.mips | 5 ++ ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h | 84 +++++++++++----------- .../unix/sysv/linux/mips/mips64/n32/sysdep.h | 78 ++++++++++---------- .../unix/sysv/linux/mips/mips64/n64/sysdep.h | 78 ++++++++++---------- 4 files changed, 125 insertions(+), 120 deletions(-) diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index c5a2cb9da2..f1496e2f69 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,5 +1,10 @@ 2013-02-05 Maciej W. Rozycki + * sysdeps/unix/sysv/linux/mips/mips32/sysdep.h: Add a missing + space in asm register specifiers throughout. + * sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h: Likewise. + [BZ #15054] * sysdeps/unix/sysv/linux/mips/mips32/sysdep.h (MOVE32): New macro. diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h b/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h index 51ae813cb2..c8bfe5dc8e 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h +++ b/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h @@ -111,10 +111,10 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __s0 asm ("$16") __attribute__ ((unused)) \ = (number); \ - register long __v0 asm("$2"); \ - register long __a3 asm("$7"); \ + register long __v0 asm ("$2"); \ + register long __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -134,11 +134,11 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __v0 asm ("$2"); \ + register long __a0 asm ("$4") = (long) (arg1); \ + register long __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -158,12 +158,12 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __v0 asm ("$2"); \ + register long __a0 asm ("$4") = (long) (arg1); \ + register long __a1 asm ("$5") = (long) (arg2); \ + register long __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -184,13 +184,13 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __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"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -211,13 +211,13 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __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); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -246,13 +246,13 @@ \ FORCE_FRAME_POINTER; \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __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); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ "subu\t$29, 32\n\t" \ @@ -278,13 +278,13 @@ \ FORCE_FRAME_POINTER; \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __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); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ "subu\t$29, 32\n\t" \ @@ -311,13 +311,13 @@ \ FORCE_FRAME_POINTER; \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __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); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ "subu\t$29, 32\n\t" \ diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h b/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h index 41a6f22b0f..452c2c70eb 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h @@ -115,10 +115,10 @@ long _sys_result; \ \ { \ - register long long __s0 asm("$16") __attribute__ ((unused)) \ + register long long __s0 asm ("$16") __attribute__ ((unused)) \ = (number); \ - register long long __v0 asm("$2"); \ - register long long __a3 asm("$7"); \ + register long long __v0 asm ("$2"); \ + register long long __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -138,11 +138,11 @@ long _sys_result; \ \ { \ - register long long __s0 asm("$16") __attribute__ ((unused)) \ + register long long __s0 asm ("$16") __attribute__ ((unused)) \ = (number); \ - register long long __v0 asm("$2"); \ - register long long __a0 asm("$4") = ARGIFY (arg1); \ - register long long __a3 asm("$7"); \ + register long long __v0 asm ("$2"); \ + register long long __a0 asm ("$4") = ARGIFY (arg1); \ + register long long __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -162,12 +162,12 @@ long _sys_result; \ \ { \ - register long long __s0 asm("$16") __attribute__ ((unused)) \ + register long long __s0 asm ("$16") __attribute__ ((unused)) \ = (number); \ - register long long __v0 asm("$2"); \ - register long long __a0 asm("$4") = ARGIFY (arg1); \ - register long long __a1 asm("$5") = ARGIFY (arg2); \ - register long long __a3 asm("$7"); \ + register long long __v0 asm ("$2"); \ + register long long __a0 asm ("$4") = ARGIFY (arg1); \ + register long long __a1 asm ("$5") = ARGIFY (arg2); \ + register long long __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -188,13 +188,13 @@ long _sys_result; \ \ { \ - register long long __s0 asm("$16") __attribute__ ((unused)) \ + register long long __s0 asm ("$16") __attribute__ ((unused)) \ = (number); \ - register long long __v0 asm("$2"); \ - register long long __a0 asm("$4") = ARGIFY (arg1); \ - register long long __a1 asm("$5") = ARGIFY (arg2); \ - register long long __a2 asm("$6") = ARGIFY (arg3); \ - register long long __a3 asm("$7"); \ + register long long __v0 asm ("$2"); \ + register long long __a0 asm ("$4") = ARGIFY (arg1); \ + register long long __a1 asm ("$5") = ARGIFY (arg2); \ + register long long __a2 asm ("$6") = ARGIFY (arg3); \ + register long long __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -215,13 +215,13 @@ long _sys_result; \ \ { \ - register long long __s0 asm("$16") __attribute__ ((unused)) \ + register long long __s0 asm ("$16") __attribute__ ((unused)) \ = (number); \ - register long long __v0 asm("$2"); \ - register long long __a0 asm("$4") = ARGIFY (arg1); \ - register long long __a1 asm("$5") = ARGIFY (arg2); \ - register long long __a2 asm("$6") = ARGIFY (arg3); \ - register long long __a3 asm("$7") = ARGIFY (arg4); \ + register long long __v0 asm ("$2"); \ + register long long __a0 asm ("$4") = ARGIFY (arg1); \ + register long long __a1 asm ("$5") = ARGIFY (arg2); \ + register long long __a2 asm ("$6") = ARGIFY (arg3); \ + register long long __a3 asm ("$7") = ARGIFY (arg4); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -242,14 +242,14 @@ long _sys_result; \ \ { \ - register long long __s0 asm("$16") __attribute__ ((unused)) \ + register long long __s0 asm ("$16") __attribute__ ((unused)) \ = (number); \ - register long long __v0 asm("$2"); \ - register long long __a0 asm("$4") = ARGIFY (arg1); \ - register long long __a1 asm("$5") = ARGIFY (arg2); \ - register long long __a2 asm("$6") = ARGIFY (arg3); \ - register long long __a3 asm("$7") = ARGIFY (arg4); \ - register long long __a4 asm("$8") = ARGIFY (arg5); \ + register long long __v0 asm ("$2"); \ + register long long __a0 asm ("$4") = ARGIFY (arg1); \ + register long long __a1 asm ("$5") = ARGIFY (arg2); \ + register long long __a2 asm ("$6") = ARGIFY (arg3); \ + register long long __a3 asm ("$7") = ARGIFY (arg4); \ + register long long __a4 asm ("$8") = ARGIFY (arg5); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -270,15 +270,15 @@ long _sys_result; \ \ { \ - register long long __s0 asm("$16") __attribute__ ((unused)) \ + register long long __s0 asm ("$16") __attribute__ ((unused)) \ = (number); \ - register long long __v0 asm("$2"); \ - register long long __a0 asm("$4") = ARGIFY (arg1); \ - register long long __a1 asm("$5") = ARGIFY (arg2); \ - register long long __a2 asm("$6") = ARGIFY (arg3); \ - register long long __a3 asm("$7") = ARGIFY (arg4); \ - register long long __a4 asm("$8") = ARGIFY (arg5); \ - register long long __a5 asm("$9") = ARGIFY (arg6); \ + register long long __v0 asm ("$2"); \ + register long long __a0 asm ("$4") = ARGIFY (arg1); \ + register long long __a1 asm ("$5") = ARGIFY (arg2); \ + register long long __a2 asm ("$6") = ARGIFY (arg3); \ + register long long __a3 asm ("$7") = ARGIFY (arg4); \ + register long long __a4 asm ("$8") = ARGIFY (arg5); \ + register long long __a5 asm ("$9") = ARGIFY (arg6); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h b/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h index fecd3e433a..d16ed6941c 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h @@ -111,10 +111,10 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __s0 asm ("$16") __attribute__ ((unused)) \ = (number); \ - register long __v0 asm("$2"); \ - register long __a3 asm("$7"); \ + register long __v0 asm ("$2"); \ + register long __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -134,11 +134,11 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __v0 asm ("$2"); \ + register long __a0 asm ("$4") = (long) (arg1); \ + register long __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -158,12 +158,12 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __v0 asm ("$2"); \ + register long __a0 asm ("$4") = (long) (arg1); \ + register long __a1 asm ("$5") = (long) (arg2); \ + register long __a3 asm ("$7"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -184,13 +184,13 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __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"); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -211,13 +211,13 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __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); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -238,14 +238,14 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __a4 asm("$8") = (long) (arg5); \ + 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 __a4 asm ("$8") = (long) (arg5); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ @@ -266,15 +266,15 @@ long _sys_result; \ \ { \ - register long __s0 asm("$16") __attribute__ ((unused)) \ + register long __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 __a4 asm("$8") = (long) (arg5); \ - register long __a5 asm("$9") = (long) (arg6); \ + 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 __a4 asm ("$8") = (long) (arg5); \ + register long __a5 asm ("$9") = (long) (arg6); \ __asm__ volatile ( \ ".set\tnoreorder\n\t" \ v0_init \ -- cgit 1.4.1