Module Name: src
Committed By: skrll
Date: Fri Mar 23 09:34:10 UTC 2012
Modified Files:
src/lib/libc/arch/hppa/gen: flt_rounds.c fpgetmask.c fpgetround.c
fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c
Log Message:
Shut lint up.
>From he@
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/hppa/gen/flt_rounds.c \
src/lib/libc/arch/hppa/gen/fpgetmask.c \
src/lib/libc/arch/hppa/gen/fpgetround.c \
src/lib/libc/arch/hppa/gen/fpgetsticky.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/hppa/gen/fpsetmask.c \
src/lib/libc/arch/hppa/gen/fpsetround.c \
src/lib/libc/arch/hppa/gen/fpsetsticky.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/hppa/gen/flt_rounds.c
diff -u src/lib/libc/arch/hppa/gen/flt_rounds.c:1.4 src/lib/libc/arch/hppa/gen/flt_rounds.c:1.5
--- src/lib/libc/arch/hppa/gen/flt_rounds.c:1.4 Sat Dec 24 21:42:32 2005
+++ src/lib/libc/arch/hppa/gen/flt_rounds.c Fri Mar 23 09:34:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: flt_rounds.c,v 1.4 2005/12/24 21:42:32 perry Exp $ */
+/* $NetBSD: flt_rounds.c,v 1.5 2012/03/23 09:34:09 skrll Exp $ */
/* $OpenBSD: flt_rounds.c,v 1.3 2002/10/21 18:41:05 mickey Exp $ */
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.4 2005/12/24 21:42:32 perry Exp $");
+__RCSID("$NetBSD: flt_rounds.c,v 1.5 2012/03/23 09:34:09 skrll Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -27,5 +27,5 @@ __flt_rounds(void)
uint64_t fpsr;
__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
- return map[(fpsr >> 41) & 0x03];
+ return map[(unsigned int)(fpsr >> 41) & 0x03];
}
Index: src/lib/libc/arch/hppa/gen/fpgetmask.c
diff -u src/lib/libc/arch/hppa/gen/fpgetmask.c:1.4 src/lib/libc/arch/hppa/gen/fpgetmask.c:1.5
--- src/lib/libc/arch/hppa/gen/fpgetmask.c:1.4 Sat Dec 24 21:42:32 2005
+++ src/lib/libc/arch/hppa/gen/fpgetmask.c Fri Mar 23 09:34:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetmask.c,v 1.4 2005/12/24 21:42:32 perry Exp $ */
+/* $NetBSD: fpgetmask.c,v 1.5 2012/03/23 09:34:09 skrll Exp $ */
/* $OpenBSD: fpgetmask.c,v 1.3 2002/10/21 18:41:05 mickey Exp $ */
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.4 2005/12/24 21:42:32 perry Exp $");
+__RCSID("$NetBSD: fpgetmask.c,v 1.5 2012/03/23 09:34:09 skrll Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -20,5 +20,5 @@ fpgetmask(void)
uint64_t fpsr;
__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
- return ((fpsr >> 32) & 0x1f);
+ return ((fp_except)(fpsr >> 32) & 0x1f);
}
Index: src/lib/libc/arch/hppa/gen/fpgetround.c
diff -u src/lib/libc/arch/hppa/gen/fpgetround.c:1.4 src/lib/libc/arch/hppa/gen/fpgetround.c:1.5
--- src/lib/libc/arch/hppa/gen/fpgetround.c:1.4 Sat Dec 24 21:42:32 2005
+++ src/lib/libc/arch/hppa/gen/fpgetround.c Fri Mar 23 09:34:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetround.c,v 1.4 2005/12/24 21:42:32 perry Exp $ */
+/* $NetBSD: fpgetround.c,v 1.5 2012/03/23 09:34:09 skrll Exp $ */
/* $OpenBSD: fpgetround.c,v 1.3 2002/10/21 18:41:05 mickey Exp $ */
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.4 2005/12/24 21:42:32 perry Exp $");
+__RCSID("$NetBSD: fpgetround.c,v 1.5 2012/03/23 09:34:09 skrll Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -20,5 +20,5 @@ fpgetround(void)
uint64_t fpsr;
__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
- return ((fpsr >> 41) & 0x3);
+ return ((fp_rnd)(fpsr >> 41) & 0x3);
}
Index: src/lib/libc/arch/hppa/gen/fpgetsticky.c
diff -u src/lib/libc/arch/hppa/gen/fpgetsticky.c:1.4 src/lib/libc/arch/hppa/gen/fpgetsticky.c:1.5
--- src/lib/libc/arch/hppa/gen/fpgetsticky.c:1.4 Sat Dec 24 21:42:32 2005
+++ src/lib/libc/arch/hppa/gen/fpgetsticky.c Fri Mar 23 09:34:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpgetsticky.c,v 1.4 2005/12/24 21:42:32 perry Exp $ */
+/* $NetBSD: fpgetsticky.c,v 1.5 2012/03/23 09:34:09 skrll Exp $ */
/* $OpenBSD: fpgetsticky.c,v 1.3 2002/10/21 18:41:05 mickey Exp $ */
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.4 2005/12/24 21:42:32 perry Exp $");
+__RCSID("$NetBSD: fpgetsticky.c,v 1.5 2012/03/23 09:34:09 skrll Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -20,5 +20,5 @@ fpgetsticky(void)
uint64_t fpsr;
__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr));
- return ((fpsr >> 59) & 0x1f);
+ return ((fp_except)(fpsr >> 59) & 0x1f);
}
Index: src/lib/libc/arch/hppa/gen/fpsetmask.c
diff -u src/lib/libc/arch/hppa/gen/fpsetmask.c:1.5 src/lib/libc/arch/hppa/gen/fpsetmask.c:1.6
--- src/lib/libc/arch/hppa/gen/fpsetmask.c:1.5 Sun Jan 25 16:44:41 2009
+++ src/lib/libc/arch/hppa/gen/fpsetmask.c Fri Mar 23 09:34:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetmask.c,v 1.5 2009/01/25 16:44:41 skrll Exp $ */
+/* $NetBSD: fpsetmask.c,v 1.6 2012/03/23 09:34:09 skrll Exp $ */
/* $OpenBSD: fpsetmask.c,v 1.4 2004/01/05 06:06:16 otto Exp $ */
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.5 2009/01/25 16:44:41 skrll Exp $");
+__RCSID("$NetBSD: fpsetmask.c,v 1.6 2012/03/23 09:34:09 skrll Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -21,7 +21,7 @@ fpsetmask(fp_except mask)
fp_except old;
__asm volatile("fstd %%fr0,0(%1)" : "=m"(fpsr) : "r"(&fpsr) : "memory");
- old = (fpsr >> 32) & 0x1f;
+ old = (fp_except)(fpsr >> 32) & 0x1f;
fpsr = (fpsr & 0xffffffe000000000LL) | ((uint64_t)(mask & 0x1f) << 32);
__asm volatile("fldd 0(%0),%%fr0" : : "r"(&fpsr) : "memory");
return (old);
Index: src/lib/libc/arch/hppa/gen/fpsetround.c
diff -u src/lib/libc/arch/hppa/gen/fpsetround.c:1.5 src/lib/libc/arch/hppa/gen/fpsetround.c:1.6
--- src/lib/libc/arch/hppa/gen/fpsetround.c:1.5 Sun Jan 25 16:44:41 2009
+++ src/lib/libc/arch/hppa/gen/fpsetround.c Fri Mar 23 09:34:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetround.c,v 1.5 2009/01/25 16:44:41 skrll Exp $ */
+/* $NetBSD: fpsetround.c,v 1.6 2012/03/23 09:34:09 skrll Exp $ */
/* $OpenBSD: fpsetround.c,v 1.3 2002/10/21 18:41:05 mickey Exp $ */
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.5 2009/01/25 16:44:41 skrll Exp $");
+__RCSID("$NetBSD: fpsetround.c,v 1.6 2012/03/23 09:34:09 skrll Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -21,7 +21,7 @@ fpsetround(fp_rnd rnd_dir)
fp_rnd old;
__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr) : "memory");
- old = (fpsr >> 41) & 0x03;
+ old = (fp_rnd)(fpsr >> 41) & 0x03;
fpsr = (fpsr & 0xfffff9ff00000000LL) |
((uint64_t)(rnd_dir & 0x03) << 41);
__asm volatile("fldd 0(%0),%%fr0" : : "r" (&fpsr) : "memory");
Index: src/lib/libc/arch/hppa/gen/fpsetsticky.c
diff -u src/lib/libc/arch/hppa/gen/fpsetsticky.c:1.5 src/lib/libc/arch/hppa/gen/fpsetsticky.c:1.6
--- src/lib/libc/arch/hppa/gen/fpsetsticky.c:1.5 Sun Jan 25 16:44:41 2009
+++ src/lib/libc/arch/hppa/gen/fpsetsticky.c Fri Mar 23 09:34:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetsticky.c,v 1.5 2009/01/25 16:44:41 skrll Exp $ */
+/* $NetBSD: fpsetsticky.c,v 1.6 2012/03/23 09:34:09 skrll Exp $ */
/* $OpenBSD: fpsetsticky.c,v 1.4 2004/01/05 06:06:16 otto Exp $ */
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.5 2009/01/25 16:44:41 skrll Exp $");
+__RCSID("$NetBSD: fpsetsticky.c,v 1.6 2012/03/23 09:34:09 skrll Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
@@ -21,7 +21,7 @@ fpsetsticky(fp_except mask)
fp_except old;
__asm volatile("fstd %%fr0,0(%1)" : "=m" (fpsr) : "r" (&fpsr) : "memory");
- old = (fpsr >> 59) & 0x1f;
+ old = (fp_except)(fpsr >> 59) & 0x1f;
fpsr = (fpsr & 0x07ffffff00000000LL) | ((uint64_t)(mask & 0x1f) << 59);
__asm volatile("fldd 0(%0),%%fr0" : : "r" (&fpsr) : "memory");
