patch-2.4.2 linux/arch/arm/lib/io-writesb.S

Next file: linux/arch/arm/lib/io-writesl.S
Previous file: linux/arch/arm/lib/io-readsw-armv4.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/arch/arm/lib/io-writesb.S linux/arch/arm/lib/io-writesb.S
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/lib/io-readsb.S
+ *  linux/arch/arm/lib/io-writesb.S
  *
  *  Copyright (C) 1995-2000 Russell King
  *
@@ -13,7 +13,7 @@
 
 .outsb_align:	rsb	ip, ip, #4
 		cmp	ip, r2
-		mov	ip, r2
+		movgt	ip, r2
 		cmp	ip, #2
 		ldrb	r3, [r1], #1
 		strb	r3, [r0]
@@ -34,6 +34,7 @@
 		bmi	.outsb_no_16
 
 .outsb_16_lp:	ldmia	r1!, {r3 - r6}
+
 		strb	r3, [r0]
 		mov	r3, r3, lsr #8
 		strb	r3, [r0]
@@ -65,6 +66,7 @@
 		strb	r6, [r0]
 		mov	r6, r6, lsr #8
 		strb	r6, [r0]
+
 		subs	r2, r2, #16
 		bpl	.outsb_16_lp
 
@@ -74,7 +76,8 @@
 .outsb_no_16:	tst	r2, #8
 		beq	.outsb_no_8
 
-		ldmia	r1, {r3, r4}
+		ldmia	r1!, {r3, r4}
+
 		strb	r3, [r0]
 		mov	r3, r3, lsr #8
 		strb	r3, [r0]
@@ -92,7 +95,7 @@
 		strb	r4, [r0]
 
 .outsb_no_8:	tst	r2, #4
-		bne	.outsb_no_4
+		beq	.outsb_no_4
 
 		ldr	r3, [r1], #4
 		strb	r3, [r0]
@@ -105,6 +108,7 @@
 
 .outsb_no_4:	ands	r2, r2, #3
 		LOADREGS(eqfd, sp!, {r4 - r6, pc})
+
 		cmp	r2, #2
 		ldrb	r3, [r1], #1
 		strb	r3, [r0]
@@ -112,4 +116,5 @@
 		strgeb	r3, [r0]
 		ldrgtb	r3, [r1]
 		strgtb	r3, [r0]
+
 		LOADREGS(fd, sp!, {r4 - r6, pc})

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)