Define ovbcopy() as a macro which expands to the equivalent bcopy() call,

to take care of the KAME IPv6 code which needs ovbcopy() because NetBSD's
bcopy() doesn't handle overlap like ours.

Remove all implementations of ovbcopy().

Previously, bzero was a function pointer on i386, to save a jmp to
bzero_vector.  Get rid of this microoptimization as it only confuses
things, adds machine-dependent code to an MD header, and doesn't really
save all that much.

This commit does not add my pagezero() / pagecopy() code.

1 files changed, 7 insertions, 10 deletions

diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index cdf78bfc6c62..f0f99e4a7346 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -48,8 +48,8 @@
 	.globl	bcopy_vector
 bcopy_vector:
 	.long	generic_bcopy
-	.globl	bzero
-bzero:
+	.globl	bzero_vector
+bzero_vector:
 	.long	generic_bzero
 	.globl	copyin_vector
 copyin_vector:
@@ -57,9 +57,6 @@ copyin_vector:
 	.globl	copyout_vector
 copyout_vector:
 	.long	generic_copyout
-	.globl	ovbcopy_vector
-ovbcopy_vector:
-	.long	generic_bcopy
 #if defined(I586_CPU) && defined(DEV_NPX)
 kernel_fpu_lock:
 	.byte	0xfe
@@ -73,6 +70,10 @@ kernel_fpu_lock:
  * void bzero(void *buf, u_int len)
  */
 
+ENTRY(bzero)
+	MEXITCOUNT
+	jmp	*bzero_vector
+
 ENTRY(generic_bzero)
 	pushl	%edi
 	movl	8(%esp),%edi
@@ -361,7 +362,7 @@ ENTRY(i686_pagezero)
 1:
 	xorl	%eax, %eax
 	repe
-	scasl	
+	scasl
 	jnz	2f
 
 	popl	%ebx
@@ -446,10 +447,6 @@ ENTRY(bcopy)
 	MEXITCOUNT
 	jmp	*bcopy_vector
 
-ENTRY(ovbcopy)
-	MEXITCOUNT
-	jmp	*ovbcopy_vector
-
 /*
  * generic_bcopy(src, dst, cnt)
  *  ws@tools.de     (Wolfgang Solfrank, TooLs GmbH) +49-228-985800