Remove unused probeset() function.

4 files changed, 16 insertions, 85 deletions

diff --git a/sys/arch/solbourne/solbourne/locore.s b/sys/arch/solbourne/solbourne/locore.s
index a19692545df..b3fab4862cb 100644
--- a/sys/arch/solbourne/solbourne/locore.s
+++ b/sys/arch/solbourne/solbourne/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.4 2006/02/22 22:16:07 miod Exp $	*/
+/*	$OpenBSD: locore.s,v 1.5 2006/02/22 22:17:05 miod Exp $	*/
 /*	OpenBSD: locore.s,v 1.64 2005/04/17 18:47:50 miod Exp 	*/
 
 /*
@@ -3723,14 +3723,14 @@ ENTRY(proc_trampoline)
 	b	return_from_syscall
 	 add	%l1, 4, %l2		! npc = pc+4
 
-/* probeget and probeset are meant to be used during autoconfiguration */
+/* probeget is meant to be used during autoconfiguration */
 
 /*
  * probeget(addr, size) caddr_t addr; int size;
  *
- * Read or write a (byte,word,longword) from the given address.
- * Like {fu,su}{byte,halfword,word} but our caller is supposed
- * to know what he is doing... the address can be anywhere.
+ * Read a (byte,short,int) from the given address.
+ * Like copyin but our caller is supposed to know what he is doing...
+ * the address can be anywhere.
  *
  * We optimize for space, rather than time, here.
  */
diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s
index 35a46a0e192..608df184f79 100644
--- a/sys/arch/sparc/sparc/locore.s
+++ b/sys/arch/sparc/sparc/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.67 2006/02/22 22:16:07 miod Exp $	*/
+/*	$OpenBSD: locore.s,v 1.68 2006/02/22 22:17:07 miod Exp $	*/
 /*	$NetBSD: locore.s,v 1.73 1997/09/13 20:36:48 pk Exp $	*/
 
 /*
@@ -4833,14 +4833,14 @@ ENTRY(proc_trampoline)
 	b	return_from_syscall
 	 ld	[%sp + CCFSZ + 8], %l2	! npc
 
-/* probeget and probeset are meant to be used during autoconfiguration */
+/* probeget is meant to be used during autoconfiguration */
 
 /*
  * probeget(addr, size) caddr_t addr; int size;
  *
- * Read or write a (byte,word,longword) from the given address.
- * Like {fu,su}{byte,halfword,word} but our caller is supposed
- * to know what he is doing... the address can be anywhere.
+ * Read a (byte,short,int) from the given address.
+ * Like copyin but our caller is supposed to know what he is doing...
+ * the address can be anywhere.
  *
  * We optimize for space, rather than time, here.
  */
