make all entry points of the same number of arguments and that greatly simplifies the call setup in the scheduler

21 files changed, 142 insertions, 120 deletions

diff --git a/sys/arch/hppa/hppa/fpemu.S b/sys/arch/hppa/hppa/fpemu.S
index 7f398491587..5e1fd04b899 100644
--- a/sys/arch/hppa/hppa/fpemu.S
+++ b/sys/arch/hppa/hppa/fpemu.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpemu.S,v 1.7 2002/10/07 14:38:34 mickey Exp $	*/
+/*	$OpenBSD: fpemu.S,v 1.8 2003/04/10 17:27:58 mickey Exp $	*/
 
 /*
  * Copyright (c) 2000,2002 Michael Shalayeff
@@ -101,21 +101,32 @@ LEAF_ENTRY(fpu_emulate)
 $fpemu_nzt
 	/*
 	 * arg0 -- source register (address)
-	 * arg1 -- target register (address)
-	 * arg2 -- fpregs context
+	 * arg1 -- fpregs context
+	 * arg2 -- target register (address)
+	 * arg3 -- fpregs context
 	 * t3 -- class
 	 * r31 -- subop
 	 * r1 -- format specifier
 	 * (t4 -- copy of arg0, ie iir)
 	 */
+	copy	arg2, arg3
+	copy	arg2, arg1
 	sh3add	t1, arg2, arg0
-	sh3add	t2, arg2, arg1
-	stw	r0, 32*8+0(arg2)	/* make sure zero reg is zero */
-	stw	r0, 32*8+4(arg2)
+	sh3add	t2, arg2, arg2
+	stw	r0, 32*8+0(arg1)	/* make sure zero reg is zero */
+	stw	r0, 32*8+4(arg1)
+
+	extru,=	t4, 24, 1, r0		/* adjust for the L in source */
+	addi	4, arg0, arg0
+
+	comib,=,n 2, t3, $fpemu0c_2
+	nop
+
+	extru,=	t4, 24, 1, r0		/* adjust for the L in target */
+	addi	4, arg2, arg2
 
 	comib,=,n 0, t3, $fpemu0c_0
 	comib,=,n 1, t3, $fpemu0c_1
-	comib,=,n 2, t3, $fpemu0c_2
 	comib,=,n 3, t3, $fpemu0c_3
 
 $fpemu0c_0
@@ -132,7 +143,7 @@ $fpemu0c_0
 
 $fpemu0c_0_0
 	ldi	FPEMU_VERSION, t4
-	stw	t4, 0(arg2)
+	stw	t4, 0(arg3)
 	bv	0(rp)
 	copy	r0, ret0
 
@@ -143,13 +154,13 @@ $fpemu0c_0_2	/* fcpy */
 	ldw	2*4(arg0), t3
 	blr,n	r1, r0
 	ldw	3*4(arg0), t4
-	stw	t3, 2*4(arg1)
-	stw	t4, 3*4(arg1)
+	stw	t3, 2*4(arg2)
+	stw	t4, 3*4(arg2)
 	nop
 	nop
 	nop
-	stw	t2, 1*4(arg1)
-	stw	t1, 0*4(arg1)
+	stw	t2, 1*4(arg2)
+	stw	t1, 0*4(arg2)
 	bv	0(rp)
 	copy	r0, ret0
 
@@ -161,13 +172,13 @@ $fpemu0c_0_3	/* fabs */
 	ldw	3*4(arg0), t4
 	blr,n	r1, r0
 	depi	0, 0, 1, t1
-	stw	t3, 2*4(arg1)
-	stw	t4, 3*4(arg1)
+	stw	t3, 2*4(arg2)
+	stw	t4, 3*4(arg2)
 	nop
 	nop
 	nop
-	stw	t2, 1*4(arg1)
-	stw	t1, 0*4(arg1)
+	stw	t2, 1*4(arg2)
+	stw	t1, 0*4(arg2)
 	bv	0(rp)
 	copy	r0, ret0
 
@@ -222,17 +233,18 @@ $fpemu0c_2
 	comib,<>,n 0, r31, $fpemu_exit
 
 $fpemu0c_2_0
-	copy	arg2, arg3
 	extru,<> t4, 15, 5, t1
 	ldi	32, t1
