(INTERNAL_SYSCALL): Add

LOAD_REGS_##nr.
(LOAD_ARGS_0, LOAD_ARGS_1, LOAD_ARGS_2, LOAD_ARGS_3, LOAD_ARGS_4)
(LOAD_ARGS_5, LOAD_ARGS_6): Load argument values into temporary
variables.
(LOAD_REGS_0, LOAD_REGS_1, LOAD_REGS_2, LOAD_REGS_3, LOAD_REGS_4)
(LOAD_REGS_5, LOAD_REGS_6): New macros to actually load the
syscall argument registers.

diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
index 3c6266b..234ce32 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Andreas Schwab, <schwab@issan.informatik.uni-dortmund.de>,
    December 1995.
@@ -225,7 +225,11 @@ SYSCALL_ERROR_LABEL:                                                             \
 #define INTERNAL_SYSCALL(name, err, nr, args...)       \
   ({ unsigned int _sys_result;                         \
      {                                                 \
+       /* Load argument values in temporary variables
+         to perform side effects like function calls
+         before the call used registers are set.  */   \
        LOAD_ARGS_##nr (args)                           \
+       LOAD_REGS_##nr                                  \
        register int _d0 asm ("%d0") = __NR_##name;     \
        asm volatile ("trap #0"                         \
                     : "=d" (_d0)                       \
@@ -243,30 +247,49 @@ SYSCALL_ERROR_LABEL:                                                            \
 #define INTERNAL_SYSCALL_ERRNO(val, err)       (-(val))
 
 #define LOAD_ARGS_0()
+#define LOAD_REGS_0
 #define ASM_ARGS_0
 #define LOAD_ARGS_1(a1)                                \
-  register int _d1 asm ("d1") = (int) (a1);    \
-  LOAD_ARGS_0 ()
+  LOAD_ARGS_0 ()                               \
+  int __arg1 = (int) (a1);
+#define LOAD_REGS_1                            \
+  register int _d1 asm ("d1") = __arg1;                \
+  LOAD_REGS_0
 #define ASM_ARGS_1     ASM_ARGS_0, "d" (_d1)
 #define LOAD_ARGS_2(a1, a2)                    \
-  register int _d2 asm ("d2") = (int) (a2);    \
-  LOAD_ARGS_1 (a1)
+  LOAD_ARGS_1 (a1)                             \
+  int __arg2 = (int) (a2);
+#define LOAD_REGS_2                            \
+  register int _d2 asm ("d2") = __arg2;                \
+  LOAD_REGS_1
 #define ASM_ARGS_2     ASM_ARGS_1, "d" (_d2)
 #define LOAD_ARGS_3(a1, a2, a3)                        \
-  register int _d3 asm ("d3") = (int) (a3);    \
-  LOAD_ARGS_2 (a1, a2)
+  LOAD_ARGS_2 (a1, a2)                         \
+  int __arg3 = (int) (a3);
+#define LOAD_REGS_3                            \
+  register int _d3 asm ("d3") = __arg3;                \
+  LOAD_REGS_2
 #define ASM_ARGS_3     ASM_ARGS_2, "d" (_d3)
 #define LOAD_ARGS_4(a1, a2, a3, a4)            \
-  register int _d4 asm ("d4") = (int) (a4);    \
-  LOAD_ARGS_3 (a1, a2, a3)
+  LOAD_ARGS_3 (a1, a2, a3)                     \
+  int __arg4 = (int) (a4);
+#define LOAD_REGS_4                            \
+  register int _d4 asm ("d4") = __arg4;                \
+  LOAD_REGS_3
 #define ASM_ARGS_4     ASM_ARGS_3, "d" (_d4)
 #define LOAD_ARGS_5(a1, a2, a3, a4, a5)                \
-  register int _d5 asm ("d5") = (int) (a5);    \
-  LOAD_ARGS_4 (a1, a2, a3, a4)
+  LOAD_ARGS_4 (a1, a2, a3, a4)                 \
+  int __arg5 = (int) (a5);
+#define LOAD_REGS_5                            \
+  register int _d5 asm ("d5") = __arg5;                \
+  LOAD_REGS_4
 #define ASM_ARGS_5     ASM_ARGS_4, "d" (_d5)
 #define LOAD_ARGS_6(a1, a2, a3, a4, a5, a6)    \
-  register int _a0 asm ("a0") = (int) (a6);    \
-  LOAD_ARGS_5 (a1, a2, a3, a4, a5)
+  LOAD_ARGS_5 (a1, a2, a3, a4, a5)             \
+  int __arg6 = (int) (a6);
+#define LOAD_REGS_6                            \
+  register int _a0 asm ("a0") = __arg6;                \
+  LOAD_REGS_5
 #define ASM_ARGS_6     ASM_ARGS_5, "a" (_a0)
 
 #endif /* not __ASSEMBLER__ */