7 files changed, 54 insertions, 27 deletions

diff --git a/lib/libc/alpha/gen/Makefile.inc b/lib/libc/alpha/gen/Makefile.inc
index 3ff99f001439..cc7a87c10cff 100644
--- a/lib/libc/alpha/gen/Makefile.inc
+++ b/lib/libc/alpha/gen/Makefile.inc
@@ -1,10 +1,8 @@
-#	$Id: Makefile.inc,v 1.3 1998/08/08 02:18:07 jb Exp $
+#	$Id: Makefile.inc,v 1.4 1998/08/17 03:38:54 jb Exp $
 
 SRCS+=	_setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S
-SRCS+=	flt_rounds.c
-
-#SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
-#	fpsetround.c fpsetsticky.c
+SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
+	fpsetround.c fpsetsticky.c
 
 SRCS+=	sigsetjmp.S
 SRCS+=	__divqu.S __divq.S __divlu.S __divl.S
diff --git a/lib/libc/alpha/gen/fpgetmask.c b/lib/libc/alpha/gen/fpgetmask.c
index c52a7ef07112..516ae981d55c 100644
--- a/lib/libc/alpha/gen/fpgetmask.c
+++ b/lib/libc/alpha/gen/fpgetmask.c
@@ -31,12 +31,19 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/types.h>
 #include <ieeefp.h>
+#include <machine/sysarch.h>
+
+struct params {
+        u_int64_t mask;
+};
 
 fp_except
 fpgetmask()
 {
+        struct params p;
 
-	/* XXX */
-	abort();
+	sysarch(ALPHA_GET_FPMASK, (char *) &p);
+	return((fp_except) p.mask);
 }
diff --git a/lib/libc/alpha/gen/fpgetround.c b/lib/libc/alpha/gen/fpgetround.c
index 39b9b4744a6b..46976c2e4c11 100644
--- a/lib/libc/alpha/gen/fpgetround.c
+++ b/lib/libc/alpha/gen/fpgetround.c
@@ -33,6 +33,7 @@
 
 #include <sys/types.h>
 #include <ieeefp.h>
+#include <machine/fpu.h>
 
 fp_rnd
 fpgetround()
@@ -40,10 +41,8 @@ fpgetround()
 	double fpcrval;
 	u_int64_t old;
 
-	__asm__("trapb");
-	__asm__("mf_fpcr %0" : "=f" (fpcrval));
-	__asm__("trapb");
+	GET_FPCR(fpcrval);
 	old = *(u_int64_t *)&fpcrval;
 
-	return ((old >> 58) & 0x3);
+	return ((old & FPCR_DYN_MASK) >> FPCR_DYN_SHIFT);
 }
diff --git a/lib/libc/alpha/gen/fpgetsticky.c b/lib/libc/alpha/gen/fpgetsticky.c
index c36db3913d5f..c0ff4d75c88a 100644
--- a/lib/libc/alpha/gen/fpgetsticky.c
+++ b/lib/libc/alpha/gen/fpgetsticky.c
@@ -31,12 +31,18 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/types.h>
 #include <ieeefp.h>
+#include <machine/fpu.h>
 
 fp_except
 fpgetsticky()
 {
+	double fpcrval;
+	u_int64_t old;
 
-	/* XXX */
-	abort();
+	GET_FPCR(fpcrval);
+	old = *(u_int64_t *)&fpcrval;
+	return (((old >> IEEE_STATUS_TO_FPCR_SHIFT) & IEEE_STATUS_MASK)
+					 >> IEEE_STATUS_TO_EXCSUM_SHIFT);
 }
diff --git a/lib/libc/alpha/gen/fpsetmask.c b/lib/libc/alpha/gen/fpsetmask.c
index 87fc5a2f4b4c..05201ce81d40 100644
--- a/lib/libc/alpha/gen/fpsetmask.c
+++ b/lib/libc/alpha/gen/fpsetmask.c
@@ -31,13 +31,21 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/types.h>
 #include <ieeefp.h>
+#include <machine/sysarch.h>
+
+struct params {
+	u_int64_t mask;
+};
 
 fp_except
 fpsetmask(mask)
 	fp_except mask;
 {
+	struct params p;
 
-	/* XXX */
-	abort();
+	p.mask = (u_int64_t) mask;
+	sysarch(ALPHA_SET_FPMASK, (char *) &p);
+	return ((fp_except) p.mask);
 }
diff --git a/lib/libc/alpha/gen/fpsetround.c b/lib/libc/alpha/gen/fpsetround.c
index c28093cad87c..0d8f40af6d65 100644
--- a/lib/libc/alpha/gen/fpsetround.c
+++ b/lib/libc/alpha/gen/fpsetround.c
@@ -33,6 +33,7 @@
 
 #include <sys/types.h>
 #include <ieeefp.h>
+#include <machine/fpu.h>
 
 fp_rnd
 fpsetround(rnd_dir)
@@ -41,18 +42,14 @@ fpsetround(rnd_dir)
 	double fpcrval;
 	u_int64_t old, new;
 
-	__asm__("trapb");
-	__asm__("mf_fpcr %0" : "=f" (fpcrval));
-	__asm__("trapb");
+	GET_FPCR(fpcrval);
 	old = *(u_int64_t *)&fpcrval;
 
-	new = old & ~(long)0x0c00000000000000;
-	new = (long)rnd_dir << 58;
-	*(u_int64_t *)&fpcrval = new;
+	new = old & (~FPCR_DYN_MASK);
+	new |= ((long) rnd_dir << FPCR_DYN_SHIFT) & FPCR_DYN_MASK;
 
-	__asm__("trapb");
-	__asm__("mt_fpcr %0" : : "f" (fpcrval));
-	__asm__("trapb");
+	*(u_int64_t *)&fpcrval = new;
+	SET_FPCR(fpcrval);
 
-	return ((old >> 58) & 0x3);
+	return ((old & FPCR_DYN_MASK) >> FPCR_DYN_SHIFT);
 }
diff --git a/lib/libc/alpha/gen/fpsetsticky.c b/lib/libc/alpha/gen/fpsetsticky.c
index 90a993ee642a..ae0d742f79f0 100644
--- a/lib/libc/alpha/gen/fpsetsticky.c
+++ b/lib/libc/alpha/gen/fpsetsticky.c
@@ -31,13 +31,25 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/types.h>
 #include <ieeefp.h>
+#include <machine/fpu.h>
 
 fp_except
 fpsetsticky(sticky)
 	fp_except sticky;
 {
+	double fpcrval;
+	u_int64_t old,new ;
 
-	/* XXX */
-	abort();
+	GET_FPCR(fpcrval);
+	old = *(u_int64_t *)&fpcrval;
+	new = old & ~ (IEEE_STATUS_MASK << IEEE_STATUS_TO_FPCR_SHIFT);
+	new |= ((sticky << IEEE_STATUS_TO_EXCSUM_SHIFT) & IEEE_STATUS_MASK)
+					<< IEEE_STATUS_TO_FPCR_SHIFT;
+	*(u_int64_t *)&fpcrval = new;
+	SET_FPCR(fpcrval);
+
+	return (((old >> IEEE_STATUS_TO_FPCR_SHIFT) & IEEE_STATUS_MASK)
+					>> IEEE_STATUS_TO_EXCSUM_SHIFT);
 }