remove unused nullptr arg, effectively unifying calling conventions for emulator routines

10 files changed, 48 insertions, 65 deletions

diff --git a/sys/arch/hppa/spmath/cnv_float.h b/sys/arch/hppa/spmath/cnv_float.h
index 3ecc40bbe9d..8ae80123474 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.3 1998/07/02 19:04:54 mickey Exp $	*/
+/*	$OpenBSD: cnv_float.h,v 1.4 2000/01/11 08:18:42 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -414,20 +414,20 @@
 	return(NOEXCEPTION);			\
     }
 
-int sgl_to_sgl_fcnvfx __P((sgl_floating_point *, sgl_floating_point *, int *, sgl_floating_point *));
-int sgl_to_dbl_fcnvfx __P((sgl_floating_point *, void *, dbl_integer *, unsigned int *));
-int dbl_to_sgl_fcnvfx __P((dbl_floating_point *, void *, int *, unsigned int *));
-int dbl_to_dbl_fcnvfx __P((dbl_floating_point *, void *, dbl_integer *, unsigned int *));
+int sgl_to_sgl_fcnvfx __P((sgl_floating_point *, sgl_floating_point *, unsigned int *));
+int sgl_to_dbl_fcnvfx __P((sgl_floating_point *, dbl_integer *, unsigned int *));
+int dbl_to_sgl_fcnvfx __P((dbl_floating_point *, int *, unsigned int *));
+int dbl_to_dbl_fcnvfx __P((dbl_floating_point *, dbl_integer *, unsigned int *));
 
-int sgl_to_sgl_fcnvfxt __P((sgl_floating_point *, void *, int *, unsigned int *));
-int sgl_to_dbl_fcnvfxt __P((sgl_floating_point *, void *, dbl_integer *, unsigned int *));
-int dbl_to_sgl_fcnvfxt __P((dbl_floating_point *, void *, int *, unsigned int *));
-int dbl_to_dbl_fcnvfxt __P((dbl_floating_point *, void *, dbl_integer *, unsigned int *));
+int sgl_to_sgl_fcnvfxt __P((sgl_floating_point *, int *, unsigned int *));
+int sgl_to_dbl_fcnvfxt __P((sgl_floating_point *, dbl_integer *, unsigned int *));
+int dbl_to_sgl_fcnvfxt __P((dbl_floating_point *, int *, unsigned int *));
+int dbl_to_dbl_fcnvfxt __P((dbl_floating_point *, dbl_integer *, unsigned int *));
 
-int sgl_to_sgl_fcnvxf __P((int *, void *, sgl_floating_point *, unsigned int *));
-int sgl_to_dbl_fcnvxf __P((int *, void *, dbl_floating_point *, unsigned int *));
-int dbl_to_sgl_fcnvxf __P((dbl_integer *, void *, sgl_floating_point *, unsigned int *));
-int dbl_to_dbl_fcnvxf __P((dbl_integer *, void *, dbl_floating_point *, unsigned int *));
+int sgl_to_sgl_fcnvxf __P((int *, sgl_floating_point *, unsigned int *));
+int sgl_to_dbl_fcnvxf __P((int *, dbl_floating_point *, unsigned int *));
+int dbl_to_sgl_fcnvxf __P((dbl_integer *, sgl_floating_point *, unsigned int *));
+int dbl_to_dbl_fcnvxf __P((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 4a8fa70fa82..05a4ae6eb10 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.3 1998/07/02 19:04:56 mickey Exp $	*/
+/*	$OpenBSD: dbl_float.h,v 1.4 2000/01/11 08:18:43 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -557,12 +557,12 @@ int dbl_fcmp __P((dbl_floating_point *, dbl_floating_point*, unsigned int, unsig
 int dbl_fdiv __P((dbl_floating_point *, dbl_floating_point *, dbl_floating_point *, unsigned int *));
 int dbl_fmpy __P((dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *));
 int dbl_frem __P((dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *));
-int dbl_fsqrt __P((dbl_floating_point *, void *, dbl_floating_point *, unsigned int *));
+int dbl_fsqrt __P((dbl_floating_point *, dbl_floating_point *, unsigned int *));
 int dbl_fsub __P((dbl_floating_point *, dbl_floating_point *, dbl_floating_point*, unsigned int *));
 
 dbl_floating_point dbl_setoverflow __P((unsigned int));
 
-int sgl_to_dbl_fcnvff __P((sgl_floating_point *, void *, dbl_floating_point *, unsigned int *));
-int dbl_to_sgl_fcnvff __P((dbl_floating_point *, void *, sgl_floating_point *, unsigned int *));
+int sgl_to_dbl_fcnvff __P((sgl_floating_point *, dbl_floating_point *, unsigned int *));
+int dbl_to_sgl_fcnvff __P((dbl_floating_point *, sgl_floating_point *, unsigned int *));
 
-int dbl_frnd __P((dbl_floating_point *, void *, dbl_floating_point *, unsigned int *));
+int dbl_frnd __P((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 5af5cfa36fa..cb109bf8a30 100644
--- a/sys/arch/hppa/spmath/dfsqrt.c
+++ b/sys/arch/hppa/spmath/dfsqrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dfsqrt.c,v 1.3 1998/07/02 19:05:04 mickey Exp $	*/
+/*	$OpenBSD: dfsqrt.c,v 1.4 2000/01/11 08:18:43 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -48,10 +48,9 @@
 
 /*ARGSUSED*/
 int
