d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove fpsetsticky(). This was added for SysV compatibility, but due

Browse Source 
to mistakes from day 1, it has always had semantics inconsistent with
SVR4 and its successors.  In particular, given argument M:

- On Solaris and FreeBSD/{alpha,sparc64}, it clobbers the old flags
  and *sets* the new flag word to M.  (NetBSD, too?)
- On FreeBSD/{amd64,i386}, it *clears* the flags that are specified in M
  and leaves the remaining flags unchanged (modulo a small bug on amd64.)
- On FreeBSD/ia64, it is not implemented.

There is no way to fix fpsetsticky() to DTRT for both old FreeBSD apps
and apps ported from other operating systems, so the best approach
seems to be to kill the function and fix any apps that break.  I
couldn't find any ports that use it, and any such ports would already
be broken on FreeBSD/ia64 and Linux anyway.

By the way, the routine has always been undocumented in FreeBSD,
except for an MLINK to a manpage that doesn't describe it.  This
manpage has stated since 5.3-RELEASE that the functions it describes
are deprecated, so that must mean that functions that it is *supposed*
to describe but doesn't are even *more* deprecated.  ;-)

Note that fpresetsticky() has been retained on FreeBSD/i386.  As far
as I can tell, no other operating systems or ports of FreeBSD
implement it, so there's nothing for it to be inconsistent with.

PR:		75862
Suggested by:	bde
This commit is contained in:
David Schultz 2005-03-15 15:53:39 +00:00
parent d2f389f5e4
commit 7b74e4a759
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=143658
12 changed files with 6 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libc/alpha/gen/Makefile.inc
View File

@ -2,7 +2,7 @@
SRCS+= _setjmp.S _set_tp.c fabs.S infinity.c ldexp.c modf.c setjmp.S
SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
fpsetround.c fpsetsticky.c
fpsetround.c
SRCS+= sigsetjmp.S
SRCS+= __divqu.S __divq.S __divlu.S __divl.S

62
lib/libc/alpha/gen/fpsetsticky.c
View File

@ -1,62 +0,0 @@
/*
* Copyright (c) 1995 Christopher G. Demetriou
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Christopher G. Demetriou
* for the NetBSD Project.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $NetBSD: fpsetsticky.c,v 1.1 1995/04/29 05:11:04 cgd Exp $
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <ieeefp.h>
#include <machine/fpu.h>
fp_except_t
fpsetsticky(sticky)
fp_except_t sticky;
{
union {
double fpcrval;
u_int64_t intval;
} u;
u_int64_t old, new;
GET_FPCR(u.fpcrval);
old = u.intval;
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.intval = new;
SET_FPCR(u.fpcrval);
return (((old >> IEEE_STATUS_TO_FPCR_SHIFT) & IEEE_STATUS_MASK)
>> IEEE_STATUS_TO_EXCSUM_SHIFT);
}

2
lib/libc/amd64/gen/Makefile.inc
View File

@ -5,4 +5,4 @@ SRCS+= _setjmp.S _set_tp.c rfork_thread.S setjmp.S sigsetjmp.S \
fabs.S modf.S \
infinity.c ldexp.c makecontext.c signalcontext.c \
flt_rounds.c fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \
fpgetround.c fpsetround.c fpgetsticky.c fpsetsticky.c
fpgetround.c fpsetround.c fpgetsticky.c

8
lib/libc/amd64/gen/fpsetsticky.c
View File

@ -1,8 +0,0 @@
/* $FreeBSD$ */
#define __IEEEFP_NOINLINES__ 1
#include <ieeefp.h>
fp_except_t fpsetsticky(fp_except_t m)
{
return (__fpsetsticky(m));
}

2
lib/libc/powerpc/gen/Makefile.inc
View File

@ -1,7 +1,7 @@
# $FreeBSD$
SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \
fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c \
fpgetsticky.c fpsetmask.c fpsetround.c \
infinity.c ldexp.c makecontext.c modf.c _setjmp.S \
setjmp.S sigsetjmp.S signalcontext.c syncicache.c \
_set_tp.c

57
lib/libc/powerpc/gen/fpsetsticky.c
View File

