[uClibc-cvs] svn commit: trunk/uClibc/libc/sysdeps/linux/sh: bits
vapier at uclibc.org
vapier at uclibc.org
Mon Aug 8 22:01:54 UTC 2005
Author: vapier
Date: 2005-08-08 16:01:53 -0600 (Mon, 08 Aug 2005)
New Revision: 11063
Log:
remove duplicated _syscall6 definitions and unify them with a define
Modified:
trunk/uClibc/libc/sysdeps/linux/sh/bits/syscalls.h
trunk/uClibc/libc/sysdeps/linux/sh/mmap.c
Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/sh/bits/syscalls.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/sh/bits/syscalls.h 2005-08-08 22:01:02 UTC (rev 11062)
+++ trunk/uClibc/libc/sysdeps/linux/sh/bits/syscalls.h 2005-08-08 22:01:53 UTC (rev 11063)
@@ -116,6 +116,9 @@
}
/* Add in _syscall6 which is not in the kernel header */
+#ifndef __SH_SYSCALL6_TRAPA
+# define __SH_SYSCALL6_TRAPA "0x16"
+#endif
#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) \
{ \
@@ -126,7 +129,7 @@
register long __sc7 __asm__ ("r7") = (long) arg4; \
register long __sc0 __asm__ ("r0") = (long) arg5; \
register long __sc1 __asm__ ("r1") = (long) arg6; \
-__asm__ __volatile__ ("trapa #0x16" \
+__asm__ __volatile__ ("trapa #" __SH_SYSCALL6_TRAPA \
: "=z" (__sc0) \
: "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6), "r" (__sc7), \
"r" (__sc3), "r" (__sc1) \
Modified: trunk/uClibc/libc/sysdeps/linux/sh/mmap.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/sh/mmap.c 2005-08-08 22:01:02 UTC (rev 11062)
+++ trunk/uClibc/libc/sysdeps/linux/sh/mmap.c 2005-08-08 22:01:53 UTC (rev 11063)
@@ -22,50 +22,13 @@
#include <unistd.h>
#include <errno.h>
#include <sys/mman.h>
-#include <sys/syscall.h>
#ifdef HIOS
+# define __SH_SYSCALL6_TRAPA "0x2E"
+#else
+# define __SH_SYSCALL6_TRAPA "0x15"
+#endif
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5, type6,arg6) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) \
-{ \
-register long __sc3 __asm__ ("r3") = __NR_##name; \
-register long __sc4 __asm__ ("r4") = (long) arg1; \
-register long __sc5 __asm__ ("r5") = (long) arg2; \
-register long __sc6 __asm__ ("r6") = (long) arg3; \
-register long __sc7 __asm__ ("r7") = (long) arg4; \
-register long __sc0 __asm__ ("r0") = (long) arg5; \
-register long __sc1 __asm__ ("r1") = (long) arg6; \
-__asm__ __volatile__ ("trapa #0x2E" \
- : "=z" (__sc0) \
- : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6), "r" (__sc7), \
- "r" (__sc3), "r" (__sc1) \
- : "memory" ); \
-__syscall_return(type,__sc0); \
-}
+#include <sys/syscall.h>
-#else // HIOS
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5, type6,arg6) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) \
-{ \
-register long __sc3 __asm__ ("r3") = __NR_##name; \
-register long __sc4 __asm__ ("r4") = (long) arg1; \
-register long __sc5 __asm__ ("r5") = (long) arg2; \
-register long __sc6 __asm__ ("r6") = (long) arg3; \
-register long __sc7 __asm__ ("r7") = (long) arg4; \
-register long __sc0 __asm__ ("r0") = (long) arg5; \
-register long __sc1 __asm__ ("r1") = (long) arg6; \
-__asm__ __volatile__ ("trapa #0x15" \
- : "=z" (__sc0) \
- : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6), "r" (__sc7), \
- "r" (__sc3), "r" (__sc1) \
- : "memory" ); \
-__syscall_return(type,__sc0); \
-}
-
-#endif // HIOS
-
_syscall6(__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, __off_t, offset);
-
-
More information about the uClibc-cvs
mailing list