5 files changed, 79 insertions, 79 deletions
diff --git a/sys/lib/libkern/arch/vax/bcmp.S b/sys/lib/libkern/arch/vax/bcmp.S
index 1c480988ecb..36c360cc698 100644
--- a/sys/lib/libkern/arch/vax/bcmp.S
+++ b/sys/lib/libkern/arch/vax/bcmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcmp.S,v 1.3 2009/08/19 19:47:53 miod Exp $ */
+/*	$OpenBSD: bcmp.S,v 1.4 2013/07/05 21:11:57 miod Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,23 +34,23 @@
 /*  still, this is four times faster than the generic C version on a uvax2 */
 
 ENTRY(bcmp, 0)
-	movl	12(ap),r0	# r0 = n
+	movl	12(%ap),%r0	# r0 = n
 	jeql	9f
-	movq	4(ap),r1	# r1 = s1, r2 = s2
-	ashl	$-2,r0,r3	# convert len to # of long words
+	movq	4(%ap),%r1	# r1 = s1, r2 = s2
+	ashl	$-2,%r0,%r3	# convert len to # of long words
 	jeql	2f
 1:
-	cmpl	(r1)+,(r2)+	# no "cmpq" alas, so four bytes at a time
+	cmpl	(%r1)+,(%r2)+	# no "cmpq" alas, so four bytes at a time
 	jneq	9f
-	sobgtr	r3,1b
+	sobgtr	%r3,1b
 2:
-	bicl3	$-4,r0,r3	# handle at most 3 extra bytes
+	bicl3	$-4,%r0,%r3	# handle at most 3 extra bytes
 	jeql	8f
 3:
-	cmpb	(r1)+,(r2)+
+	cmpb	(%r1)+,(%r2)+
 	jneq	9f
-	sobgtr	r3,3b
+	sobgtr	%r3,3b
 8:
-	clrl	r0		# we have a match!
+	clrl	%r0		# we have a match!
 9:
 	ret
