mk-kinds-h.sh: Define GFC_REAL_*_LITERAL_SUFFIX and GFC_REAL_*_LITERAL macros for...

	* mk-kinds-h.sh: Define GFC_REAL_*_LITERAL_SUFFIX and
	GFC_REAL_*_LITERAL macros for each kind.
	* intrinsics/cpu_time.c (cpu_time_4, cpu_time_8, cpu_time_10,
	cpu_time_16): Use them.
	* intrinsics/random.c (rnumber_4, rnumber_8, rnumber_10,
	rnumber_16): Likewise.

From-SVN: r160470

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index d2acafd09457511ee9adf0cf0bcc8a2bb1191bfa..f71567d7d42de843391d40cd5ec39513d59a8b43 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-09  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+       * mk-kinds-h.sh: Define GFC_REAL_*_LITERAL_SUFFIX and
+       GFC_REAL_*_LITERAL macros for each kind.
+       * intrinsics/cpu_time.c (cpu_time_4, cpu_time_8, cpu_time_10,
+       cpu_time_16): Use them.
+       * intrinsics/random.c (rnumber_4, rnumber_8, rnumber_10,
+       rnumber_16): Likewise.
+
 2010-06-09  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
        * intrinsics/system_clock.c (system_clock_4, system_clock_8):

diff --git a/libgfortran/intrinsics/cpu_time.c b/libgfortran/intrinsics/cpu_time.c
index 0ac502340ac386578c10d81e3e774580408a5bc0..3580bba0928160495167d58d6fcfc23c61e6228b 100644 (file)
--- a/libgfortran/intrinsics/cpu_time.c
+++ b/libgfortran/intrinsics/cpu_time.c
@@ -78,7 +78,7 @@ void cpu_time_4 (GFC_REAL_4 *time)
 {
   long sec, usec;
   __cpu_time_1 (&sec, &usec);
-  *time = sec + usec * (GFC_REAL_4)1.e-6;
+  *time = sec + usec * GFC_REAL_4_LITERAL(1.e-6);
 }
 iexport(cpu_time_4);
 
@@ -89,7 +89,7 @@ void cpu_time_8 (GFC_REAL_8 *time)
 {
   long sec, usec;
   __cpu_time_1 (&sec, &usec);
-  *time = sec + usec * (GFC_REAL_8)1.e-6;
+  *time = sec + usec * GFC_REAL_8_LITERAL(1.e-6);
 }
 
 #ifdef HAVE_GFC_REAL_10
@@ -100,7 +100,7 @@ void cpu_time_10 (GFC_REAL_10 *time)
 {
   long sec, usec;
   __cpu_time_1 (&sec, &usec);
-  *time = sec + usec * (GFC_REAL_10)1.e-6;
+  *time = sec + usec * GFC_REAL_10_LITERAL(1.e-6);
 }
 #endif
 
@@ -112,7 +112,7 @@ void cpu_time_16 (GFC_REAL_16 *time)
 {
   long sec, usec;
   __cpu_time_1 (&sec, &usec);
-  *time = sec + usec * (GFC_REAL_16)1.e-6;
+  *time = sec + usec * GFC_REAL_16_LITERAL(1.e-6);
 }
 #endif
 

diff --git a/libgfortran/intrinsics/random.c b/libgfortran/intrinsics/random.c
index 803049b065fb2dcb0483c190b8f01b76bd8ec581..cbe4f90322b8b37398efda06f27fec6dd743ac72 100644 (file)
--- a/libgfortran/intrinsics/random.c
+++ b/libgfortran/intrinsics/random.c
@@ -85,7 +85,7 @@ rnumber_4 (GFC_REAL_4 *f, GFC_UINTEGER_4 v)
 #error "GFC_REAL_4_RADIX has unknown value"
 #endif
   v = v & mask;
-  *f = (GFC_REAL_4) v * (GFC_REAL_4) 0x1.p-32f;
+  *f = (GFC_REAL_4) v * GFC_REAL_4_LITERAL(0x1.p-32);
 }
 
 static inline void
@@ -100,7 +100,7 @@ rnumber_8 (GFC_REAL_8 *f, GFC_UINTEGER_8 v)
 #error "GFC_REAL_8_RADIX has unknown value"
 #endif
   v = v & mask;
-  *f = (GFC_REAL_8) v * (GFC_REAL_8) 0x1.p-64;
+  *f = (GFC_REAL_8) v * GFC_REAL_8_LITERAL(0x1.p-64);
 }
 
 #ifdef HAVE_GFC_REAL_10
@@ -117,7 +117,7 @@ rnumber_10 (GFC_REAL_10 *f, GFC_UINTEGER_8 v)
 #error "GFC_REAL_10_RADIX has unknown value"
 #endif
   v = v & mask;
-  *f = (GFC_REAL_10) v * (GFC_REAL_10) 0x1.p-64;
+  *f = (GFC_REAL_10) v * GFC_REAL_10_LITERAL(0x1.p-64);
 }
 #endif
 
@@ -137,8 +137,8 @@ rnumber_16 (GFC_REAL_16 *f, GFC_UINTEGER_8 v1, GFC_UINTEGER_8 v2)
 #error "GFC_REAL_16_RADIX has unknown value"
 #endif
   v2 = v2 & mask;
-  *f = (GFC_REAL_16) v1 * (GFC_REAL_16) 0x1.p-64
-    + (GFC_REAL_16) v2 * (GFC_REAL_16) 0x1.p-128;
+  *f = (GFC_REAL_16) v1 * GFC_REAL_16_LITERAL(0x1.p-64)
+    + (GFC_REAL_16) v2 * GFC_REAL_16_LITERAL(0x1.p-128);
 }
 #endif
 /* libgfortran previously had a Mersenne Twister, taken from the paper:

diff --git a/libgfortran/mk-kinds-h.sh b/libgfortran/mk-kinds-h.sh
index c5d20fe12c5c6b443d8f485b83ffa79e50655769..a16f98502542365bcb553e883c0d98fdc5980b94 100755 (executable)
--- a/libgfortran/mk-kinds-h.sh
+++ b/libgfortran/mk-kinds-h.sh
@@ -82,6 +82,12 @@ for k in $possible_real_kinds; do
     echo "#define HAVE_GFC_REAL_${k}"
     echo "#define HAVE_GFC_COMPLEX_${k}"
     echo "#define GFC_REAL_${k}_HUGE ${huge}${suffix}"
+    echo "#define GFC_REAL_${k}_LITERAL_SUFFIX ${suffix}"
+    if [ "x$suffix" = "x" ]; then
+      echo "#define GFC_REAL_${k}_LITERAL(X) (X)"
+    else
+      echo "#define GFC_REAL_${k}_LITERAL(X) (X ## ${suffix})"
+    fi
     echo "#define GFC_REAL_${k}_DIGITS ${digits}"
     echo "#define GFC_REAL_${k}_RADIX ${radix}"
     echo ""