From da6eec72f5a23bbee21efae3efd976283bf1c23c Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 15 Oct 2002 17:40:39 -0700 Subject: real.c (real_to_decimal): Accept BUF_SIZE and CROP_TRAILING_ZEROS as arguments. gcc/ * real.c (real_to_decimal): Accept BUF_SIZE and CROP_TRAILING_ZEROS as arguments. Bound DIGITS by the available buffer size. (real_to_hexadecimal): Likewise. * real.h (real_to_decimal, real_to_hexadecimal): Update prototypes. (REAL_VALUE_TO_DECIMAL): Remove. * c-common.c, c-pretty-print.c, print-rtl.c, print-tree.c, sched-vis.c, config/arc/arc.c, config/c4x/c4x.c, config/fr30/fr30.c, config/i370/i370.h, config/i386/i386.c, config/i960/i960.c, config/ip2k/ip2k.c, config/m32r/m32r.c, config/m68hc11/m68hc11.c, config/m68k/hp320.h, config/m68k/m68k.h, config/m68k/sun2o4.h, config/m68k/sun3.h, config/mips/mips.c, config/ns32k/ns32k.c, config/pdp11/pdp11.h, config/vax/vax.h: Update all callers to use real_to_decimal directly, and with the proper arguments. * doc/tm.texi (REAL_VALUE_TO_DECIMAL): Remove. gcc/cp/ * error.c (dump_expr): Use real_to_decimal directly, and with the new arguments. gcc/f/ * target.h (ffetarget_print_real1, ffetarget_print_real2): Use real_to_decimal directly, and with the new arguments. From-SVN: r58187 --- gcc/config/arc/arc.c | 5 ++--- gcc/config/c4x/c4x.c | 5 ++--- gcc/config/fr30/fr30.c | 5 ++--- gcc/config/i370/i370.h | 24 ++++++++++++------------ gcc/config/i386/i386.c | 8 ++------ gcc/config/i960/i960.c | 4 +--- gcc/config/ip2k/ip2k.c | 5 +++-- gcc/config/m32r/m32r.c | 5 ++--- gcc/config/m68hc11/m68hc11.c | 5 ++--- gcc/config/m68k/hp320.h | 20 ++++++++------------ gcc/config/m68k/m68k.h | 6 +++--- gcc/config/m68k/sun2o4.h | 4 ++-- gcc/config/m68k/sun3.h | 4 ++-- gcc/config/mips/mips.c | 6 ++---- gcc/config/ns32k/ns32k.c | 8 +++++--- gcc/config/pdp11/pdp11.h | 6 ++---- gcc/config/vax/vax.h | 12 ++++++------ 17 files changed, 58 insertions(+), 74 deletions(-) (limited to 'gcc/config') diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c index a8de317..ab7fe42 100644 --- a/gcc/config/arc/arc.c +++ b/gcc/config/arc/arc.c @@ -1741,14 +1741,13 @@ arc_print_operand (file, x, code) return; case 'A' : { - REAL_VALUE_TYPE d; char str[30]; if (GET_CODE (x) != CONST_DOUBLE || GET_MODE_CLASS (GET_MODE (x)) != MODE_FLOAT) abort (); - REAL_VALUE_FROM_CONST_DOUBLE (d, x); - REAL_VALUE_TO_DECIMAL (d, str, -1); + + real_to_decimal (str, CONST_DOUBLE_REAL_VALUE (x), sizeof (str), 0, 1); fprintf (file, "%s", str); return; } diff --git a/gcc/config/c4x/c4x.c b/gcc/config/c4x/c4x.c index 78cd053..354ac76 100644 --- a/gcc/config/c4x/c4x.c +++ b/gcc/config/c4x/c4x.c @@ -1960,10 +1960,9 @@ c4x_print_operand (file, op, letter) case CONST_DOUBLE: { char str[64]; - REAL_VALUE_TYPE r; - REAL_VALUE_FROM_CONST_DOUBLE (r, op); - REAL_VALUE_TO_DECIMAL (r, str, -1); + real_to_decimal (str, CONST_DOUBLE_REAL_VALUE (op), + sizeof (str), 0, 1); fprintf (file, "%s", str); } break; diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c index 0298e75..e163f92 100644 --- a/gcc/config/fr30/fr30.c +++ b/gcc/config/fr30/fr30.c @@ -553,11 +553,10 @@ fr30_print_operand (file, x, code) output_operand_lossage ("fr30_print_operand: invalid %%F code"); else { - REAL_VALUE_TYPE d; char str[30]; - REAL_VALUE_FROM_CONST_DOUBLE (d, x); - REAL_VALUE_TO_DECIMAL (d, str, 8); + real_to_decimal (str, CONST_DOUBLE_REAL_VALUE (x), + sizeof (str), 0, 1); fputs (str, file); } return; diff --git a/gcc/config/i370/i370.h b/gcc/config/i370/i370.h index a2aff67..23cf036 100644 --- a/gcc/config/i370/i370.h +++ b/gcc/config/i370/i370.h @@ -1371,21 +1371,21 @@ enum reg_class else \ { \ char buf[50]; \ - REAL_VALUE_TYPE rval; \ - REAL_VALUE_FROM_CONST_DOUBLE(rval, XV); \ - REAL_VALUE_TO_DECIMAL (rval, buf, -1); \ if (GET_MODE (XV) == SFmode) \ { \ mvs_page_lit += 4; \ + real_to_decimal (buf, CONST_DOUBLE_REAL_VALUE (XV), \ + sizeof (buf), 0, 1); \ fprintf (FILE, "=E'%s'", buf); \ } \ - else \ - if (GET_MODE (XV) == DFmode) \ + else if (GET_MODE (XV) == DFmode) \ { \ mvs_page_lit += 8; \ + real_to_decimal (buf, CONST_DOUBLE_REAL_VALUE (XV), \ + sizeof (buf), 0, 1); \ fprintf (FILE, "=D'%s'", buf); \ } \ - else /* VOIDmode !?!? strange but true ... */ \ + else /* VOIDmode */ \ { \ mvs_page_lit += 8; \ fprintf (FILE, "=XL8'%08X%08X'", \ @@ -1665,21 +1665,21 @@ enum reg_class else \ { \ char buf[50]; \ - REAL_VALUE_TYPE rval; \ - REAL_VALUE_FROM_CONST_DOUBLE(rval, XV); \ - REAL_VALUE_TO_DECIMAL (rval, buf, -1); \ if (GET_MODE (XV) == SFmode) \ { \ mvs_page_lit += 4; \ + real_to_decimal (buf, CONST_DOUBLE_REAL_VALUE (XV), \ + sizeof (buf), 0, 1); \ fprintf (FILE, "=E'%s'", buf); \ } \ - else \ - if (GET_MODE (XV) == DFmode) \ + else if (GET_MODE (XV) == DFmode) \ { \ mvs_page_lit += 8; \ + real_to_decimal (buf, CONST_DOUBLE_REAL_VALUE (XV), \ + sizeof (buf), 0, 1); \ fprintf (FILE, "=D'%s'", buf); \ } \ - else /* VOIDmode !?!? strange but true ... */ \ + else /* VOIDmode */ \ { \ mvs_page_lit += 8; \ fprintf (FILE, "=XL8'%08X%08X'", \ diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 82b22dc..2f06f0777 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -6742,22 +6742,18 @@ print_operand (file, x, code) /* These float cases don't actually occur as immediate operands. */ else if (GET_CODE (x) == CONST_DOUBLE && GET_MODE (x) == DFmode) { - REAL_VALUE_TYPE r; char dstr[30]; - REAL_VALUE_FROM_CONST_DOUBLE (r, x); - REAL_VALUE_TO_DECIMAL (r, dstr, -1); + real_to_decimal (dstr, CONST_DOUBLE_REAL_VALUE (x), sizeof (dstr), 0, 1); fprintf (file, "%s", dstr); } else if (GET_CODE (x) == CONST_DOUBLE && (GET_MODE (x) == XFmode || GET_MODE (x) == TFmode)) { - REAL_VALUE_TYPE r; char dstr[30]; - REAL_VALUE_FROM_CONST_DOUBLE (r, x); - REAL_VALUE_TO_DECIMAL (r, dstr, -1); + real_to_decimal (dstr, CONST_DOUBLE_REAL_VALUE (x), sizeof (dstr), 0, 1); fprintf (file, "%s", dstr); } diff --git a/gcc/config/i960/i960.c b/gcc/config/i960/i960.c index f353c72..4917ae2 100644 --- a/gcc/config/i960/i960.c +++ b/gcc/config/i960/i960.c @@ -1785,7 +1785,6 @@ i960_print_operand (file, x, code) } else if (rtxcode == CONST_DOUBLE) { - REAL_VALUE_TYPE d; char dstr[30]; if (x == CONST0_RTX (GET_MODE (x))) @@ -1799,8 +1798,7 @@ i960_print_operand (file, x, code) return; } - REAL_VALUE_FROM_CONST_DOUBLE (d, x); - REAL_VALUE_TO_DECIMAL (d, dstr, -1); + real_to_decimal (dstr, CONST_DOUBLE_REAL_VALUE (x), sizeof (dstr), 0, 1); fprintf (file, "0f%s", dstr); return; } diff --git a/gcc/config/ip2k/ip2k.c b/gcc/config/ip2k/ip2k.c index 36c9b5f..c0a643a 100644 --- a/gcc/config/ip2k/ip2k.c +++ b/gcc/config/ip2k/ip2k.c @@ -3072,8 +3072,9 @@ asm_output_float (file, n) char dstr[100]; REAL_VALUE_TO_TARGET_SINGLE (n, val); - REAL_VALUE_TO_DECIMAL (n, dstr, -1); - fprintf (file, "\t.long 0x%08lx\t/* %s */\n",val, dstr); + real_to_decimal (dstr, &n, sizeof (dstr), 0, 1); + + fprintf (file, "\t.long 0x%08lx\t/* %s */\n", val, dstr); } /* Sets section name for declaration DECL. */ diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c index b3c0767..5903277 100644 --- a/gcc/config/m32r/m32r.c +++ b/gcc/config/m32r/m32r.c @@ -2311,14 +2311,13 @@ m32r_print_operand (file, x, code) case 'A' : { - REAL_VALUE_TYPE d; char str[30]; if (GET_CODE (x) != CONST_DOUBLE || GET_MODE_CLASS (GET_MODE (x)) != MODE_FLOAT) fatal_insn ("bad insn for 'A'", x); - REAL_VALUE_FROM_CONST_DOUBLE (d, x); - REAL_VALUE_TO_DECIMAL (d, str, -1); + + real_to_decimal (str, CONST_DOUBLE_REAL_VALUE (x), sizeof (str), 0, 1); fprintf (file, "%s", str); return; } diff --git a/gcc/config/m68hc11/m68hc11.c b/gcc/config/m68hc11/m68hc11.c index c17c3f1..ac16b52 100644 --- a/gcc/config/m68hc11/m68hc11.c +++ b/gcc/config/m68hc11/m68hc11.c @@ -2260,11 +2260,10 @@ print_operand (file, op, letter) else if (GET_CODE (op) == CONST_DOUBLE && (GET_MODE (op) == DFmode || GET_MODE (op) == XFmode)) { - REAL_VALUE_TYPE r; char dstr[30]; - REAL_VALUE_FROM_CONST_DOUBLE (r, op); - REAL_VALUE_TO_DECIMAL (r, dstr, -1); + real_to_decimal (dstr, CONST_DOUBLE_REAL_VALUE (op), + sizeof (dstr), 0, 1); asm_fprintf (file, "%I0r%s", dstr); } else diff --git a/gcc/config/m68k/hp320.h b/gcc/config/m68k/hp320.h index 17dcb69..680aab4 100644 --- a/gcc/config/m68k/hp320.h +++ b/gcc/config/m68k/hp320.h @@ -300,7 +300,7 @@ do { \ if (CODE == 'f') \ { \ char dstr[30]; \ - REAL_VALUE_TO_DECIMAL (VALUE, dstr, 9); \ + real_to_decimal (dstr, &(VALUE), sizeof (dstr), 9, 0); \ fprintf ((FILE), "&0f%s", dstr); \ } \ else \ @@ -317,7 +317,7 @@ do { \ #undef ASM_OUTPUT_DOUBLE_OPERAND #define ASM_OUTPUT_DOUBLE_OPERAND(FILE,VALUE) \ do { char dstr[30]; \ - REAL_VALUE_TO_DECIMAL (VALUE, dstr, -1); \ + real_to_decimal (dstr, &(VALUE), sizeof (dstr), 0, 1); \ fprintf (FILE, "&0f%s", dstr); \ } while (0) @@ -326,7 +326,7 @@ do { \ #undef ASM_OUTPUT_LONG_DOUBLE_OPERAND #define ASM_OUTPUT_LONG_DOUBLE_OPERAND(FILE,VALUE) \ do { char dstr[30]; \ - REAL_VALUE_TO_DECIMAL (VALUE, dstr, -1); \ + real_to_decimal (dstr, &(VALUE), sizeof (dstr), 0, 1); \ fprintf (FILE, "&0f%s", dstr); \ } while (0) @@ -351,15 +351,11 @@ do { \ { REAL_VALUE_TYPE r; long l; \ REAL_VALUE_FROM_CONST_DOUBLE (r, X); \ PRINT_OPERAND_FLOAT (CODE, FILE, r, l); } \ - else if (GET_CODE (X) == CONST_DOUBLE && GET_MODE (X) == DFmode) \ - { REAL_VALUE_TYPE r; char dstr[30]; \ - REAL_VALUE_FROM_CONST_DOUBLE (r, X); \ - REAL_VALUE_TO_DECIMAL (r, dstr, -1); \ - fprintf (FILE, "&0f%s", dstr); } \ - else if (GET_CODE (X) == CONST_DOUBLE && GET_MODE (X) == XFmode) \ - { REAL_VALUE_TYPE r; char dstr[30]; \ - REAL_VALUE_FROM_CONST_DOUBLE (r, X); \ - REAL_VALUE_TO_DECIMAL (r, dstr, -1); \ + else if (GET_CODE (X) == CONST_DOUBLE \ + && (GET_MODE (X) == DFmode || GET_MODE (X) == XFmode)) \ + { char dstr[30]; \ + real_to_decimal (dstr, CONST_DOUBLE_REAL_VALUE (X), \ + sizeof (dstr), 0, 1); \ fprintf (FILE, "&0f%s", dstr); } \ else { putc ('&', FILE); output_addr_const (FILE, X); }} #endif diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h index 703a379..eff0ce2 100644 --- a/gcc/config/m68k/m68k.h +++ b/gcc/config/m68k/m68k.h @@ -1823,7 +1823,7 @@ __transfer_from_trampoline () \ if (CODE == 'f') \ { \ char dstr[30]; \ - REAL_VALUE_TO_DECIMAL (VALUE, dstr, 9); \ + real_to_decimal (dstr, &(VALUE), sizeof (dstr), 9, 0); \ asm_fprintf ((FILE), "%I0r%s", dstr); \ } \ else \ @@ -1838,7 +1838,7 @@ __transfer_from_trampoline () \ This macro is a 68k-specific macro. */ #define ASM_OUTPUT_DOUBLE_OPERAND(FILE,VALUE) \ do { char dstr[30]; \ - REAL_VALUE_TO_DECIMAL (VALUE, dstr, -1); \ + real_to_decimal (dstr, &(VALUE), sizeof (dstr), 0, 1); \ asm_fprintf (FILE, "%I0r%s", dstr); \ } while (0) @@ -1846,7 +1846,7 @@ __transfer_from_trampoline () \ generated by m68k.md. */ #define ASM_OUTPUT_LONG_DOUBLE_OPERAND(FILE,VALUE) \ do { char dstr[30]; \ - REAL_VALUE_TO_DECIMAL (VALUE, dstr, -1); \ + real_to_decimal (dstr, &(VALUE), sizeof (dstr), 0, 1); \ asm_fprintf (FILE, "%I0r%s", dstr); \ } while (0) diff --git a/gcc/config/m68k/sun2o4.h b/gcc/config/m68k/sun2o4.h index 5b09262..0601bd0 100644 --- a/gcc/config/m68k/sun2o4.h +++ b/gcc/config/m68k/sun2o4.h @@ -121,7 +121,7 @@ Boston, MA 02111-1307, USA. */ } \ else \ { char dstr[30]; \ - REAL_VALUE_TO_DECIMAL ((VALUE), dstr, 9); \ + real_to_decimal (dstr, &(VALUE), sizeof (dstr), 9, 0); \ fprintf (FILE, "#0r%s", dstr); \ } \ } while (0) @@ -141,7 +141,7 @@ Boston, MA 02111-1307, USA. */ } \ else \ { char dstr[30]; \ - REAL_VALUE_TO_DECIMAL ((VALUE), dstr, -1); \ + real_to_decimal (dstr, &(VALUE), sizeof (dstr), 0, 1); \ fprintf (FILE, "#0r%s", dstr); \ } \ } while (0) diff --git a/gcc/config/m68k/sun3.h b/gcc/config/m68k/sun3.h index 3dcb85a..1d64599 100644 --- a/gcc/config/m68k/sun3.h +++ b/gcc/config/m68k/sun3.h @@ -208,7 +208,7 @@ Boston, MA 02111-1307, USA. */ } \ else \ { char dstr[30]; \ - REAL_VALUE_TO_DECIMAL ((VALUE), dstr, 9); \ + real_to_decimal (dstr, &(VALUE), sizeof (dstr), 9, 0); \ asm_fprintf (FILE, "%I0r%s", dstr); \ } \ } while (0) @@ -228,7 +228,7 @@ Boston, MA 02111-1307, USA. */ } \ else \ { char dstr[30]; \ - REAL_VALUE_TO_DECIMAL ((VALUE), dstr, -1); \ + real_to_decimal (dstr, &(VALUE), sizeof (dstr), 0, 1); \ asm_fprintf (FILE, "%I0r%s", dstr); \ } \ } while (0) diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index 82e2307..07cc657 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -5910,12 +5910,10 @@ print_operand (file, op, letter) else if (code == CONST_DOUBLE && GET_MODE_CLASS (GET_MODE (op)) == MODE_FLOAT) { - REAL_VALUE_TYPE d; char s[60]; - REAL_VALUE_FROM_CONST_DOUBLE (d, op); - REAL_VALUE_TO_DECIMAL (d, s, -1); - fprintf (file, s); + real_to_decimal (s, CONST_DOUBLE_REAL_VALUE (op), sizeof (s), 0, 1); + fputs (s, file); } else if (letter == 'x' && GET_CODE (op) == CONST_INT) diff --git a/gcc/config/ns32k/ns32k.c b/gcc/config/ns32k/ns32k.c index b94e704..b94765b 100644 --- a/gcc/config/ns32k/ns32k.c +++ b/gcc/config/ns32k/ns32k.c @@ -1130,11 +1130,13 @@ print_operand (file, x, code) { #ifdef SEQUENT_ASM /* Sequent likes its floating point constants as integers */ + long l[2]; + REAL_VALUE_TO_TARGET_DOUBLE (r, l); fprintf (file, "0Dx%08x%08x", - CONST_DOUBLE_HIGH (x), CONST_DOUBLE_LOW (x)); + l[!WORDS_BIG_ENDIAN], l[WORDS_BIG_ENDIAN]); #else char s[30]; - REAL_VALUE_TO_DECIMAL (r, s, -1); + real_to_decimal (s, &r, sizeof (s), 0, 1); #ifdef ENCORE_ASM fprintf (file, "0f%s", s); #else @@ -1150,7 +1152,7 @@ print_operand (file, x, code) fprintf (file, "0Fx%08lx", l); #else char s[30]; - REAL_VALUE_TO_DECIMAL (r, s, -1); + real_to_decimal (s, &r, sizeof (s), 0, 1); fprintf (file, "0f%s", s); #endif } diff --git a/gcc/config/pdp11/pdp11.h b/gcc/config/pdp11/pdp11.h index a30dde7..f246aa4 100644 --- a/gcc/config/pdp11/pdp11.h +++ b/gcc/config/pdp11/pdp11.h @@ -1149,10 +1149,8 @@ fprintf (FILE, "$help$: . = .+8 ; space for tmp moves!\n") \ else if (GET_CODE (X) == MEM) \ output_address (XEXP (X, 0)); \ else if (GET_CODE (X) == CONST_DOUBLE && GET_MODE (X) != SImode) \ - { REAL_VALUE_TYPE r; \ - char buf[30]; \ - REAL_VALUE_FROM_CONST_DOUBLE (r, X); \ - REAL_VALUE_TO_DECIMAL (r, buf, -1); \ + { char buf[30]; \ + real_to_decimal (buf, CONST_DOUBLE_REAL_VALUE (X), sizeof (buf), 0, 1); \ fprintf (FILE, "$0F%s", buf); } \ else { putc ('$', FILE); output_addr_const_pdp11 (FILE, X); }} diff --git a/gcc/config/vax/vax.h b/gcc/config/vax/vax.h index fe07f42..68d5fa3 100644 --- a/gcc/config/vax/vax.h +++ b/gcc/config/vax/vax.h @@ -1227,14 +1227,14 @@ VAX operand formatting codes: else if (GET_CODE (X) == MEM) \ output_address (XEXP (X, 0)); \ else if (GET_CODE (X) == CONST_DOUBLE && GET_MODE (X) == SFmode) \ - { REAL_VALUE_TYPE r; char dstr[30]; \ - REAL_VALUE_FROM_CONST_DOUBLE (r, X); \ - REAL_VALUE_TO_DECIMAL (r, dstr, -1); \ + { char dstr[30]; \ + real_to_decimal (dstr, CONST_DOUBLE_REAL_VALUE (X), \ + sizeof (dstr), 0, 1); \ fprintf (FILE, "$0f%s", dstr); } \ else if (GET_CODE (X) == CONST_DOUBLE && GET_MODE (X) == DFmode) \ - { REAL_VALUE_TYPE r; char dstr[30]; \ - REAL_VALUE_FROM_CONST_DOUBLE (r, X); \ - REAL_VALUE_TO_DECIMAL (r, dstr, -1); \ + { char dstr[30]; \ + real_to_decimal (dstr, CONST_DOUBLE_REAL_VALUE (X), \ + sizeof (dstr), 0, 1); \ fprintf (FILE, "$0%c%s", ASM_DOUBLE_CHAR, dstr); } \ else { putc ('$', FILE); output_addr_const (FILE, X); }} -- cgit v1.1