Module Name: src
Committed By: bouyer
Date: Thu Mar 26 20:18:55 UTC 2009
Modified Files:
src/sys/arch/arm/arm [netbsd-3]: bcopyinout_xscale.S
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1993):
sys/arch/arm/arm/bcopyinout_xscale.S: revision 1.4
Must have a nop after an add to the pc.
This corrects a bug affecting kcopy() to unaligned dst addresses.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.16.1 src/sys/arch/arm/arm/bcopyinout_xscale.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/bcopyinout_xscale.S
diff -u src/sys/arch/arm/arm/bcopyinout_xscale.S:1.3 src/sys/arch/arm/arm/bcopyinout_xscale.S:1.3.16.1
--- src/sys/arch/arm/arm/bcopyinout_xscale.S:1.3 Mon Dec 15 09:27:18 2003
+++ src/sys/arch/arm/arm/bcopyinout_xscale.S Thu Mar 26 20:18:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopyinout_xscale.S,v 1.3 2003/12/15 09:27:18 scw Exp $ */
+/* $NetBSD: bcopyinout_xscale.S,v 1.3.16.1 2009/03/26 20:18:55 bouyer Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-RCSID("$NetBSD: bcopyinout_xscale.S,v 1.3 2003/12/15 09:27:18 scw Exp $")
+RCSID("$NetBSD: bcopyinout_xscale.S,v 1.3.16.1 2009/03/26 20:18:55 bouyer Exp $")
.text
.align 0
@@ -982,6 +982,7 @@
sub r2, r2, ip
rsbs ip, ip, #0x03
addne pc, pc, ip, lsl #3
+ nop
ldrb ip, [r0], #0x01
strb ip, [r1], #0x01
ldrb ip, [r0], #0x01