-	sh3add	t1, arg3, arg2
+	sh3add	t1, arg3, arg1
+	extru,=	t4, 19, 1, r0	/* see if it's the L reg */
+	addi	4, arg1, arg1
 	FP_TABLE2(fcmp,sgl,dbl,invalid,invalid)
 
 $fpemu0c_2_1
 	comib,<>,n 0, r1, $fpemu_exit
 
 	/* XXX timex is much more compilicated */
-	ldw	0(arg2), t1
+	ldw	0(arg3), t1
 	ldi	0, ret0
 	extru,<> t1, 5, 1, r0
 	bv,n	r0(rp)
@@ -252,25 +264,27 @@ $fpemu0c_2_1
 $fpemu0c_3
 	extru,<> t4, 15, 5, t1
 	ldi	32, t1
+	extru,=	t4, 19, 1, r0	/* see if it's the L reg */
+	addi	4, arg1, arg1
 	blr	r31, r0
-	copy	arg2, arg3
+	nop
 
 	b	$fpemu0c_3_0
-	sh3add	t1, arg3, arg2
+	sh3add	t1, arg1, arg1
 	b	$fpemu0c_3_1
-	sh3add	t1, arg3, arg2
+	sh3add	t1, arg1, arg1
 	b	$fpemu0c_3_2
-	sh3add	t1, arg3, arg2
+	sh3add	t1, arg1, arg1
 	b	$fpemu0c_3_3
-	sh3add	t1, arg3, arg2
+	sh3add	t1, arg1, arg1
 	b	$fpemu0c_3_4
-	sh3add	t1, arg3, arg2
+	sh3add	t1, arg1, arg1
 	b	$fpemu_exit
-	sh3add	t1, arg3, arg2
+	sh3add	t1, arg1, arg1
 	b	$fpemu_exit
-	sh3add	t1, arg3, arg2
+	sh3add	t1, arg1, arg1
 	b	$fpemu_exit
-	sh3add	t1, arg3, arg2
+	sh3add	t1, arg1, arg1
 
 $fpemu0c_3_0	/* fadd */
 	FP_TABLE2(fadd,sgl,dbl,invalid,invalid)
@@ -278,7 +292,12 @@ $fpemu0c_3_0	/* fadd */
 $fpemu0c_3_1	/* fsub */
 	FP_TABLE2(fsub,sgl,dbl,invalid,invalid)
 
-$fpemu0c_3_2	/* fmpy */
+$fpemu0c_3_2	/* fmpy/xmpy */
+	bb,>=	t4, 23, $fpemu0c_3_2_f
+	nop
+
+	FP_TABLE2(xmpy,s,u,s,u)
+$fpemu0c_3_2_f
 	FP_TABLE2(fmpy,sgl,dbl,invalid,invalid)
 
 $fpemu0c_3_3	/* fdiv */