-dbl_fsqrt(srcptr,nullptr,dstptr,status)
+dbl_fsqrt(srcptr,dstptr,status)
 
 dbl_floating_point *srcptr, *dstptr;
-void *nullptr;
 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 9db752b0886..69be58d011b 100644
--- a/sys/arch/hppa/spmath/fcnvff.c
+++ b/sys/arch/hppa/spmath/fcnvff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fcnvff.c,v 1.3 1998/07/02 19:05:18 mickey Exp $	*/
+/*	$OpenBSD: fcnvff.c,v 1.4 2000/01/11 08:18:43 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -49,11 +49,10 @@
  */
 /*ARGSUSED*/
 int
-sgl_to_dbl_fcnvff(srcptr,nullptr,dstptr,status)
+sgl_to_dbl_fcnvff(srcptr,dstptr,status)
 
 sgl_floating_point *srcptr;
 dbl_floating_point *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register unsigned int src, resultp1, resultp2;
@@ -137,11 +136,10 @@ unsigned int *status;
  */
 /*ARGSUSED*/
 int
-dbl_to_sgl_fcnvff(srcptr,nullptr,dstptr,status)
+dbl_to_sgl_fcnvff(srcptr,dstptr,status)
 
 dbl_floating_point *srcptr;
 sgl_floating_point *dstptr;
