From patchwork Fri Aug 12 17:34:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 14520 Received: (qmail 94441 invoked by alias); 12 Aug 2016 17:35:00 -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 94406 invoked by uid 89); 12 Aug 2016 17:34:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.2 required=5.0 tests=AWL, BAYES_40, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=inexact, 287, Testing, UD:math-tests.h X-HELO: relay1.mentorg.com Date: Fri, 12 Aug 2016 17:34:44 +0000 From: Joseph Myers To: Subject: Fix test-fexcept when "inexact" implicitly raised [committed] Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 ISO C allows feraiseexcept to raise "inexact", in addition to the requested exceptions, when requested to raise "overflow" or "underflow". Testing on ARM and PowerPC e500 (where glibc's feraiseexcept has this property) showed that the new test-fexcept test failed to allow for this; this patch fixes it, by wrapping feraiseexcept to clear FE_INEXACT if implicitly raised and not raised before the call. (It would also be possible to do this with fesetexcept, which always affects exactly the requested flags, but this patch avoids making this fix depend on the fesetexcept changes.) Tested for x86_64, x86, arm and e500. Committed. 2016-08-12 Joseph Myers * math/test-fexcept.c (feraiseexcept_exact): New function. (test_set): Call feraiseexcept_exact instead of feraiseexcept. (test_except): Likewise. diff --git a/math/test-fexcept.c b/math/test-fexcept.c index 5e181a1..36d14c5 100644 --- a/math/test-fexcept.c +++ b/math/test-fexcept.c @@ -20,6 +20,35 @@ #include #include +/* Like feraiseexcept, but raise exactly the specified exceptions EXC, + without possibly raising "inexact" together with "overflow" or + "underflow" as permitted by ISO C. (This is not used with traps + enabled, so side-effects from raising and then clearing "inexact" + are irrelevant.) */ + +static int +feraiseexcept_exact (int exc) +{ +#ifdef FE_INEXACT + int mask = 0; +#ifdef FE_OVERFLOW + mask |= FE_OVERFLOW; +#endif +#ifdef FE_UNDERFLOW + mask |= FE_UNDERFLOW; +#endif + if ((exc & FE_INEXACT) != 0 + || (exc & mask) == 0 + || fetestexcept (FE_INEXACT) != 0) + return feraiseexcept (exc); + int ret = feraiseexcept (exc); + feclearexcept (FE_INEXACT); + return ret; +#else + return feraiseexcept (exc); +#endif +} + static int test_set (int initial, const fexcept_t *saved, int mask, int expected) { @@ -28,7 +57,7 @@ test_set (int initial, const fexcept_t *saved, int mask, int expected) printf ("Testing set: initial exceptions %x, mask %x, expected %x\n", (unsigned int) initial, (unsigned int) mask, (unsigned int) expected); - int ret = feraiseexcept (initial); + int ret = feraiseexcept_exact (initial); if (ret != 0) { puts ("feraiseexcept failed"); @@ -81,7 +110,7 @@ test_except (int exc, const char *exc_name) return result; } - ret = feraiseexcept (exc); + ret = feraiseexcept_exact (exc); if (ret == 0) printf ("feraiseexcept (%s) succeeded\n", exc_name); else