From a2f34833b1042d5d8eeb263b4cf4caaea138c4ad Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 18 Jun 2012 11:43:51 -0700 Subject: [PATCH] Use x86-64 fpu_control.h for i386 and x86_64 --- ChangeLog | 4 + sysdeps/i386/fpu_control.h | 101 -------------------------- sysdeps/{x86_64 => x86}/fpu_control.h | 0 3 files changed, 4 insertions(+), 101 deletions(-) delete mode 100644 sysdeps/i386/fpu_control.h rename sysdeps/{x86_64 => x86}/fpu_control.h (100%) diff --git a/ChangeLog b/ChangeLog index 9983dca092..102ccba5c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2012-06-18 H.J. Lu [BZ #14117] + * sysdeps/i386/fpu_control.h: Removed. + * sysdeps/x86_64/fpu_control.h: Moved to ... + * sysdeps/x86/fpu_control.h: Here. + * sysdeps/x86_64/fpu_control.h (_FPU_GETCW): Add __volatile__. (_FPU_SETCW): Likewise. diff --git a/sysdeps/i386/fpu_control.h b/sysdeps/i386/fpu_control.h deleted file mode 100644 index dd6be27377..0000000000 --- a/sysdeps/i386/fpu_control.h +++ /dev/null @@ -1,101 +0,0 @@ -/* FPU control word bits. i387 version. - Copyright (C) 1993,1995-1998,2000,2001,2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Olaf Flebbe. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _FPU_CONTROL_H -#define _FPU_CONTROL_H 1 - -/* Here is the dirty part. Set up your 387 through the control word - * (cw) register. - * - * 15-13 12 11-10 9-8 7-6 5 4 3 2 1 0 - * | reserved | IC | RC | PC | reserved | PM | UM | OM | ZM | DM | IM - * - * IM: Invalid operation mask - * DM: Denormalized operand mask - * ZM: Zero-divide mask - * OM: Overflow mask - * UM: Underflow mask - * PM: Precision (inexact result) mask - * - * Mask bit is 1 means no interrupt. - * - * PC: Precision control - * 11 - round to extended precision - * 10 - round to double precision - * 00 - round to single precision - * - * RC: Rounding control - * 00 - rounding to nearest - * 01 - rounding down (toward - infinity) - * 10 - rounding up (toward + infinity) - * 11 - rounding toward zero - * - * IC: Infinity control - * That is for 8087 and 80287 only. - * - * The hardware default is 0x037f which we use. - */ - -#include - -/* masking of interrupts */ -#define _FPU_MASK_IM 0x01 -#define _FPU_MASK_DM 0x02 -#define _FPU_MASK_ZM 0x04 -#define _FPU_MASK_OM 0x08 -#define _FPU_MASK_UM 0x10 -#define _FPU_MASK_PM 0x20 - -/* precision control */ -#define _FPU_EXTENDED 0x300 /* libm requires double extended precision. */ -#define _FPU_DOUBLE 0x200 -#define _FPU_SINGLE 0x0 - -/* rounding control */ -#define _FPU_RC_NEAREST 0x0 /* RECOMMENDED */ -#define _FPU_RC_DOWN 0x400 -#define _FPU_RC_UP 0x800 -#define _FPU_RC_ZERO 0xC00 - -#define _FPU_RESERVED 0xF0C0 /* Reserved bits in cw */ - - -/* The fdlibm code requires strict IEEE double precision arithmetic, - and no interrupts for exceptions, rounding to nearest. */ - -#define _FPU_DEFAULT 0x037f - -/* IEEE: same as above. */ -#define _FPU_IEEE 0x037f - -/* Type of the control word. */ -typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__))); - -/* Macros for accessing the hardware control word. - - Note that the use of these macros is no sufficient anymore with - recent hardware. Some floating point operations are executed in - the SSE/SSE2 engines which have their own control and status register. */ -#define _FPU_GETCW(cw) __asm__ __volatile__ ("fnstcw %0" : "=m" (*&cw)) -#define _FPU_SETCW(cw) __asm__ __volatile__ ("fldcw %0" : : "m" (*&cw)) - -/* Default control word set at startup. */ -extern fpu_control_t __fpu_control; - -#endif /* fpu_control.h */ diff --git a/sysdeps/x86_64/fpu_control.h b/sysdeps/x86/fpu_control.h similarity index 100% rename from sysdeps/x86_64/fpu_control.h rename to sysdeps/x86/fpu_control.h