@ -1,57 +0,0 @@
/* $NetBSD: fpsetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Dan Winship.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the NetBSD
* Foundation, Inc. and its contributors.
* 4. Neither the name of The NetBSD Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <ieeefp.h>
fp_except_t
fpsetsticky(fp_except_t mask)
{
u_int64_t fpscr;
fp_rnd_t old;
__asm__ __volatile("mffs %0" : "=f"(fpscr));
old = (fp_except_t)((fpscr >> 25) & 0x1f);
fpscr = (fpscr & 0xc1ffffff) | (mask << 25);
__asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
return (old);
}

2
lib/libc/softfloat/Makefile.inc
View File

@ -11,7 +11,7 @@ CFLAGS+= -DSOFTFLOAT_FOR_GCC
SRCS+= softfloat.c
SRCS+= fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c \
fpgetsticky.c fpsetsticky.c
fpgetsticky.c
SRCS+= eqsf2.c nesf2.c gtsf2.c gesf2.c ltsf2.c lesf2.c negsf2.c \
eqdf2.c nedf2.c gtdf2.c gedf2.c ltdf2.c ledf2.c negdf2.c \

2
lib/libc/sparc64/gen/Makefile.inc
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SRCS+= _ctx_start.S _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpgetmask.c \
fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c \
fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c \
infinity.c ldexp.c makecontext.c modf.S \
signalcontext.c setjmp.S sigsetjmp.S _set_tp.c

30
lib/libc/sparc64/gen/fpsetsticky.c
View File

@ -1,30 +0,0 @@
/* $NetBSD: fpsetsticky.c,v 1.2 2002/01/13 21:45:51 thorpej Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
* Public domain.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <machine/fsr.h>
#include <ieeefp.h>
fp_except_t
fpsetsticky(sticky)
fp_except_t sticky;
{
unsigned int old;
unsigned int new;
__asm__("st %%fsr,%0" : "=m" (old));
new = old;
new &= ~FSR_AEXC_MASK;
new |= FSR_AEXC(sticky & FSR_EXC_MASK);
__asm__("ld %0,%%fsr" : : "m" (new));
return (FSR_GET_AEXC(old));
}

3
share/man/man3/Makefile
View File

@ -32,8 +32,7 @@ MLINKS+= fpgetround.3 fpgetmask.3 \
fpgetround.3 fpresetsticky.3 \
fpgetround.3 fpsetmask.3 \
fpgetround.3 fpsetprec.3 \
fpgetround.3 fpsetround.3 \
fpgetround.3 fpsetsticky.3
fpgetround.3 fpsetround.3
MLINKS+= ${PTHREAD_MLINKS}
MLINKS+= queue.3 LIST_EMPTY.3 \
queue.3 LIST_ENTRY.3 \

20
sys/amd64/include/ieeefp.h
View File

@ -249,25 +249,6 @@ __fpgetsticky(void)
return (_ex);
}
/* Note that this should really be called fpresetsticky() */
static __inline__ fp_except_t
__fpsetsticky(fp_except_t _m)
{
unsigned _env[7];
unsigned int _mxcsr;
fp_except_t _p;
__fnstenv(_env);
_p = _env[FP_STKY_REG] & _m;
__stmxcsr(&_mxcsr);
_p |= _mxcsr & SSE_STKY_FLD;
_env[FP_STKY_REG] &= ~_m;
__fldenv(_env);
_mxcsr &= ~_m;
__ldmxcsr(&_mxcsr);
return (_p);
}
#endif /* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE__ && !__cplusplus */
#if !defined(__IEEEFP_NOINLINES__) && !defined(__cplusplus) \
@ -280,7 +261,6 @@ __fpsetsticky(fp_except_t _m)
#define fpgetmask() __fpgetmask()
#define fpsetmask(_m) __fpsetmask(_m)
#define fpgetsticky() __fpgetsticky()
#define fpsetsticky(_m) __fpsetsticky(_m)
/* Suppress prototypes in the MI header. */
#define _IEEEFP_INLINED_ 1

1
sys/i386/include/ieeefp.h
View File

@ -177,7 +177,6 @@ __fpsetreg(int _m, int _reg, int _fld, int _off)
((__fpgetreg(FP_STKY_REG) & FP_STKY_FLD) >> FP_STKY_OFF))
#define fpresetsticky(m) ((fp_except_t) \
__fpsetreg(0, FP_STKY_REG, (m), FP_STKY_OFF))
#define fpsetsticky(m) fpresetsticky(m)
/* Suppress prototypes in the MI header. */
#define _IEEEFP_INLINED_ 1