From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id BB5C7398A429; Wed, 16 Jun 2021 08:46:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BB5C7398A429 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1520] [Ada] Fix floating-point exponentiation with Integer'First exponent X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/master X-Git-Oldrev: 07b7dc09b21d1a2f000f2861a87b017b764b38b4 X-Git-Newrev: f4fe186bfe3e74c7c9b2d49b635565ea9a4df1b2 Message-Id: <20210616084604.BB5C7398A429@sourceware.org> Date: Wed, 16 Jun 2021 08:46:04 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 08:46:04 -0000 https://gcc.gnu.org/g:f4fe186bfe3e74c7c9b2d49b635565ea9a4df1b2 commit r12-1520-gf4fe186bfe3e74c7c9b2d49b635565ea9a4df1b2 Author: Eric Botcazou Date: Wed Mar 3 20:15:42 2021 +0100 [Ada] Fix floating-point exponentiation with Integer'First exponent gcc/ada/ * urealp.adb (Scale): Change first paramter to Uint and adjust. (Equivalent_Decimal_Exponent): Pass U.Den directly to Scale. * libgnat/s-exponr.adb (Negative): Rename to... (Safe_Negative): ...this and change its lower bound. (Exponr): Adjust to above renaming and deal with Integer'First. Diff: --- gcc/ada/libgnat/s-exponr.adb | 9 ++++++--- gcc/ada/urealp.adb | 10 ++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gcc/ada/libgnat/s-exponr.adb b/gcc/ada/libgnat/s-exponr.adb index ece53b51a39..ad7f40188dd 100644 --- a/gcc/ada/libgnat/s-exponr.adb +++ b/gcc/ada/libgnat/s-exponr.adb @@ -57,8 +57,8 @@ function System.Exponr (Left : Num; Right : Integer) return Num is subtype Double_T is Double_Real.Double_T; -- The double floating-point type - subtype Negative is Integer range Integer'First .. -1; - -- The range of negative exponents + subtype Safe_Negative is Integer range Integer'First + 1 .. -1; + -- The range of safe negative exponents function Expon (Left : Num; Right : Natural) return Num; -- Routine used if Right is greater than 4 @@ -113,9 +113,12 @@ begin return Num'Machine (Sqr * Sqr); end; - when Negative => + when Safe_Negative => return Num'Machine (1.0 / Exponr (Left, -Right)); + when Integer'First => + return Num'Machine (1.0 / (Exponr (Left, Integer'Last) * Left)); + when others => return Num'Machine (Expon (Left, Right)); end case; diff --git a/gcc/ada/urealp.adb b/gcc/ada/urealp.adb index 59d5c08f322..0f57043ffcd 100644 --- a/gcc/ada/urealp.adb +++ b/gcc/ada/urealp.adb @@ -270,23 +270,21 @@ package body Urealp is 15 => (Num => 53_385_559, Den => 45_392_361), -- 1.176091259055681 16 => (Num => 78_897_839, Den => 65_523_237)); -- 1.204119982655924 - function Scale (X : Int; R : Ratio) return Int; + function Scale (X : Uint; R : Ratio) return Int; -- Compute the value of X scaled by R ----------- -- Scale -- ----------- - function Scale (X : Int; R : Ratio) return Int is - type Wide_Int is range -2**63 .. 2**63 - 1; - + function Scale (X : Uint; R : Ratio) return Int is begin - return Int (Wide_Int (X) * Wide_Int (R.Num) / Wide_Int (R.Den)); + return UI_To_Int (X * R.Num / R.Den); end Scale; begin pragma Assert (U.Rbase /= 0); - return Scale (UI_To_Int (U.Den), Logs (U.Rbase)); + return Scale (U.Den, Logs (U.Rbase)); end Equivalent_Decimal_Exponent; ----------------