diff --git a/sys/arch/hppa/spmath/cnv_float.h b/sys/arch/hppa/spmath/cnv_float.h
index 561e257246f..739fb714050 100644
--- a/sys/arch/hppa/spmath/cnv_float.h
+++ b/sys/arch/hppa/spmath/cnv_float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cnv_float.h,v 1.8 2002/09/20 19:26:59 mickey Exp $	*/
+/*	$OpenBSD: cnv_float.h,v 1.9 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -296,17 +296,17 @@
 	else position -= 2;			\
     }
 
-int sgl_to_sgl_fcnvfx(sgl_floating_point *, sgl_floating_point *, unsigned int *);
-int sgl_to_dbl_fcnvfx(sgl_floating_point *, dbl_integer *, unsigned int *);
-int dbl_to_sgl_fcnvfx(dbl_floating_point *, int *, unsigned int *);
-int dbl_to_dbl_fcnvfx(dbl_floating_point *, dbl_integer *, unsigned int *);
+int sgl_to_sgl_fcnvfx(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *);
+int sgl_to_dbl_fcnvfx(sgl_floating_point *, sgl_floating_point *, dbl_integer *, unsigned int *);
+int dbl_to_sgl_fcnvfx(dbl_floating_point *, dbl_floating_point *, int *, unsigned int *);
+int dbl_to_dbl_fcnvfx(dbl_floating_point *, dbl_floating_point *, dbl_integer *, unsigned int *);
 
-int sgl_to_sgl_fcnvfxt(sgl_floating_point *, int *, unsigned int *);
-int sgl_to_dbl_fcnvfxt(sgl_floating_point *, dbl_integer *, unsigned int *);
-int dbl_to_sgl_fcnvfxt(dbl_floating_point *, int *, unsigned int *);
-int dbl_to_dbl_fcnvfxt(dbl_floating_point *, dbl_integer *, unsigned int *);
+int sgl_to_sgl_fcnvfxt(sgl_floating_point *, sgl_floating_point *, int *, unsigned int *);
+int sgl_to_dbl_fcnvfxt(sgl_floating_point *, sgl_floating_point *, dbl_integer *, unsigned int *);
+int dbl_to_sgl_fcnvfxt(dbl_floating_point *, dbl_floating_point *, int *, unsigned int *);
+int dbl_to_dbl_fcnvfxt(dbl_floating_point *, dbl_floating_point *, dbl_integer *, unsigned int *);
 
-int sgl_to_sgl_fcnvxf(int *, sgl_floating_point *, unsigned int *);
-int sgl_to_dbl_fcnvxf(int *, dbl_floating_point *, unsigned int *);
-int dbl_to_sgl_fcnvxf(dbl_integer *, sgl_floating_point *, unsigned int *);
-int dbl_to_dbl_fcnvxf(dbl_integer *, dbl_floating_point *, unsigned int *);
+int sgl_to_sgl_fcnvxf(int *, int *, sgl_floating_point *, unsigned int *);
+int sgl_to_dbl_fcnvxf(int *, int *, dbl_floating_point *, unsigned int *);
+int dbl_to_sgl_fcnvxf(dbl_integer *, dbl_integer *, sgl_floating_point *, unsigned int *);
+int dbl_to_dbl_fcnvxf(dbl_integer *, dbl_integer *, dbl_floating_point *, unsigned int *);
diff --git a/sys/arch/hppa/spmath/dbl_float.h b/sys/arch/hppa/spmath/dbl_float.h
index d7d38063681..c802f184293 100644
--- a/sys/arch/hppa/spmath/dbl_float.h
+++ b/sys/arch/hppa/spmath/dbl_float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dbl_float.h,v 1.8 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: dbl_float.h,v 1.9 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -531,12 +531,12 @@ int dbl_fcmp(dbl_floating_point *, dbl_floating_point *, unsigned int, unsigned
 int dbl_fdiv(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *);
 int dbl_fmpy(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *);
 int dbl_frem(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *);
-int dbl_fsqrt(dbl_floating_point *, dbl_floating_point *, unsigned int *);
+int dbl_fsqrt(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *);
 int dbl_fsub(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *);
 
 dbl_floating_point dbl_setoverflow(unsigned int);
 
-int sgl_to_dbl_fcnvff(sgl_floating_point *, dbl_floating_point *, unsigned int *);
-int dbl_to_sgl_fcnvff(dbl_floating_point *, sgl_floating_point *, unsigned int *);
+int sgl_to_dbl_fcnvff(sgl_floating_point *, sgl_floating_point *, dbl_floating_point *, unsigned int *);
+int dbl_to_sgl_fcnvff(dbl_floating_point *, dbl_floating_point *, sgl_floating_point *, unsigned int *);
 
-int dbl_frnd(dbl_floating_point *, dbl_floating_point *, unsigned int *);
+int dbl_frnd(dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *);
diff --git a/sys/arch/hppa/spmath/dfsqrt.c b/sys/arch/hppa/spmath/dfsqrt.c
index 2043820eeda..1d6ed622c53 100644
--- a/sys/arch/hppa/spmath/dfsqrt.c
+++ b/sys/arch/hppa/spmath/dfsqrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dfsqrt.c,v 1.6 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: dfsqrt.c,v 1.7 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -23,8 +23,8 @@
 
 /*ARGSUSED*/
 int
