same bcopy/memmove/memcpy methodology for vax.

checked over by mlarkin

3 files changed, 19 insertions, 158 deletions

diff --git a/sys/lib/libkern/arch/vax/bcopy.S b/sys/lib/libkern/arch/vax/bcopy.S
index 24b1d21ccb0..c9361568da4 100644
--- a/sys/lib/libkern/arch/vax/bcopy.S
+++ b/sys/lib/libkern/arch/vax/bcopy.S
@@ -1,71 +1 @@
-/*	$OpenBSD: bcopy.S,v 1.3 2009/08/19 19:47:53 miod Exp $ */
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* bcopy(from, to, size) */
-
-#include <machine/asm.h>
-
-ENTRY(bcopy, R2|R3|R4|R5|R6)
-	movl	4(ap),r1
-	movl	8(ap),r3
-	movl	12(ap),r6
-	cmpl	r1,r3
-	bgtr	2f		# normal forward case
-	blss	3f		# overlapping, must do backwards
-	ret			# equal, nothing to do
-1:
-	subl2	r0,r6
-	movc3	r0,(r1),(r3)
-2:
-	movzwl	$65535,r0
-	cmpl	r6,r0
-	jgtr	1b
-	movc3	r6,(r1),(r3)
-	ret
-3:
-	addl2	r6,r1
-	addl2	r6,r3
-	movzwl	$65535,r0
-	jbr	5f
-4:
-	subl2	r0,r6
-	subl2	r0,r1
-	subl2	r0,r3
-	movc3	r0,(r1),(r3)
-	movzwl	$65535,r0
-	subl2	r0,r1
-	subl2	r0,r3
-5:
-	cmpl	r6,r0
-	jgtr	4b
-	subl2	r6,r1
-	subl2	r6,r3
-	movc3	r6,(r1),(r3)
-	ret
+/* This code is contained in memmove.S */
diff --git a/sys/lib/libkern/arch/vax/memcpy.S b/sys/lib/libkern/arch/vax/memcpy.S
index 46fcf60d6b2..c9361568da4 100644
--- a/sys/lib/libkern/arch/vax/memcpy.S
+++ b/sys/lib/libkern/arch/vax/memcpy.S
@@ -1,86 +1 @@
-/*	$OpenBSD: memcpy.S,v 1.1 2009/08/19 19:47:53 miod Exp $ */
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * void *memcpy(dst, src, size)
- * returns dst
- *
- * This optimises the usual case (count < 65536) at the expense
- * of some extra memory references and branches when count >= 65536.
- */
-
-#include <machine/asm.h>
-
-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
-	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
-	bgtru	4f		/* overlapping, must move backwards */
-	subl2	r2,r1
-
-1:	/* move forward */
-	cmpl	r2,r0
-	bgtru	3f		/* stupid movc3 limitation */
-	movc3	r2,(r1),(r3)	/* move it all */
-2:
-	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 */
-	brb	1b		/* retry */
-
-4:	/* move backward */
-	addl2	r2,r3
-5:
-	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 */
-	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
-	brb	5b
+/* This code is contained in memmove.S */
diff --git a/sys/lib/libkern/arch/vax/memmove.S b/sys/lib/libkern/arch/vax/memmove.S
index 1a67e59b30e..7c13938255b 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.3 2009/08/19 19:47:53 miod Exp $ */
+/*	$OpenBSD: memmove.S,v 1.4 2013/06/13 03:58:22 deraadt Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,10 +38,26 @@
 
 #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 */
+	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
+	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 */
+5:
 	cmpl	r1,r3
 	bgtru	1f		/* normal forward case */
 	beql	2f		/* equal, nothing to do */