@@ -4879,30 +4879,6 @@ Lfsbail:
 	 mov	-1, %o0
 
 /*
- * probeset(addr, size, val) caddr_t addr; int size, val;
- *
- * As above, but we return 0 on success.
- */
-ENTRY(probeset)
-	! %o0 = addr, %o1 = (1,2,4), %o2 = val
-	sethi	%hi(_C_LABEL(cpcb)), %o3
-	ld	[%o3 + %lo(_C_LABEL(cpcb))], %o3	! cpcb->pcb_onfault = Lfserr;
-	set	Lfserr, %o5
-	st	%o5, [%o3 + PCB_ONFAULT]
-	btst	1, %o1
-	bnz,a	0f			! if (len & 1)
-	 stb	%o2, [%o0]		!	*(char *)addr = value;
-0:	btst	2, %o1
-	bnz,a	0f			! if (len & 2)
-	 sth	%o2, [%o0]		!	*(short *)addr = value;
-0:	btst	4, %o1
-	bnz,a	0f			! if (len & 4)
-	 st	%o2, [%o0]		!	*(int *)addr = value;
-0:	clr	%o0			! made it, clear onfault and return 0
-	retl
-	 st	%g0, [%o3 + PCB_ONFAULT]
-
-/*
  * int xldcontrolb(caddr_t, pcb)
  *		    %o0     %o1
  *
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index 33f2d15239b..d425242bac8 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.33 2005/11/11 16:50:19 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.34 2006/02/22 22:17:07 miod Exp $	*/
 /*	$NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
 
 /*
@@ -199,7 +199,6 @@ struct fpstate64;
 void	savefpstate(struct fpstate64 *);
 void	loadfpstate(struct fpstate64 *);
 u_int64_t	probeget(paddr_t, int, int);
-int	probeset(paddr_t, int, int, u_int64_t);
 #define	 write_all_windows() __asm __volatile("flushw" : : )
 #define	 write_user_windows() __asm __volatile("flushw" : : )
 void 	proc_trampoline(void);
diff --git a/sys/arch/sparc64/sparc64/locore.s b/sys/arch/sparc64/sparc64/locore.s
index 7c7a58a383f..fb4ab3bcc07 100644
--- a/sys/arch/sparc64/sparc64/locore.s
+++ b/sys/arch/sparc64/sparc64/locore.s
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.s,v 1.53 2006/01/03 20:57:36 kettenis Exp $	*/
+/*	$OpenBSD: locore.s,v 1.54 2006/02/22 22:17:07 miod Exp $	*/
 /*	$NetBSD: locore.s,v 1.137 2001/08/13 06:10:10 jdolecek Exp $	*/
 
 /*
@@ -6189,7 +6189,7 @@ _C_LABEL(Lfsbail):
 	retl				! and return error indicator
 	 mov	-1, %o0
 
-/* probeget and probeset are meant to be used during autoconfiguration */
+/* probeget is meant to be used during autoconfiguration */
 /*
  * The following probably need to be changed, but to what I don't know.
  */
@@ -6201,9 +6201,9 @@ _C_LABEL(Lfsbail):
  *	int asi;
  *	int size;
  *
- * Read or write a (byte,word,longword) from the given address.
- * Like {fu,su}{byte,halfword,word} but our caller is supposed
- * to know what he is doing... the address can be anywhere.
+ * Read a (byte,short,int,long) from the given address.
+ * Like copyin but our caller is supposed to know what he is doing...
+ * the address can be anywhere.
  *
  * We optimize for space, rather than time, here.
  */
@@ -6263,50 +6263,6 @@ _C_LABEL(Lfsprobe):
 	 mov	-1, %o0
 
 /*
- * probeset(addr, asi, size, val)
- *	paddr_t addr;
- *	int asi;
- *	int size;
- *	long val;
- *
- * As above, but we return 0 on success.
- */
-ENTRY(probeset)
-	mov	%o2, %o4
-	! %o0 = addr, %o1 = asi, %o4 = (1,2,4), %o3 = val
-	sethi	%hi(CPCB), %o2		! Lfserr requires CPCB in %o2
-	ldx	[%o2 + %lo(CPCB)], %o2	! cpcb->pcb_onfault = Lfserr;
-	set	_C_LABEL(Lfsbail), %o5
-	stx	%o5, [%o2 + PCB_ONFAULT]
-	btst	1, %o4
-	wr	%o1, 0, %asi
-	membar	#Sync
-	bz	0f			! if (len & 1)
-	 btst	2, %o4
-	ba,pt	%icc, 1f
-	 stba	%o3, [%o0] %asi		!	*(char *)addr = value;
-0:
-	bz	0f			! if (len & 2)
-	 btst	4, %o4
-	ba,pt	%icc, 1f
-	 stha	%o3, [%o0] %asi		!	*(short *)addr = value;
-0:
-	bz	0f			! if (len & 4)
-	 btst	8, %o4
-	ba,pt	%icc, 1f
-	 sta	%o3, [%o0] %asi		!	*(int *)addr = value;
-0:
-	bz	Lfserr			! if (len & 8)
-	ba,pt	%icc, 1f
-	 sta	%o3, [%o0] %asi		!	*(int *)addr = value;
-1:	membar	#Sync
-	clr	%o0			! made it, clear onfault and return 0
-	wr	%g0, ASI_PRIMARY_NOFAULT, %asi		! Restore default ASI	
-	stx	%g0, [%o2 + PCB_ONFAULT]
-	retl
-	 membar	#StoreStore|#StoreLoad
-
-/*
  * pmap_zero_page(pa)
  *
  * Zero one page physically addressed