| blob | dcbd21b0a12ca81b58b8425ec4b6b9eae4f5474e |
1 --- linux-libc-headers-2.6.12.0/include/asm-arm/unistd.h 2005-07-06 03:17:41.000000000 +0300
2 +++ linux-libc-headers-2.6.12.0-arm-eabi/include/asm-arm/unistd.h 2006-06-05 17:14:09.000000000 +0300
3 @@ -15,10 +15,12 @@
5 #include <linux/linkage.h>
7 -#if defined(__thumb__)
8 +#define __NR_OABI_SYSCALL_BASE 0x900000
9 +
10 +#if defined(__thumb__) || defined(__ARM_EABI__)
11 #define __NR_SYSCALL_BASE 0
12 #else
13 -#define __NR_SYSCALL_BASE 0x900000
14 +#define __NR_SYSCALL_BASE __NR_OABI_SYSCALL_BASE
15 #endif
17 /*
18 @@ -365,13 +375,13 @@
19 #define __sys1(x) __sys2(x)
21 #ifndef __syscall
22 -#if defined(__thumb__)
23 -#define __syscall(name) \
24 - "push {r7}\n\t" \
25 - "mov r7, #" __sys1(__NR_##name) "\n\t" \
26 - "swi 0\n\t" \
27 - "pop {r7}"
28 +#if defined(__thumb__) || defined(__ARM_EABI__)
29 +#define __SYS_REG(name) register long __sysreg __asm__("r7") = __NR_##name;
30 +#define __SYS_REG_LIST(regs...) "r" (__sysreg) , ##regs
31 +#define __syscall(name) "swi\t0"
32 #else
33 +#define __SYS_REG(name)
34 +#define __SYS_REG_LIST(regs...) regs
35 #define __syscall(name) "swi\t" __sys1(__NR_##name) ""
36 #endif
37 #endif
38 @@ -387,33 +397,34 @@
40 #define _syscall0(type,name) \
41 type name(void) { \
42 + __SYS_REG(name) \
43 register long __res_r0 __asm__("r0"); \
44 long __res; \
45 __asm__ __volatile__ ( \
46 __syscall(name) \
47 : "=r" (__res_r0) \
48 - : \
49 - : "lr"); \
50 + : __SYS_REG_LIST() ); \
51 __res = __res_r0; \
52 __syscall_return(type,__res); \
53 }
55 #define _syscall1(type,name,type1,arg1) \
56 type name(type1 arg1) { \
57 + __SYS_REG(name) \
58 register long __r0 __asm__("r0") = (long)arg1; \
59 register long __res_r0 __asm__("r0"); \
60 long __res; \
61 __asm__ __volatile__ ( \
62 __syscall(name) \
63 : "=r" (__res_r0) \
64 - : "r" (__r0) \
65 - : "lr"); \
66 + : __SYS_REG_LIST( "0" (__r0) ) ); \
67 __res = __res_r0; \
68 __syscall_return(type,__res); \
69 }
71 #define _syscall2(type,name,type1,arg1,type2,arg2) \
72 type name(type1 arg1,type2 arg2) { \
73 + __SYS_REG(name) \
74 register long __r0 __asm__("r0") = (long)arg1; \
75 register long __r1 __asm__("r1") = (long)arg2; \
76 register long __res_r0 __asm__("r0"); \
77 @@ -421,8 +432,7 @@
78 __asm__ __volatile__ ( \
79 __syscall(name) \
80 : "=r" (__res_r0) \
81 - : "r" (__r0),"r" (__r1) \
82 - : "lr"); \
83 + : __SYS_REG_LIST( "0" (__r0), "r" (__r1) ) ); \
84 __res = __res_r0; \
85 __syscall_return(type,__res); \
86 }
87 @@ -430,6 +440,7 @@
89 #define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
90 type name(type1 arg1,type2 arg2,type3 arg3) { \
91 + __SYS_REG(name) \
92 register long __r0 __asm__("r0") = (long)arg1; \
93 register long __r1 __asm__("r1") = (long)arg2; \
94 register long __r2 __asm__("r2") = (long)arg3; \
95 @@ -438,8 +449,7 @@
96 __asm__ __volatile__ ( \
97 __syscall(name) \
98 : "=r" (__res_r0) \
99 - : "r" (__r0),"r" (__r1),"r" (__r2) \
100 - : "lr"); \
101 + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2) ) ); \
102 __res = __res_r0; \
103 __syscall_return(type,__res); \
104 }
105 @@ -447,6 +457,7 @@
107 #define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4)\
108 type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) { \
109 + __SYS_REG(name) \
110 register long __r0 __asm__("r0") = (long)arg1; \
111 register long __r1 __asm__("r1") = (long)arg2; \
112 register long __r2 __asm__("r2") = (long)arg3; \
113 @@ -456,8 +467,7 @@
114 __asm__ __volatile__ ( \
115 __syscall(name) \
116 : "=r" (__res_r0) \
117 - : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3) \
118 - : "lr"); \
119 + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), "r" (__r3) ) ); \
120 __res = __res_r0; \
121 __syscall_return(type,__res); \
122 }
123 @@ -465,6 +475,7 @@
125 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
126 type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) { \
127 + __SYS_REG(name) \
128 register long __r0 __asm__("r0") = (long)arg1; \
129 register long __r1 __asm__("r1") = (long)arg2; \
130 register long __r2 __asm__("r2") = (long)arg3; \
131 @@ -475,14 +486,15 @@
132 __asm__ __volatile__ ( \
133 __syscall(name) \
134 : "=r" (__res_r0) \
135 - : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3),"r" (__r4) \
136 - : "lr"); \
137 + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \
138 + "r" (__r3), "r" (__r4) ) ); \
139 __res = __res_r0; \
140 __syscall_return(type,__res); \
141 }
143 #define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
144 type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) { \
145 + __SYS_REG(name) \
146 register long __r0 __asm__("r0") = (long)arg1; \
147 register long __r1 __asm__("r1") = (long)arg2; \
148 register long __r2 __asm__("r2") = (long)arg3; \
149 @@ -494,14 +506,15 @@
150 __asm__ __volatile__ ( \
151 __syscall(name) \
152 : "=r" (__res_r0) \
153 - : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3), "r" (__r4),"r" (__r5) \
154 - : "lr"); \
155 + : __SYS_REG_LIST( "0" (__r0), "r" (__r1), "r" (__r2), \
156 + "r" (__r3), "r" (__r4), "r" (__r5) ) ); \
157 __res = __res_r0; \
158 __syscall_return(type,__res); \
159 }
161 #ifdef __KERNEL_SYSCALLS__
163 +#include <linux/compiler.h>
164 #include <linux/types.h>
165 #include <linux/syscalls.h>