This patch fixes compiler warnings on a couple of __asm__ calls. Please let me know
if they effect the readability of the code (they _do_).
Regards,
Anuradha
--
Debian GNU/Linux (kernel 2.4.6-pre5)
If I were to walk on water, the press would say I'm only doing it
because I can't swim.
-- Bob Stanfield
diff -u --recursive --new-file linux-2.4.6-pre5/drivers/acorn/net/ether1.c
linux/drivers/acorn/net/ether1.c
--- linux-2.4.6-pre5/drivers/acorn/net/ether1.c Mon Jun 25 23:50:27 2001
+++ linux/drivers/acorn/net/ether1.c Tue Jun 26 00:37:29 2001
@@ -153,34 +153,34 @@
length -= thislen;
__asm__ __volatile__(
- "subs %3, %3, #2
- bmi 2f
-1: ldr %0, [%1], #2
- mov %0, %0, lsl #16
- orr %0, %0, %0, lsr #16
- str %0, [%2], #4
- subs %3, %3, #2
- bmi 2f
- ldr %0, [%1], #2
- mov %0, %0, lsl #16
- orr %0, %0, %0, lsr #16
- str %0, [%2], #4
- subs %3, %3, #2
- bmi 2f
- ldr %0, [%1], #2
- mov %0, %0, lsl #16
- orr %0, %0, %0, lsr #16
- str %0, [%2], #4
- subs %3, %3, #2
- bmi 2f
- ldr %0, [%1], #2
- mov %0, %0, lsl #16
- orr %0, %0, %0, lsr #16
- str %0, [%2], #4
- subs %3, %3, #2
- bpl 1b
-2: adds %3, %3, #1
- ldreqb %0, [%1]
+ "subs %3, %3, #2\n\
+ bmi 2f\n\
+1: ldr %0, [%1], #2\n\
+ mov %0, %0, lsl #16\n\
+ orr %0, %0, %0, lsr #16\n\
+ str %0, [%2], #4\n\
+ subs %3, %3, #2\n\
+ bmi 2f\n\
+ ldr %0, [%1], #2\n\
+ mov %0, %0, lsl #16\n\
+ orr %0, %0, %0, lsr #16\n\
+ str %0, [%2], #4\n\
+ subs %3, %3, #2\n\
+ bmi 2f\n\
+ ldr %0, [%1], #2\n\
+ mov %0, %0, lsl #16\n\
+ orr %0, %0, %0, lsr #16\n\
+ str %0, [%2], #4\n\
+ subs %3, %3, #2\n\
+ bmi 2f\n\
+ ldr %0, [%1], #2\n\
+ mov %0, %0, lsl #16\n\
+ orr %0, %0, %0, lsr #16\n\
+ str %0, [%2], #4\n\
+ subs %3, %3, #2\n\
+ bpl 1b\n\
+2: adds %3, %3, #1\n\
+ ldreqb %0, [%1]\n\
streqb %0, [%2]"
: "=&r" (used), "=&r" (data)
: "r" (addr), "r" (thislen), "1" (data));
@@ -215,34 +215,34 @@
length -= thislen;
__asm__ __volatile__(
- "subs %3, %3, #2
- bmi 2f
-1: ldr %0, [%2], #4
- strb %0, [%1], #1
- mov %0, %0, lsr #8
- strb %0, [%1], #1
- subs %3, %3, #2
- bmi 2f
- ldr %0, [%2], #4
- strb %0, [%1], #1
- mov %0, %0, lsr #8
- strb %0, [%1], #1
- subs %3, %3, #2
- bmi 2f
- ldr %0, [%2], #4
- strb %0, [%1], #1
- mov %0, %0, lsr #8
- strb %0, [%1], #1
- subs %3, %3, #2
- bmi 2f
- ldr %0, [%2], #4
- strb %0, [%1], #1
- mov %0, %0, lsr #8
- strb %0, [%1], #1
- subs %3, %3, #2
- bpl 1b
-2: adds %3, %3, #1
- ldreqb %0, [%2]
+ "subs %3, %3, #2\n\
+ bmi 2f\n\
+1: ldr %0, [%2], #4\n\
+ strb %0, [%1], #1\n\
+ mov %0, %0, lsr #8\n\
+ strb %0, [%1], #1\n\
+ subs %3, %3, #2\n\
+ bmi 2f\n\
+ ldr %0, [%2], #4\n\
+ strb %0, [%1], #1\n\
+ mov %0, %0, lsr #8\n\
+ strb %0, [%1], #1\n\
+ subs %3, %3, #2\n\
+ bmi 2f\n\
+ ldr %0, [%2], #4\n\
+ strb %0, [%1], #1\n\
+ mov %0, %0, lsr #8\n\
+ strb %0, [%1], #1\n\
+ subs %3, %3, #2\n\
+ bmi 2f\n\
+ ldr %0, [%2], #4\n\
+ strb %0, [%1], #1\n\
+ mov %0, %0, lsr #8\n\
+ strb %0, [%1], #1\n\
+ subs %3, %3, #2\n\
+ bpl 1b\n\
+2: adds %3, %3, #1\n\
+ ldreqb %0, [%2]\n\
streqb %0, [%1]"
: "=&r" (used), "=&r" (data)
: "r" (addr), "r" (thislen), "1" (data));