-dbl_fsqrt(srcptr,dstptr,status)
-	dbl_floating_point *srcptr, *dstptr;
+dbl_fsqrt(srcptr, null, dstptr, status)
+	dbl_floating_point *srcptr, *null, *dstptr;
 	unsigned int *status;
 {
 	register unsigned int srcp1, srcp2, resultp1, resultp2;
diff --git a/sys/arch/hppa/spmath/fcnvff.c b/sys/arch/hppa/spmath/fcnvff.c
index 361849e6afc..cb0e6d2f1f8 100644
--- a/sys/arch/hppa/spmath/fcnvff.c
+++ b/sys/arch/hppa/spmath/fcnvff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fcnvff.c,v 1.6 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: fcnvff.c,v 1.7 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -24,8 +24,8 @@
  */
 /*ARGSUSED*/
 int
-sgl_to_dbl_fcnvff(srcptr,dstptr,status)
-	sgl_floating_point *srcptr;
+sgl_to_dbl_fcnvff(srcptr, null, dstptr, status)
+	sgl_floating_point *srcptr, *null;
 	dbl_floating_point *dstptr;
 	unsigned int *status;
 {
@@ -110,8 +110,8 @@ sgl_to_dbl_fcnvff(srcptr,dstptr,status)
  */
 /*ARGSUSED*/
 int
-dbl_to_sgl_fcnvff(srcptr,dstptr,status)
-	dbl_floating_point *srcptr;
+dbl_to_sgl_fcnvff(srcptr, null, dstptr, status)
+	dbl_floating_point *srcptr, *null;
 	sgl_floating_point *dstptr;
 	unsigned int *status;
 {
diff --git a/sys/arch/hppa/spmath/fcnvfx.c b/sys/arch/hppa/spmath/fcnvfx.c
index 397596d8a9e..4b846f68d53 100644
--- a/sys/arch/hppa/spmath/fcnvfx.c
+++ b/sys/arch/hppa/spmath/fcnvfx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fcnvfx.c,v 1.6 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: fcnvfx.c,v 1.7 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -24,8 +24,8 @@
  */
 /*ARGSUSED*/
 int
-sgl_to_sgl_fcnvfx(srcptr,dstptr,status)
-	sgl_floating_point *srcptr;
+sgl_to_sgl_fcnvfx(srcptr, null, dstptr, status)
+	sgl_floating_point *srcptr, *null;
 	int *dstptr;
 	unsigned int *status;
 {
@@ -135,8 +135,8 @@ sgl_to_sgl_fcnvfx(srcptr,dstptr,status)
  */
 /*ARGSUSED*/
 int
-sgl_to_dbl_fcnvfx(srcptr,dstptr,status)
-	sgl_floating_point *srcptr;
+sgl_to_dbl_fcnvfx(srcptr, null, dstptr, status)
+	sgl_floating_point *srcptr, *null;
 	dbl_integer *dstptr;
 	unsigned int *status;
 {
@@ -270,8 +270,8 @@ sgl_to_dbl_fcnvfx(srcptr,dstptr,status)
  */
 /*ARGSUSED*/
 int
-dbl_to_sgl_fcnvfx(srcptr,dstptr,status)
-	dbl_floating_point *srcptr;
+dbl_to_sgl_fcnvfx(srcptr, null, dstptr, status)
+	dbl_floating_point *srcptr, *null;
 	int *dstptr;
 	unsigned int *status;
 {
@@ -404,8 +404,8 @@ dbl_to_sgl_fcnvfx(srcptr,dstptr,status)
  */
 /*ARGSUSED*/
 int
-dbl_to_dbl_fcnvfx(srcptr,dstptr,status)
-	dbl_floating_point *srcptr;
+dbl_to_dbl_fcnvfx(srcptr, null, dstptr, status)
+	dbl_floating_point *srcptr, *null;
 	dbl_integer *dstptr;
 	unsigned int *status;
 {
diff --git a/sys/arch/hppa/spmath/fcnvfxt.c b/sys/arch/hppa/spmath/fcnvfxt.c
index dad618df8c7..96e17dc09d9 100644
--- a/sys/arch/hppa/spmath/fcnvfxt.c
+++ b/sys/arch/hppa/spmath/fcnvfxt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fcnvfxt.c,v 1.6 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: fcnvfxt.c,v 1.7 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -25,8 +25,8 @@
  */
 /*ARGSUSED*/
 int
-sgl_to_sgl_fcnvfxt(srcptr,dstptr,status)
-	sgl_floating_point *srcptr;
+sgl_to_sgl_fcnvfxt(srcptr, null, dstptr, status)
+	sgl_floating_point *srcptr, *null;
 	int *dstptr;
 	unsigned int *status;
 {
@@ -101,8 +101,8 @@ sgl_to_sgl_fcnvfxt(srcptr,dstptr,status)
  */
 /*ARGSUSED*/
 int
-sgl_to_dbl_fcnvfxt(srcptr,dstptr,status)
-	sgl_floating_point *srcptr;
+sgl_to_dbl_fcnvfxt(srcptr, null, dstptr, status)
+	sgl_floating_point *srcptr, *null;
 	dbl_integer *dstptr;
 	unsigned int *status;
 {
@@ -187,8 +187,8 @@ sgl_to_dbl_fcnvfxt(srcptr,dstptr,status)
  */
 /*ARGSUSED*/
 int
-dbl_to_sgl_fcnvfxt(srcptr,dstptr,status)
-	dbl_floating_point *srcptr;
+dbl_to_sgl_fcnvfxt(srcptr, null, dstptr, status)
+	dbl_floating_point *srcptr, *null;
 	int *dstptr;
 	unsigned int *status;
 {
@@ -264,8 +264,8 @@ dbl_to_sgl_fcnvfxt(srcptr,dstptr,status)
  */
 /*ARGSUSED*/
 int
-dbl_to_dbl_fcnvfxt(srcptr,dstptr,status)
-	dbl_floating_point *srcptr;
+dbl_to_dbl_fcnvfxt(srcptr, null, dstptr, status)
+	dbl_floating_point *srcptr, *null;
 	dbl_integer *dstptr;
 	unsigned int *status;
 {
diff --git a/sys/arch/hppa/spmath/fcnvxf.c b/sys/arch/hppa/spmath/fcnvxf.c
index 683f89d2aa3..02e891e27fb 100644
--- a/sys/arch/hppa/spmath/fcnvxf.c
+++ b/sys/arch/hppa/spmath/fcnvxf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fcnvxf.c,v 1.6 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: fcnvxf.c,v 1.7 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -23,8 +23,8 @@
  *  Convert single fixed-point to single floating-point format
  */
 int
-sgl_to_sgl_fcnvxf(srcptr,dstptr,status)
-	int *srcptr;
+sgl_to_sgl_fcnvxf(srcptr, null, dstptr, status)
+	int *srcptr, *null;
 	sgl_floating_point *dstptr;
 	unsigned int *status;
 {
@@ -92,8 +92,8 @@ sgl_to_sgl_fcnvxf(srcptr,dstptr,status)
  *  Single Fixed-point to Double Floating-point
  */
 int
-sgl_to_dbl_fcnvxf(srcptr,dstptr,status)
-	int *srcptr;
+sgl_to_dbl_fcnvxf(srcptr, null, dstptr, status)
+	int *srcptr, *null;
 	dbl_floating_point *dstptr;
 	unsigned int *status;
 {
@@ -141,8 +141,8 @@ sgl_to_dbl_fcnvxf(srcptr,dstptr,status)
  *  Double Fixed-point to Single Floating-point
  */
 int
-dbl_to_sgl_fcnvxf(srcptr,dstptr,status)
-	dbl_integer *srcptr;
+dbl_to_sgl_fcnvxf(srcptr, null, dstptr, status)
+	dbl_integer *srcptr, *null;
 	sgl_floating_point *dstptr;
 	unsigned int *status;
 {
@@ -244,8 +244,8 @@ dbl_to_sgl_fcnvxf(srcptr,dstptr,status)
  *  Double Fixed-point to Double Floating-point
  */
 int
-dbl_to_dbl_fcnvxf(srcptr,dstptr,status)
-	dbl_integer *srcptr;
+dbl_to_dbl_fcnvxf(srcptr, null, dstptr, status)
+	dbl_integer *srcptr, *null;
 	dbl_floating_point *dstptr;
 	unsigned int *status;
 {
diff --git a/sys/arch/hppa/spmath/frnd.c b/sys/arch/hppa/spmath/frnd.c
index 188c476e438..99d17fa8119 100644
--- a/sys/arch/hppa/spmath/frnd.c
+++ b/sys/arch/hppa/spmath/frnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frnd.c,v 1.7 2002/09/20 19:26:59 mickey Exp $	*/
+/*	$OpenBSD: frnd.c,v 1.8 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -26,8 +26,8 @@
 
 /*ARGSUSED*/
 int
-sgl_frnd(srcptr,dstptr,status)
-	sgl_floating_point *srcptr, *dstptr;
+sgl_frnd(srcptr, null, dstptr, status)
+	sgl_floating_point *srcptr, *null, *dstptr;
 	unsigned int *status;
 {
 	register unsigned int src, result;
@@ -129,8 +129,8 @@ sgl_frnd(srcptr,dstptr,status)
 
 /*ARGSUSED*/
 int
-dbl_frnd(srcptr,dstptr,status)
-	dbl_floating_point *srcptr, *dstptr;
+dbl_frnd(srcptr, null, dstptr, status)
+	dbl_floating_point *srcptr, *null, *dstptr;
 	unsigned int *status;
 {
 	register unsigned int srcp1, srcp2, resultp1, resultp2;
@@ -231,8 +231,8 @@ dbl_frnd(srcptr,dstptr,status)
 
 /*ARGSUSED*/
 int
-quad_frnd(srcptr,dstptr,status)
-	quad_floating_point *srcptr, *dstptr;
+quad_frnd(srcptr, null, dstptr, status)
+	quad_floating_point *srcptr, *null, *dstptr;
 	unsigned int *status;
 {
 	return(UNIMPLEMENTEDEXCEPTION);
diff --git a/sys/arch/hppa/spmath/impys.S b/sys/arch/hppa/spmath/impys.S
index 9aae344e650..1acad9f4b1a 100644
--- a/sys/arch/hppa/spmath/impys.S
+++ b/sys/arch/hppa/spmath/impys.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: impys.S,v 1.9 2003/01/23 20:25:21 mickey Exp $	*/
+/*	$OpenBSD: impys.S,v 1.10 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -44,7 +44,7 @@ pm	.equ	       10		; value of -1 used in shifting
 ;*****************************************************************************
 	.text
 
-LEAF_ENTRY(impys)
+LEAF_ENTRY(s_xmpy)
 	stws,ma		pu,4(sp)		; save registers on stack
 	stws,ma		pl,4(sp)		; save registers on stack
 	stws,ma		op1,4(sp)		; save registers on stack
@@ -287,6 +287,6 @@ fini	stws		pu,0(arg2)		; save high part of result
 	ldws,mb		-4(sp),pl		; restore registers
 	bv		0(rp)			; return
 	ldws,mb		-4(sp),pu		; restore registers
-EXIT(imyps)
+EXIT(s_xmpy)
 
 	.end
diff --git a/sys/arch/hppa/spmath/impyu.S b/sys/arch/hppa/spmath/impyu.S
index db0dcd5a958..1a94db7ccb4 100644
--- a/sys/arch/hppa/spmath/impyu.S
+++ b/sys/arch/hppa/spmath/impyu.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: impyu.S,v 1.9 2003/01/23 20:25:21 mickey Exp $	*/
+/*	$OpenBSD: impyu.S,v 1.10 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -45,7 +45,7 @@ temp	.equ		6
 
 ;****************************************************************************
 	.text
-LEAF_ENTRY(impyu)
+LEAF_ENTRY(u_xmpy)
 	stws,ma		pu,4(sp)		; save registers on stack
 	stws,ma		pl,4(sp)		; save registers on stack
 	stws,ma		op1,4(sp)		; save registers on stack
@@ -285,6 +285,6 @@ fini	stws		pu,0(arg2)		; save high part of result
 	ldws,mb		-4(sp),pl		; restore registers
 	bv		0(rp)			; return
 	ldws,mb		-4(sp),pu		; restore registers
-EXIT(impu)
+EXIT(u_xmpy)
 
 	.end
diff --git a/sys/arch/hppa/spmath/md.h b/sys/arch/hppa/spmath/md.h
index b703479add6..ac007eada1f 100644
--- a/sys/arch/hppa/spmath/md.h
+++ b/sys/arch/hppa/spmath/md.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md.h,v 1.6 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: md.h,v 1.7 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -77,5 +77,5 @@ void mpyscv(int, int, struct mdsfu_register *);
 void mpyu(unsigned int, unsigned int, struct mdsfu_register *);
 void mpyucv(unsigned int, unsigned int, struct mdsfu_register *);
 
-int impys(int *, int *, struct mdsfu_register *);
-int impyu(int *, int *, struct mdsfu_register *);
+int s_xmpy(int *, int *, struct mdsfu_register *);
+int u_xmpy(int *, int *, struct mdsfu_register *);
diff --git a/sys/arch/hppa/spmath/mpyaccs.c b/sys/arch/hppa/spmath/mpyaccs.c
index f6c37fa47c2..65c7e9ed1e1 100644
--- a/sys/arch/hppa/spmath/mpyaccs.c
+++ b/sys/arch/hppa/spmath/mpyaccs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpyaccs.c,v 1.5 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: mpyaccs.c,v 1.6 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -24,7 +24,7 @@ mpyaccs(opnd1,opnd2,result)
 	struct mdsfu_register temp;
 	int carry, sign;
 
-	impys(&opnd1,&opnd2,&temp);
+	s_xmpy(&opnd1,&opnd2,&temp);
 
 	/* get result of low word add, and check for carry out */
 	if ((result_lo += (unsigned)temp.rslt_lo) < (unsigned)temp.rslt_lo)
diff --git a/sys/arch/hppa/spmath/mpyaccu.c b/sys/arch/hppa/spmath/mpyaccu.c
index 9c5c6b2b79f..7e5d3d4ac06 100644
--- a/sys/arch/hppa/spmath/mpyaccu.c
+++ b/sys/arch/hppa/spmath/mpyaccu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpyaccu.c,v 1.6 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: mpyaccu.c,v 1.7 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -24,7 +24,7 @@ mpyaccu(opnd1,opnd2,result)
 	struct mdsfu_register temp;
 	int carry;
 
-	impyu(&opnd1,&opnd2,&temp);
+	u_xmpy(&opnd1,&opnd2,&temp);
 
 	/* get result of low word add, and check for carry out */
 	if ((result_lo += (unsigned)temp.rslt_lo) < (unsigned)temp.rslt_lo)
diff --git a/sys/arch/hppa/spmath/mpys.c b/sys/arch/hppa/spmath/mpys.c
index 1541ab3198f..d8c3f7e45a7 100644
--- a/sys/arch/hppa/spmath/mpys.c
+++ b/sys/arch/hppa/spmath/mpys.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpys.c,v 1.6 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: mpys.c,v 1.7 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -21,7 +21,7 @@ mpys(opnd1,opnd2,result)
 	int opnd1, opnd2;
 	struct mdsfu_register *result;
 {
-	impys(&opnd1,&opnd2,result);
+	s_xmpy(&opnd1,&opnd2,result);
 
 	/* determine overflow status */
 	if ((result_hi == 0 && result_lo >= 0) ||
diff --git a/sys/arch/hppa/spmath/mpyscv.c b/sys/arch/hppa/spmath/mpyscv.c
index 12a95c44ccc..7f7ea4e6bb1 100644
--- a/sys/arch/hppa/spmath/mpyscv.c
+++ b/sys/arch/hppa/spmath/mpyscv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpyscv.c,v 1.6 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: mpyscv.c,v 1.7 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -21,6 +21,6 @@ mpyscv(opnd1,opnd2,result)
 	int opnd1, opnd2;
 	struct mdsfu_register *result;
 {
-	impys(&opnd1,&opnd2,result);
+	s_xmpy(&opnd1,&opnd2,result);
 	overflow = FALSE;
 }
diff --git a/sys/arch/hppa/spmath/mpyu.c b/sys/arch/hppa/spmath/mpyu.c
index 5de03eb55d8..18945c248d9 100644
--- a/sys/arch/hppa/spmath/mpyu.c
+++ b/sys/arch/hppa/spmath/mpyu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpyu.c,v 1.5 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: mpyu.c,v 1.6 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -21,9 +21,12 @@ mpyu(opnd1,opnd2,result)
 	unsigned int opnd1, opnd2;
 	struct mdsfu_register *result;
 {
-	impyu(&opnd1,&opnd2,result);
+	u_xmpy(&opnd1,&opnd2,result);
+
 	/* determine overflow status */
-	if (result_hi) overflow = TRUE;
-	else overflow = FALSE;
+	if (result_hi)
+		overflow = TRUE;
+	else
+		overflow = FALSE;
 	return;
 }
diff --git a/sys/arch/hppa/spmath/mpyucv.c b/sys/arch/hppa/spmath/mpyucv.c
index 7edd16a4e76..905c2eb1546 100644
--- a/sys/arch/hppa/spmath/mpyucv.c
+++ b/sys/arch/hppa/spmath/mpyucv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpyucv.c,v 1.5 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: mpyucv.c,v 1.6 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -21,6 +21,6 @@ mpyucv(opnd1,opnd2,result)
 	unsigned int opnd1, opnd2;
 	struct mdsfu_register *result;
 {
-	impyu(&opnd1,&opnd2,result);
+	u_xmpy(&opnd1,&opnd2,result);
 	overflow = FALSE;
 }
diff --git a/sys/arch/hppa/spmath/quad_float.h b/sys/arch/hppa/spmath/quad_float.h
index a0a6da4434e..ef45af874c5 100644
--- a/sys/arch/hppa/spmath/quad_float.h
+++ b/sys/arch/hppa/spmath/quad_float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quad_float.h,v 1.7 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: quad_float.h,v 1.8 2003/04/10 17:27:58 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -74,4 +74,4 @@
     Qallp4(rightp4) = Qallp4(leftp4) XOR Qallp4(rightp4)	\
     Qallp4(leftp4)  = Qallp4(leftp4) XOR Qallp4(rightp4)
 
-int quad_frnd(quad_floating_point *, quad_floating_point *, unsigned int *);
+int quad_frnd(quad_floating_point *, quad_floating_point *, quad_floating_point *, unsigned int *);
diff --git a/sys/arch/hppa/spmath/sfsqrt.c b/sys/arch/hppa/spmath/sfsqrt.c
index ecdc82ac337..12193a30589 100644
--- a/sys/arch/hppa/spmath/sfsqrt.c
+++ b/sys/arch/hppa/spmath/sfsqrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfsqrt.c,v 1.6 2002/05/07 22:19:30 mickey Exp $	*/
+/*	$OpenBSD: sfsqrt.c,v 1.7 2003/04/10 17:27:59 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -23,8 +23,8 @@
 
 /*ARGSUSED*/
 int
-sgl_fsqrt(srcptr,dstptr,status)
-	sgl_floating_point *srcptr, *dstptr;
+sgl_fsqrt(srcptr, null, dstptr, status)
+	sgl_floating_point *srcptr, *null, *dstptr;
 	unsigned int *status;
 {
 	register unsigned int src, result;
diff --git a/sys/arch/hppa/spmath/sgl_float.h b/sys/arch/hppa/spmath/sgl_float.h
index 8cf4f88ac1c..bd6859a2ec3 100644
--- a/sys/arch/hppa/spmath/sgl_float.h
+++ b/sys/arch/hppa/spmath/sgl_float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sgl_float.h,v 1.8 2002/09/20 19:26:59 mickey Exp $	*/
+/*	$OpenBSD: sgl_float.h,v 1.9 2003/04/10 17:27:59 mickey Exp $	*/
 /*
   (c) Copyright 1986 HEWLETT-PACKARD COMPANY
   To anyone who acknowledges that this file is provided "AS IS"
@@ -315,6 +315,6 @@ int sgl_fcmp(sgl_floating_point *, sgl_floating_point *, unsigned int, unsigned
 int sgl_fdiv(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *);
 int sgl_fmpy(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *);
 int sgl_frem(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *);
-int sgl_fsqrt(sgl_floating_point *, sgl_floating_point *, unsigned int *);
+int sgl_fsqrt(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *);
 int sgl_fsub(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *);
-int sgl_frnd(sgl_floating_point *, sgl_floating_point *, unsigned int *);
+int sgl_frnd(sgl_floating_point *, sgl_floating_point *, sgl_floating_point *, unsigned int *);