From patchwork Wed Mar 26 17:37:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 300 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx23.g.dreamhost.com (caibbdcaabja.dreamhost.com [208.113.200.190]) by wilcox.dreamhost.com (Postfix) with ESMTP id CB19D3601E0 for ; Wed, 26 Mar 2014 10:37:27 -0700 (PDT) Received: by homiemail-mx23.g.dreamhost.com (Postfix, from userid 14307373) id 7BC7D61FF17B5; Wed, 26 Mar 2014 10:37:27 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx23.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx23.g.dreamhost.com (Postfix) with ESMTPS id 5C3DF6200222B for ; Wed, 26 Mar 2014 10:37:27 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=rytsBCxoHY9OgrRDokWjvH2Q9TrdA ZLd06g1MOrGf881S+RgSP1KtKdVpA/I2jjNy9s3pPotoOIfNgawscytvztueqfKf HSYS5LX3CbMHCXEcf5xw58/nHZRL8SfBUcsknrTisMP3zj80kZIt4AwM6AdkN8U7 /bfD9bPWLZe0uE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=rBAHrY/PKwrIv6N5h+KiteK3fR4=; b=qBk A4L5fLcANGCEu7P3EZKK+1XeiGXS+dkYN03rqw67I52AC7BEfJ/CWCQIZV8yTJLk SLhLBw/STvxBbz3BybYS7z1cYfg32YtLw9ZD/QHiR08V1RfiTbMGaOZstwKnZRKg m8Emz9YTj/0SxVCA3m1QUTAlwB9quFUHikvxGSro= Received: (qmail 16096 invoked by alias); 26 Mar 2014 17:37:25 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 16079 invoked by uid 89); 26 Mar 2014 17:37:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Date: Wed, 26 Mar 2014 17:37:15 +0000 From: "Joseph S. Myers" To: Subject: Make x86_64 fegetenv preserve exception mask (bug 16198) Message-ID: MIME-Version: 1.0 X-DH-Original-To: glibc@patchwork.siddhesh.in Bug 16198 is x86_64 fegetenv wrongly masking exceptions for which traps are enabled, because that's a side-effect of the fnstenv instruction. This patch fixes it to use fldenv immediately after fnstenv, like the i386 version. Tested x86_64 and x86. 2014-03-26 Joseph Myers [BZ #16198] * sysdeps/x86_64/fpu/fegetenv.c (fegetenv): Use fldenv after fnstenv. * math/test-fenv-preserve.c: New file. * math/Makefile (tests): Add test-fenv-preserve. diff --git a/math/Makefile b/math/Makefile index 09d14a0..c13ca80 100644 --- a/math/Makefile +++ b/math/Makefile @@ -90,7 +90,7 @@ tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \ test-misc test-fpucw test-fpucw-ieee tst-definitions test-tgmath \ test-tgmath-ret bug-nextafter bug-nexttoward bug-tgmath1 \ test-tgmath-int test-tgmath2 test-powl tst-CMPLX tst-CMPLX2 test-snan \ - test-fenv-tls $(tests-static) + test-fenv-tls test-fenv-preserve $(tests-static) tests-static = test-fpucw-static test-fpucw-ieee-static # We do the `long double' tests only if this data type is available and # distinct from `double'. diff --git a/math/test-fenv-preserve.c b/math/test-fenv-preserve.c new file mode 100644 index 0000000..8288b2c --- /dev/null +++ b/math/test-fenv-preserve.c @@ -0,0 +1,53 @@ +/* Test fegetenv preserves exception mask (bug 16198). + Copyright (C) 2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + . */ + +#include +#include + +static int +do_test (void) +{ + fenv_t env; + + if (feenableexcept (FE_INVALID) != 0) + { + puts ("feenableexcept (FE_INVALID) failed, cannot test"); + return 0; + } + + if (fegetenv (&env) != 0) + { + puts ("fegetenv failed, cannot test"); + return 0; + } + + int ret = fegetexcept (); + if (ret == FE_INVALID) + { + puts ("fegetenv preserved exception mask, OK"); + return 0; + } + else + { + printf ("fegetexcept returned %d, expected %d\n", ret, FE_INVALID); + return 1; + } +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/sysdeps/x86_64/fpu/fegetenv.c b/sysdeps/x86_64/fpu/fegetenv.c index 364f917..0e0c269 100644 --- a/sysdeps/x86_64/fpu/fegetenv.c +++ b/sysdeps/x86_64/fpu/fegetenv.c @@ -22,6 +22,9 @@ int fegetenv (fenv_t *envp) { __asm__ ("fnstenv %0\n" + /* fnstenv changes the exception mask, so load back the + stored environment. */ + "fldenv %0\n" "stmxcsr %1" : "=m" (*envp), "=m" (envp->__mxcsr)); /* Success. */