From d6edb99e92ed0d198857f104e81d98c57ad5d768 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Fri, 2 Mar 2001 01:51:02 +0000 Subject: xm-lynx.h, [...]: Do not define TRUE or FALSE. * config/xm-lynx.h, config/xm-std32.h, config/a29k/xm-a29k.h, config/a29k/xm-unix.h, config/alpha/xm-alpha.h, config/arc/xm-arc.h, config/arm/xm-arm.h, config/c4x/xm-c4x.h, config/clipper/xm-clix.h, config/convex/xm-convex.h, config/d30v/xm-d30v.h, config/dsp16xx/xm-dsp16xx.h, config/elxsi/xm-elxsi.h, config/fr30/xm-fr30.h, config/h8300/xm-h8300.h, config/i370/xm-i370.h, config/i370/xm-linux.h, config/i370/xm-mvs.h, config/i370/xm-oe.h, config/i386/xm-aix.h, config/i386/xm-i386.h, config/i386/xm-osf.h, config/i860/xm-i860.h, config/i960/xm-i960.h, config/ia64/xm-ia64.h, config/m32r/xm-m32r.h, config/m68k/xm-m68k.h, config/m88k/xm-m88k.h, config/mcore/xm-mcore.h, config/mips/xm-mips.h, config/mn10200/xm-mn10200.h, config/mn10300/xm-mn10300.h, config/ns32k/xm-ns32k.h, config/pa/xm-linux.h, config/pa/xm-pa.h, config/pa/xm-pa64hpux.h, config/pa/xm-pahpux.h, config/pa/xm-papro.h, config/pj/xm-pj.h, config/romp/xm-romp.h, config/rs6000/xm-beos.h, config/rs6000/xm-rs6000.h, config/rs6000/xm-sysv4.h, config/sh/xm-sh.h, config/sparc/xm-sparc.h, config/sparc/xm-sysv4.h, config/v850/xm-v850.h, config/vax/xm-vax.h, config/vax/xm-vms.h, config/we32k/xm-we32k.h: Do not define TRUE or FALSE. * config/i386/xm-aix.h, config/i386/xm-osf.h: Delete; made empty by above change. * config.gcc: Remove references to these files. * configure.in: Detect stdbool.h. * configure, config.in: Regenerate. * system.h: Include stddef.h here if available. Set HAVE__BOOL based on GCC_VERSION and __STDC_VERSION__. Then set up a sensible boolean type at the very end. * combine.c, cse.c, expr.c, fold-const.c, gensupport.c, f/com.c, config/mcore/mcore.c: Rename variables named 'true' and/or 'false'. * hash.h: Delete 'boolean' typedef and related #undefs. * f/proj.h: Delete 'bool' type. Don't include stddef.h here. * function.c, ggc-common.c, hash.h, hash.c, tlink.c, cp/decl.c, java/class.c, java/decl.c, java/java-tree.h: Replace all uses of 'boolean' with 'bool'. From-SVN: r40176 --- gcc/cse.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gcc/cse.c') diff --git a/gcc/cse.c b/gcc/cse.c index 17a597e..bf6d575 100644 --- a/gcc/cse.c +++ b/gcc/cse.c @@ -3913,15 +3913,15 @@ fold_rtx (x, insn) if (const_arg0 == 0 || const_arg1 == 0) { struct table_elt *p0, *p1; - rtx true = const_true_rtx, false = const0_rtx; + rtx true_rtx = const_true_rtx, false_rtx = const0_rtx; enum machine_mode mode_arg1; #ifdef FLOAT_STORE_FLAG_VALUE if (GET_MODE_CLASS (mode) == MODE_FLOAT) { - true = (CONST_DOUBLE_FROM_REAL_VALUE + true_rtx = (CONST_DOUBLE_FROM_REAL_VALUE (FLOAT_STORE_FLAG_VALUE (mode), mode)); - false = CONST0_RTX (mode); + false_rtx = CONST0_RTX (mode); } #endif @@ -3955,9 +3955,9 @@ fold_rtx (x, insn) || GET_CODE (folded_arg0) == CONST)) { if (code == EQ) - return false; + return false_rtx; else if (code == NE) - return true; + return true_rtx; } /* See if the two operands are the same. */ @@ -3981,12 +3981,12 @@ fold_rtx (x, insn) return ((code == EQ || code == LE || code == GE || code == LEU || code == GEU || code == UNEQ || code == UNLE || code == UNGE || code == ORDERED) - ? true : false); + ? true_rtx : false_rtx); /* Take care for the FP compares we can resolve. */ if (code == UNEQ || code == UNLE || code == UNGE) - return true; + return true_rtx; if (code == LTGT || code == LT || code == GT) - return false; + return false_rtx; } /* If FOLDED_ARG0 is a register, see if the comparison we are @@ -4011,7 +4011,7 @@ fold_rtx (x, insn) || (GET_CODE (folded_arg1) == REG && (REG_QTY (REGNO (folded_arg1)) == ent->comparison_qty)))) return (comparison_dominates_p (ent->comparison_code, code) - ? true : false); + ? true_rtx : false_rtx); } } } @@ -4035,30 +4035,30 @@ fold_rtx (x, insn) int has_sign = (HOST_BITS_PER_WIDE_INT >= sign_bitnum && (INTVAL (inner_const) & ((HOST_WIDE_INT) 1 << sign_bitnum))); - rtx true = const_true_rtx, false = const0_rtx; + rtx true_rtx = const_true_rtx, false_rtx = const0_rtx; #ifdef FLOAT_STORE_FLAG_VALUE if (GET_MODE_CLASS (mode) == MODE_FLOAT) { - true = (CONST_DOUBLE_FROM_REAL_VALUE + true_rtx = (CONST_DOUBLE_FROM_REAL_VALUE (FLOAT_STORE_FLAG_VALUE (mode), mode)); - false = CONST0_RTX (mode); + false_rtx = CONST0_RTX (mode); } #endif switch (code) { case EQ: - return false; + return false_rtx; case NE: - return true; + return true_rtx; case LT: case LE: if (has_sign) - return true; + return true_rtx; break; case GT: case GE: if (has_sign) - return false; + return false_rtx; break; default: break; -- cgit v1.1