diff --git a/sys/lib/libkern/arch/vax/bzero.S b/sys/lib/libkern/arch/vax/bzero.S
index c3fd12bb3d5..0c21e05f0e1 100644
--- a/sys/lib/libkern/arch/vax/bzero.S
+++ b/sys/lib/libkern/arch/vax/bzero.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bzero.S,v 1.3 2009/08/19 19:47:53 miod Exp $ */
+/*	$OpenBSD: bzero.S,v 1.4 2013/07/05 21:11:57 miod Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -33,14 +33,14 @@
 #include <machine/asm.h>
 
 ENTRY(bzero, R2|R3|R4|R5)
-	movl	4(ap),r3
+	movl	4(%ap),%r3
 	jbr	2f
 1:
-	subl2	r0,8(ap)
-	movc5	$0,(r3),$0,r0,(r3)
+	subl2	%r0,8(%ap)
+	movc5	$0,(%r3),$0,%r0,(%r3)
 2:
-	movzwl	$65535,r0
-	cmpl	8(ap),r0
+	movzwl	$65535,%r0
+	cmpl	8(%ap),%r0
 	jgtr	1b
-	movc5	$0,(r3),$0,8(ap),(r3)
+	movc5	$0,(%r3),$0,8(%ap),(%r3)
 	ret
diff --git a/sys/lib/libkern/arch/vax/memcmp.S b/sys/lib/libkern/arch/vax/memcmp.S
index 4ce069b3afd..f5fda4dcb29 100644
--- a/sys/lib/libkern/arch/vax/memcmp.S
+++ b/sys/lib/libkern/arch/vax/memcmp.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memcmp.S,v 1.1 2009/08/19 19:47:53 miod Exp $ */
+/*	$OpenBSD: memcmp.S,v 1.2 2013/07/05 21:11:57 miod Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -33,33 +33,33 @@
 #include <machine/asm.h>
 
 ENTRY(memcmp, 0)
-	movl	12(ap),r0
+	movl	12(%ap),%r0
 	jeql	9f
-	movq	4(ap),r1
-	ashl	$-2,r0,r3	# convert len to long words
+	movq	4(%ap),%r1
+	ashl	$-2,%r0,%r3	# convert len to long words
 	jeql	2f
 1:
-	cmpl	(r1)+,(r2)+	# no "cmpq" alas
+	cmpl	(%r1)+,(%r2)+	# no "cmpq" alas
 	jneq	7f
-	sobgtr	r3,1b
+	sobgtr	%r3,1b
 2:
-	bicl3	$-4,r0,r3	# handle at most 3 extra bytes
+	bicl3	$-4,%r0,%r3	# handle at most 3 extra bytes
 	jeql	4f
 3:
-	cmpb	(r1)+,(r2)+
+	cmpb	(%r1)+,(%r2)+
 	jneq	8f
-	sobgtr	r3,3b
+	sobgtr	%r3,3b
 4:
-	clrl	r0		# we had a match
+	clrl	%r0		# we had a match
 	ret
 7:				# backup, and do a byte compare
-	tstl	-(r1)
-	tstl	-(r2)
-	movl	$4,r3
+	tstl	-(%r1)
+	tstl	-(%r2)
+	movl	$4,%r3
 	jbr	3b
 8:
-	movzbl	-(r1),r3
-	movzbl	-(r2),r4
-	subl3	r4,r3,r0
+	movzbl	-(%r1),%r3
+	movzbl	-(%r2),%r4
+	subl3	%r4,%r3,%r0
 9:
 	ret
diff --git a/sys/lib/libkern/arch/vax/memmove.S b/sys/lib/libkern/arch/vax/memmove.S
index 7c13938255b..8723aaa8ec1 100644
--- a/sys/lib/libkern/arch/vax/memmove.S
+++ b/sys/lib/libkern/arch/vax/memmove.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memmove.S,v 1.4 2013/06/13 03:58:22 deraadt Exp $ */
+/*	$OpenBSD: memmove.S,v 1.5 2013/07/05 21:11:57 miod Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -39,64 +39,64 @@
 #include <machine/asm.h>
 
 ENTRY(bcopy, R2|R3|R4|R5)
-	movzwl	$65535,r0	/* r0 = 64K (needed below) */
-	movq	8(ap),r1	/* r1 = src, r2 = length */
-	movl	r1,r3		/* r3 = dst */
-	movl	4(ap),r1	/* r1 = src */
+	movzwl	$65535,%r0	/* r0 = 64K (needed below) */
+	movq	8(%ap),%r1	/* r1 = src, r2 = length */
+	movl	%r1,%r3		/* r3 = dst */
+	movl	4(%ap),%r1	/* r1 = src */
 	brw	5f		/* do a memmove */
 
 ENTRY(memcpy, R2|R3|R4|R5)
-	movzwl	$65535,r0	/* r0 = 64K (needed below) */
-	movq	8(ap),r1	/* r1 = src, r2 = length */
-	movl	4(ap),r3	/* r3 = dst */
-	cmpl	r1,r3
+	movzwl	$65535,%r0	/* r0 = 64K (needed below) */
+	movq	8(%ap),%r1	/* r1 = src, r2 = length */
+	movl	4(%ap),%r3	/* r3 = dst */
+	cmpl	%r1,%r3
 	beql	2f		/* equal, nothing to do */
 	brw	1f		/* jump into the forward copy path of memmove */
 
 ENTRY(memmove, R2|R3|R4|R5)
-	movzwl	$65535,r0	/* r0 = 64K (needed below) */
-	movq	8(ap),r1	/* r1 = src, r2 = length */
-	movl	4(ap),r3	/* r3 = dst */
+	movzwl	$65535,%r0	/* r0 = 64K (needed below) */
+	movq	8(%ap),%r1	/* r1 = src, r2 = length */
+	movl	4(%ap),%r3	/* r3 = dst */
 5:
-	cmpl	r1,r3
+	cmpl	%r1,%r3
 	bgtru	1f		/* normal forward case */
 	beql	2f		/* equal, nothing to do */
