patch-2.4.23 linux-2.4.23/arch/sparc/lib/memset.S
Next file: linux-2.4.23/arch/sparc/math-emu/sfp-util.h
Previous file: linux-2.4.23/arch/sparc/lib/copy_user.S
Back to the patch index
Back to the overall index
- Lines: 94
- Date:
2003-11-28 10:26:19.000000000 -0800
- Orig file:
linux-2.4.22/arch/sparc/lib/memset.S
- Orig date:
2001-04-12 12:10:25.000000000 -0700
diff -urN linux-2.4.22/arch/sparc/lib/memset.S linux-2.4.23/arch/sparc/lib/memset.S
@@ -10,20 +10,23 @@
#include <asm/cprefix.h>
#include <asm/ptrace.h>
-#define EX(x,y,a,b,z) \
+/* Work around cpp -rob */
+#define ALLOC #alloc
+#define EXECINSTR #execinstr
+#define EX(x,y,a,b) \
98: x,y; \
- .section .fixup,z##alloc,z##execinstr; \
+ .section .fixup,ALLOC,EXECINSTR; \
.align 4; \
99: ba 30f; \
a, b, %o0; \
- .section __ex_table,z##alloc; \
+ .section __ex_table,ALLOC; \
.align 4; \
.word 98b, 99b; \
.text; \
.align 4
-#define EXT(start,end,handler,z) \
- .section __ex_table,z##alloc; \
+#define EXT(start,end,handler) \
+ .section __ex_table,ALLOC; \
.align 4; \
.word start, 0, end, handler; \
.text; \
@@ -74,13 +77,13 @@
3:
cmp %o2, 3
be 2f
- EX(stb %g3, [%o0], sub %o1, 0,#)
+ EX(stb %g3, [%o0], sub %o1, 0)
cmp %o2, 2
be 2f
- EX(stb %g3, [%o0 + 0x01], sub %o1, 1,#)
+ EX(stb %g3, [%o0 + 0x01], sub %o1, 1)
- EX(stb %g3, [%o0 + 0x02], sub %o1, 2,#)
+ EX(stb %g3, [%o0 + 0x02], sub %o1, 2)
2:
sub %o2, 4, %o2
add %o1, %o2, %o1
@@ -101,7 +104,7 @@
be 2f
mov %g3, %g2
- EX(st %g3, [%o0], sub %o1, 0,#)
+ EX(st %g3, [%o0], sub %o1, 0)
sub %o1, 4, %o1
add %o0, 4, %o0
2:
@@ -113,7 +116,7 @@
subcc %o3, 128, %o3
ZERO_BIG_BLOCK(%o0, 0x40, %g2)
11:
- EXT(10b, 11b, 20f,#)
+ EXT(10b, 11b, 20f)
bne 10b
add %o0, 128, %o0
@@ -138,17 +141,17 @@
be 1f
andcc %o1, 2, %g0
- EX(st %g3, [%o0], and %o1, 7,#)
+ EX(st %g3, [%o0], and %o1, 7)
add %o0, 4, %o0
1:
be 1f
andcc %o1, 1, %g0
- EX(sth %g3, [%o0], and %o1, 3,#)
+ EX(sth %g3, [%o0], and %o1, 3)
add %o0, 2, %o0
1:
bne,a 8f
- EX(stb %g3, [%o0], and %o1, 1,#)
+ EX(stb %g3, [%o0], and %o1, 1)
8:
retl
clr %o0
@@ -161,7 +164,7 @@
add %o0, 1, %o0
subcc %o1, 1, %o1
bne,a 8b
- EX(stb %g3, [%o0 - 1], add %o1, 1,#)
+ EX(stb %g3, [%o0 - 1], add %o1, 1)
0:
retl
clr %o0
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)