diff options
| author | Nicolas Roche <roche@adacore.com> | 2018-05-25 09:05:34 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2018-05-25 09:05:34 +0000 |
| commit | 529e1a3f522ef75e826309b73d41819cb5da52a4 (patch) | |
| tree | 6e2093c6589c9538bce4d8c167e1b52fdbd080c0 | |
| parent | 38806cd3da0ec930cef1c80934a3aa9afc2c90c5 (diff) | |
| download | gcc-529e1a3f522ef75e826309b73d41819cb5da52a4.zip gcc-529e1a3f522ef75e826309b73d41819cb5da52a4.tar.gz gcc-529e1a3f522ef75e826309b73d41819cb5da52a4.tar.bz2 | |
[Ada] Improve performance of conversion from String to Long_Float
Once it is sure that the result will be infinity, stop computation and return
the result. This ensure that the function call duration is bounded. Before that
change on some cases the computation was taking more than a few seconds.
2018-05-25 Nicolas Roche <roche@adacore.com>
gcc/ada/
* libgnat/s-valrea.adb (Scan_Real): Abort computation once it is sure
that the result will be either -infinite or +infinite.
From-SVN: r260743
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/libgnat/s-valrea.adb | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 4c6dd1f..39deb15 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2018-05-25 Nicolas Roche <roche@adacore.com> + + * libgnat/s-valrea.adb (Scan_Real): Abort computation once it is sure + that the result will be either -infinite or +infinite. + 2018-05-25 Patrick Bernardi <bernardi@adacore.com> * libgnat/s-parame.ads, libgnat/s-parame__vxworks.ads, diff --git a/gcc/ada/libgnat/s-valrea.adb b/gcc/ada/libgnat/s-valrea.adb index 70f21aa..7bc7fd8 100644 --- a/gcc/ada/libgnat/s-valrea.adb +++ b/gcc/ada/libgnat/s-valrea.adb @@ -342,7 +342,7 @@ package body System.Val_Real is -- For base 10, use power of ten table, repeatedly if necessary elsif Scale > 0 then - while Scale > Maxpow loop + while Scale > Maxpow and then Uval'Valid loop Uval := Uval * Powten (Maxpow); Scale := Scale - Maxpow; end loop; @@ -350,18 +350,21 @@ package body System.Val_Real is -- Note that we still know that Scale > 0, since the loop -- above leaves Scale in the range 1 .. Maxpow. - Uval := Uval * Powten (Scale); + if Uval'Valid then + Uval := Uval * Powten (Scale); + end if; elsif Scale < 0 then - while (-Scale) > Maxpow loop + while (-Scale) > Maxpow and then Uval'Valid loop Uval := Uval / Powten (Maxpow); Scale := Scale + Maxpow; end loop; -- Note that we still know that Scale < 0, since the loop -- above leaves Scale in the range -Maxpow .. -1. - - Uval := Uval / Powten (-Scale); + if Uval'Valid then + Uval := Uval / Powten (-Scale); + end if; end if; -- Here is where we check for a bad based number |