diff options
| author | fxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-09 12:56:35 +0000 |
|---|---|---|
| committer | fxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-09 12:56:35 +0000 |
| commit | e099d7cd912ec9f9aea2f3c6539fa236a6a1d829 (patch) | |
| tree | f236884d1821a2340e632d7e6e3a973a81059b85 /libgfortran/intrinsics | |
| parent | f01c037fefba94e6bb747a220a747cc24d6ae43c (diff) | |
| download | gcc-e099d7cd912ec9f9aea2f3c6539fa236a6a1d829.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160470 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran/intrinsics')
| -rw-r--r-- | libgfortran/intrinsics/cpu_time.c | 8 | ||||
| -rw-r--r-- | libgfortran/intrinsics/random.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libgfortran/intrinsics/cpu_time.c b/libgfortran/intrinsics/cpu_time.c index 0ac502340ac..3580bba0928 100644 --- 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 803049b065f..cbe4f90322b 100644 --- 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: |