From 6e204ff9bc83c146ba7cb68da36d978e9750f467 Mon Sep 17 00:00:00 2001
From: martin <martin@NetBSD.org>
Date: Sat, 8 Nov 2003 13:21:36 +0000
Subject: [PATCH] Fix previous (bzero -> memset), it overlooked the delay slot.
 Use set and clr pseudo instructions to simplify the code a bit.

---
 sys/arch/sparc/sparc/locore.s | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s
index 15f0d9da630d..82584b1151b7 100644
--- a/sys/arch/sparc/sparc/locore.s
+++ b/sys/arch/sparc/sparc/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.193 2003/11/08 08:09:38 jdolecek Exp $	*/
+/*	$NetBSD: locore.s,v 1.194 2003/11/08 13:21:36 martin Exp $	*/
 
 /*
  * Copyright (c) 1996 Paul Kranenburg
@@ -4114,10 +4114,9 @@ Lgandul:	nop
 
 	/* Clear `cpuinfo' */
 	sethi	%hi(CPUINFO_VA), %o0		! memset(&cpuinfo, 0, NBPG)
-	mov	0, %o1
-	sethi	%hi(CPUINFO_STRUCTSIZE), %o2
+	set	%hi(CPUINFO_STRUCTSIZE), %o2
 	call	_C_LABEL(memset)
-	 add	%o1, %lo(CPUINFO_STRUCTSIZE), %o1
+	 clr	%o1
 
 	/*
 	 * Initialize `cpuinfo' fields which are needed early.  Note