| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166 |
- --- linux-libc-headers-2.6.12.0/include/asm-arm/unistd.h 2005-07-06 03:17:41.000000000 +0300
- +++ linux-libc-headers-2.6.12.0-arm-eabi/include/asm-arm/unistd.h 2006-06-05 17:14:09.000000000 +0300
- @@ -15,10 +15,12 @@
-
- #include <linux/linkage.h>
-
- -#if defined(__thumb__)
- +#define __NR_OABI_SYSCALL_BASE 0x900000
- +
- +#if defined(__thumb__) || defined(__ARM_EABI__)
- #define __NR_SYSCALL_BASE 0
- #else
- -#define __NR_SYSCALL_BASE 0x900000
- +#define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE
- #endif
-
- /*
- @@ -365,13 +375,13 @@
- #define __sys1(x) __sys2(x)
-
- #ifndef __syscall
- -#if defined(__thumb__)
- -#define __syscall(name) \
- - "push {r7}\n\t" \
- - "mov r7, #" __sys1(__NR_##name) "\n\t" \
- - "swi 0\n\t" \
- - "pop {r7}"
- +#if defined(__thumb__) || defined(__ARM_EABI__)
- +#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name;
- +#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs
- +#define __syscall(name) "swi\t0"
- #else
- +#define __SYS_REG(name)
- +#define __SYS_REG_LIST(regs...) regs
- #define __syscall(name) "swi\t" __sys1(__NR_##name) ""
- #endif
- #endif
- @@ -387,33 +397,34 @@
-
- #define _syscall0(type,name) \
- type name(void) { \
- + __SYS_REG(name) \
- register long __res_r0 __asm__("r0"); \
- long __res; \
- __asm__ __volatile__ ( \
- __syscall(name) \
- : "=r" (__res_r0) \
- - : \
- - : "lr"); \
- + : __SYS_REG_LIST() ); \
- __res = __res_r0; \
- __syscall_return(type,__res); \
- }
-
- #define _syscall1(type,name,type1,arg1) \
- type name(type1 arg1) { \
- + __SYS_REG(name) \
- register long __r0 __asm__("r0") = (long)arg1; \
- register long __res_r0 __asm__("r0"); \
- long __res; \
- __asm__ __volatile__ ( \
- __syscall(name) \
- : "=r" (__res_r0) \
- - : "r" (__r0) \
- - : "lr"); \
- + : __SYS_REG_LIST( "0" (__r0) ) ); \
- __res = __res_r0; \
- __syscall_return(type,__res); \
- }
-
- #define _syscall2(type,name,type1,arg1,type2,arg2) \
- type name(type1 arg1,type2 arg2) { \
- + __SYS_REG(name) \
- register long __r0 __asm__("r0") = (long)arg1; \
- register long __r1 __asm__("r1") = (long)arg2; \
- register long __res_r0 __asm__("r0"); \
- @@ -421,8 +432,7 @@
- __asm__ __volatile__ ( \
- __syscall(name) \
- : "=r" (__res_r0) \
- - : "r" (__r0),"r" (__r1) \
- - : "lr"); \
- + : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) ); \
- __res = __res_r0; \
- __syscall_return(type,__res); \
- }
- @@ -430,6 +440,7 @@
-
- #define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
- type name(type1 arg1,type2 arg2,type3 arg3) { \
- + __SYS_REG(name) \
- register long __r0 __asm__("r0") = (long)arg1; \
- register long __r1 __asm__("r1") = (long)arg2; \
- register long __r2 __asm__("r2") = (long)arg3; \
- @@ -438,8 +449,7 @@
- __asm__ __volatile__ ( \
- __syscall(name) \
- : "=r" (__res_r0) \
- - : "r" (__r0),"r" (__r1),"r" (__r2) \
- - : "lr"); \
- + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) ); \
- __res = __res_r0; \
- __syscall_return(type,__res); \
- }
- @@ -447,6 +457,7 @@
-
- #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\
- type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \
- + __SYS_REG(name) \
- register long __r0 __asm__("r0") = (long)arg1; \
- register long __r1 __asm__("r1") = (long)arg2; \
- register long __r2 __asm__("r2") = (long)arg3; \
- @@ -456,8 +467,7 @@
- __asm__ __volatile__ ( \
- __syscall(name) \
- : "=r" (__res_r0) \
- - : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3) \
- - : "lr"); \
- + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) ); \
- __res = __res_r0; \
- __syscall_return(type,__res); \
- }
- @@ -465,6 +475,7 @@
-
- #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
- type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \
- + __SYS_REG(name) \
- register long __r0 __asm__("r0") = (long)arg1; \
- register long __r1 __asm__("r1") = (long)arg2; \
- register long __r2 __asm__("r2") = (long)arg3; \
- @@ -475,14 +486,15 @@
- __asm__ __volatile__ ( \
- __syscall(name) \
- : "=r" (__res_r0) \
- - : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3),"r" (__r4) \
- - : "lr"); \
- + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \
- + "r" (__r3), "r" (__r4) ) ); \
- __res = __res_r0; \
- __syscall_return(type,__res); \
- }
-
- #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) { \
- + __SYS_REG(name) \
- register long __r0 __asm__("r0") = (long)arg1; \
- register long __r1 __asm__("r1") = (long)arg2; \
- register long __r2 __asm__("r2") = (long)arg3; \
- @@ -494,14 +506,15 @@
- __asm__ __volatile__ ( \
- __syscall(name) \
- : "=r" (__res_r0) \
- - : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3), "r" (__r4),"r" (__r5) \
- - : "lr"); \
- + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \
- + "r" (__r3), "r" (__r4), "r" (__r5) ) ); \
- __res = __res_r0; \
- __syscall_return(type,__res); \
- }
-
- #ifdef __KERNEL_SYSCALLS__
-
- +#include <linux/compiler.h>
- #include <linux/types.h>
- #include <linux/syscalls.h>
-
|