-void *nullptr;
 unsigned int *status;
 {
         register unsigned int srcp1, srcp2, result;
diff --git a/sys/arch/hppa/spmath/fcnvfx.c b/sys/arch/hppa/spmath/fcnvfx.c
index edf379a09bf..3a5e86a9198 100644
--- a/sys/arch/hppa/spmath/fcnvfx.c
+++ b/sys/arch/hppa/spmath/fcnvfx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fcnvfx.c,v 1.3 1998/07/02 19:05:19 mickey Exp $	*/
+/*	$OpenBSD: fcnvfx.c,v 1.4 2000/01/11 08:18:43 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -49,10 +49,11 @@
  */
 /*ARGSUSED*/
 int
-sgl_to_sgl_fcnvfx(srcptr,nullptr,dstptr,status)
+sgl_to_sgl_fcnvfx(srcptr,dstptr,status)
 
-sgl_floating_point *srcptr, *nullptr, *status;
+sgl_floating_point *srcptr;
 int *dstptr;
+unsigned int *status;
 {
 	register unsigned int src, temp;
 	register int src_exponent, result;
@@ -144,11 +145,10 @@ int *dstptr;
  */
 /*ARGSUSED*/
 int
-sgl_to_dbl_fcnvfx(srcptr,nullptr,dstptr,status)
+sgl_to_dbl_fcnvfx(srcptr,dstptr,status)
 
 sgl_floating_point *srcptr;
 dbl_integer *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register int src_exponent, resultp1;
@@ -260,11 +260,10 @@ unsigned int *status;
  */
 /*ARGSUSED*/
 int
-dbl_to_sgl_fcnvfx(srcptr,nullptr,dstptr,status)
+dbl_to_sgl_fcnvfx(srcptr,dstptr,status)
 
 dbl_floating_point *srcptr;
 int *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register unsigned int srcp1,srcp2, tempp1,tempp2;
@@ -362,11 +361,10 @@ unsigned int *status;
  */
 /*ARGSUSED*/
 int
-dbl_to_dbl_fcnvfx(srcptr,nullptr,dstptr,status)
+dbl_to_dbl_fcnvfx(srcptr,dstptr,status)
 
 dbl_floating_point *srcptr;
 dbl_integer *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register int src_exponent, resultp1;
diff --git a/sys/arch/hppa/spmath/fcnvfxt.c b/sys/arch/hppa/spmath/fcnvfxt.c
index 8da4ed15fce..3ccb7bc8006 100644
--- a/sys/arch/hppa/spmath/fcnvfxt.c
+++ b/sys/arch/hppa/spmath/fcnvfxt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fcnvfxt.c,v 1.3 1998/07/02 19:05:21 mickey Exp $	*/
+/*	$OpenBSD: fcnvfxt.c,v 1.4 2000/01/11 08:18:43 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -50,11 +50,10 @@
  */
 /*ARGSUSED*/
 int
-sgl_to_sgl_fcnvfxt(srcptr,nullptr,dstptr,status)
+sgl_to_sgl_fcnvfxt(srcptr,dstptr,status)
 
 sgl_floating_point *srcptr;
 int *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register unsigned int src, temp;
@@ -112,11 +111,10 @@ unsigned int *status;
  */
 /*ARGSUSED*/
 int
-sgl_to_dbl_fcnvfxt(srcptr,nullptr,dstptr,status)
+sgl_to_dbl_fcnvfxt(srcptr,dstptr,status)
 
 sgl_floating_point *srcptr;
 dbl_integer *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register int src_exponent, resultp1;
@@ -179,11 +177,10 @@ unsigned int *status;
  */
 /*ARGSUSED*/
 int
-dbl_to_sgl_fcnvfxt(srcptr,nullptr,dstptr,status)
+dbl_to_sgl_fcnvfxt(srcptr,dstptr,status)
 
 dbl_floating_point *srcptr;
 int *dstptr;
-void  *nullptr;
 unsigned int *status;
 {
 	register unsigned int srcp1, srcp2, tempp1, tempp2;
@@ -237,11 +234,10 @@ unsigned int *status;
  */
 /*ARGSUSED*/
 int
-dbl_to_dbl_fcnvfxt(srcptr,nullptr,dstptr,status)
+dbl_to_dbl_fcnvfxt(srcptr,dstptr,status)
 
 dbl_floating_point *srcptr;
 dbl_integer *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register int src_exponent, resultp1;
diff --git a/sys/arch/hppa/spmath/fcnvxf.c b/sys/arch/hppa/spmath/fcnvxf.c
index c2b8eac39c5..7728aedaf9c 100644
--- a/sys/arch/hppa/spmath/fcnvxf.c
+++ b/sys/arch/hppa/spmath/fcnvxf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fcnvxf.c,v 1.3 1998/07/02 19:05:25 mickey Exp $	*/
+/*	$OpenBSD: fcnvxf.c,v 1.4 2000/01/11 08:18:43 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -48,11 +48,10 @@
  *  Convert single fixed-point to single floating-point format
  */
 int
-sgl_to_sgl_fcnvxf(srcptr,nullptr,dstptr,status)
+sgl_to_sgl_fcnvxf(srcptr,dstptr,status)
 
 int *srcptr;
 sgl_floating_point *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register int src, dst_exponent;
@@ -119,11 +118,10 @@ unsigned int *status;
  *  Single Fixed-point to Double Floating-point 
  */
 int
-sgl_to_dbl_fcnvxf(srcptr,nullptr,dstptr,status)
+sgl_to_dbl_fcnvxf(srcptr,dstptr,status)
 
 int *srcptr;
 dbl_floating_point *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register int src, dst_exponent;
@@ -170,11 +168,10 @@ unsigned int *status;
  *  Double Fixed-point to Single Floating-point 
  */
 int
-dbl_to_sgl_fcnvxf(srcptr,nullptr,dstptr,status)
+dbl_to_sgl_fcnvxf(srcptr,dstptr,status)
 
 dbl_integer *srcptr;
 sgl_floating_point *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	int dst_exponent, srcp1;
@@ -275,11 +272,10 @@ unsigned int *status;
  *  Double Fixed-point to Double Floating-point 
  */
 int
-dbl_to_dbl_fcnvxf(srcptr,nullptr,dstptr,status)
+dbl_to_dbl_fcnvxf(srcptr,dstptr,status)
 
 dbl_integer *srcptr;
 dbl_floating_point *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register int srcp1, dst_exponent;
diff --git a/sys/arch/hppa/spmath/frnd.c b/sys/arch/hppa/spmath/frnd.c
index 98de7c85822..a37595bddae 100644
--- a/sys/arch/hppa/spmath/frnd.c
+++ b/sys/arch/hppa/spmath/frnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frnd.c,v 1.3 1998/07/02 19:05:29 mickey Exp $	*/
+/*	$OpenBSD: frnd.c,v 1.4 2000/01/11 08:18:43 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -51,10 +51,9 @@
 
 /*ARGSUSED*/
 int
-sgl_frnd(srcptr,nullptr,dstptr,status)
+sgl_frnd(srcptr,dstptr,status)
 
 sgl_floating_point *srcptr, *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register unsigned int src, result;
@@ -156,10 +155,9 @@ unsigned int *status;
 
 /*ARGSUSED*/
 int
-dbl_frnd(srcptr,nullptr,dstptr,status)
+dbl_frnd(srcptr,dstptr,status)
 
 dbl_floating_point *srcptr, *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register unsigned int srcp1, srcp2, resultp1, resultp2;
@@ -260,10 +258,9 @@ unsigned int *status;
 
 /*ARGSUSED*/
 int
-quad_frnd(srcptr,nullptr,dstptr,status)
+quad_frnd(srcptr,dstptr,status)
 
 quad_floating_point *srcptr, *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	return(UNIMPLEMENTEDEXCEPTION);
diff --git a/sys/arch/hppa/spmath/quad_float.h b/sys/arch/hppa/spmath/quad_float.h
index 14a9a2120d5..aaf3a91b1d1 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.3 1998/07/02 19:05:49 mickey Exp $	*/
+/*	$OpenBSD: quad_float.h,v 1.4 2000/01/11 08:18:43 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -99,4 +99,4 @@
     Qallp4(rightp4) = Qallp4(leftp4) XOR Qallp4(rightp4)	\
     Qallp4(leftp4)  = Qallp4(leftp4) XOR Qallp4(rightp4)
 
-int quad_frnd __P((quad_floating_point *, void *, quad_floating_point *, unsigned int *));
+int quad_frnd __P((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 72d7853f7fb..95d08afa2ac 100644
--- a/sys/arch/hppa/spmath/sfsqrt.c
+++ b/sys/arch/hppa/spmath/sfsqrt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfsqrt.c,v 1.3 1998/07/02 19:06:01 mickey Exp $	*/
+/*	$OpenBSD: sfsqrt.c,v 1.4 2000/01/11 08:18:43 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -48,10 +48,9 @@
 
 /*ARGSUSED*/
 int
-sgl_fsqrt(srcptr,nullptr,dstptr,status)
+sgl_fsqrt(srcptr,dstptr,status)
 
 sgl_floating_point *srcptr, *dstptr;
-void *nullptr;
 unsigned int *status;
 {
 	register unsigned int src, result;