-	addl2	r2,r1		/* overlaps iff src<dst but src+len>dst */
-	cmpl	r1,r3
+	addl2	%r2,%r1		/* overlaps iff src<dst but src+len>dst */
+	cmpl	%r1,%r3
 	bgtru	4f		/* overlapping, must move backwards */
-	subl2	r2,r1
+	subl2	%r2,%r1
 
 1:	/* move forward */
-	cmpl	r2,r0
+	cmpl	%r2,%r0
 	bgtru	3f		/* stupid movc3 limitation */
-	movc3	r2,(r1),(r3)	/* move it all */
+	movc3	%r2,(%r1),(%r3)	/* move it all */
 2:
-	movl	4(ap),r0	/* return original dst */
+	movl	4(%ap),%r0	/* return original dst */
 	ret
 3:
-	subl2	r0,12(ap)	/* adjust length by 64K */
-	movc3	r0,(r1),(r3)	/* move 64K */
-	movl	12(ap),r2
-	decw	r0		/* from 0 to 65535 */
+	subl2	%r0,12(%ap)	/* adjust length by 64K */
+	movc3	%r0,(%r1),(%r3)	/* move 64K */
+	movl	12(%ap),%r2
+	decw	%r0		/* from 0 to 65535 */
 	brb	1b		/* retry */
 
 4:	/* move backward */
-	addl2	r2,r3
+	addl2	%r2,%r3
 5:
-	cmpl	r2,r0
+	cmpl	%r2,%r0
 	bgtru	6f		/* stupid movc3 limitation */
-	subl2	r2,r1
-	subl2	r2,r3
-	movc3	r2,(r1),(r3)	/* move it all */
-	movl	4(ap),r0	/* return original dst */
+	subl2	%r2,%r1
+	subl2	%r2,%r3
+	movc3	%r2,(%r1),(%r3)	/* move it all */
+	movl	4(%ap),%r0	/* return original dst */
 	ret
 6:
-	subl2	r0,12(ap)	/* adjust length by 64K */
-	subl2	r0,r1
-	subl2	r0,r3
-	movc3	r0,(r1),(r3)	/* move 64K */
-	movl	12(ap),r2
-	decw	r0
-	subl2	r0,r1
-	subl2	r0,r3
+	subl2	%r0,12(%ap)	/* adjust length by 64K */
+	subl2	%r0,%r1
+	subl2	%r0,%r3
+	movc3	%r0,(%r1),(%r3)	/* move 64K */
+	movl	12(%ap),%r2
+	decw	%r0
+	subl2	%r0,%r1
+	subl2	%r0,%r3
 	brb	5b
diff --git a/sys/lib/libkern/arch/vax/memset.S b/sys/lib/libkern/arch/vax/memset.S
index f8cc2331247..80ce2a2f752 100644
--- a/sys/lib/libkern/arch/vax/memset.S
+++ b/sys/lib/libkern/arch/vax/memset.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memset.S,v 1.1 2009/08/19 19:47:53 miod Exp $ */
+/*	$OpenBSD: memset.S,v 1.2 2013/07/05 21:11:57 miod Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -33,16 +33,16 @@
 #include <machine/asm.h>
 
 ENTRY(memset, R2|R3|R4|R5)
-	movl	4(ap),r3
+	movl	4(%ap),%r3
 1:
-	movzwl	$65535,r0
-	movq	8(ap),r1
-	cmpl	r2,r0
+	movzwl	$65535,%r0
+	movq	8(%ap),%r1
+	cmpl	%r2,%r0
 	jgtru	2f
-	movc5	$0,(r3),r1,r2,(r3)
-	movl	r1,r0
+	movc5	$0,(%r3),%r1,%r2,(%r3)
+	movl	%r1,%r0
 	ret
 2:
-	subl2	r0,12(ap)
-	movc5	$0,(r3),r1,r0,(r3)
+	subl2	%r0,12(%ap)
+	movc5	$0,(%r3),%r1,%r0,(%r3)
 	jbr	1b