From 6c94ce6718dda7c33126da4b11b9800d8399714e Mon Sep 17 00:00:00 2001 From: Richard Stallman Date: Sat, 18 Apr 1992 20:43:08 +0000 Subject: [PATCH] *** empty log message *** From-SVN: r785 --- gcc/config/m68k/m68k.h | 2 +- gcc/config/romp/romp.h | 8 ++++---- gcc/config/vax/vax.h | 18 ++++++++++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h index 44a1b73..236de8d 100644 --- a/gcc/config/m68k/m68k.h +++ b/gcc/config/m68k/m68k.h @@ -1293,7 +1293,7 @@ __transfer_from_trampoline () \ if (INTVAL (RTX) >= -128 && INTVAL (RTX) <= 127) return 1; \ /* Constants between -136 and 254 are easily generated */ \ /* by intelligent uses of moveq, add[q], and subq */ \ - if (OUTER_CODE == SET && INTVAL (RTX) >= -136 \ + if ((OUTER_CODE) == SET && INTVAL (RTX) >= -136 \ && INTVAL (RTX) <= 254) return 2; \ case CONST: \ case LABEL_REF: \ diff --git a/gcc/config/romp/romp.h b/gcc/config/romp/romp.h index 5e2bc7e..bfb5a13 100644 --- a/gcc/config/romp/romp.h +++ b/gcc/config/romp/romp.h @@ -1233,11 +1233,11 @@ struct rt_cargs {int gregs, fregs; }; #define CONST_COSTS(RTX,CODE,OUTER_CODE) \ case CONST_INT: \ - if (OUTER_CODE == IOR && exact_log2 (INTVAL (RTX)) >= 0 \ - || OUTER_CODE == AND && exact_log2 (~INTVAL (RTX)) >= 0 \ - || ((OUTER_CODE == PLUS || OUTER_CODE == MINUS) \ + if ((OUTER_CODE) == IOR && exact_log2 (INTVAL (RTX)) >= 0 \ + || (OUTER_CODE) == AND && exact_log2 (~INTVAL (RTX)) >= 0 \ + || (((OUTER_CODE) == PLUS || (OUTER_CODE) == MINUS) \ && (unsigned int) (INTVAL (RTX) + 15) < 31) \ - || (OUTER_CODE == SET && (unsigned int) INTVAL (RTX) < 16))\ + || ((OUTER_CODE) == SET && (unsigned int) INTVAL (RTX) < 16))\ return 0; \ return ((unsigned)(INTVAL(RTX) + 0x8000) < 0x10000 || (INTVAL (RTX) & 0xffff0000) == 0) ? 0 : COSTS_N_INSNS (2);\ case CONST: \ diff --git a/gcc/config/vax/vax.h b/gcc/config/vax/vax.h index bc578b3..91b3bf0 100644 --- a/gcc/config/vax/vax.h +++ b/gcc/config/vax/vax.h @@ -844,11 +844,13 @@ gen_rtx (PLUS, Pmode, frame, gen_rtx (CONST_INT, VOIDmode, 12)) #define CONST_COSTS(RTX,CODE,OUTER_CODE) \ case CONST_INT: \ if (INTVAL (RTX) == 0) return 0; \ - if (OUTER_CODE == AND) \ + if ((OUTER_CODE) == AND) \ return ((unsigned) ~INTVAL (RTX) <= 077) ? 1 : 2; \ if ((unsigned) INTVAL (RTX) <= 077) return 1; \ - if (OUTER_CODE == COMPARE && INTVAL (RTX) == -1) return 1; \ - if (OUTER_CODE == PLUS && (unsigned) -INTVAL (RTX) <= 077) return 1;\ + if ((OUTER_CODE) == COMPARE && INTVAL (RTX) == -1) \ + return 1; \ + if ((OUTER_CODE) == PLUS && (unsigned) -INTVAL (RTX) <= 077)\ + return 1; \ case CONST: \ case LABEL_REF: \ case SYMBOL_REF: \ @@ -856,9 +858,13 @@ gen_rtx (PLUS, Pmode, frame, gen_rtx (CONST_INT, VOIDmode, 12)) case CONST_DOUBLE: \ if (GET_MODE_CLASS (GET_MODE (RTX)) == MODE_FLOAT) \ return vax_float_literal (RTX) ? 5 : 8; \ - else return \ - (CONST_DOUBLE_HIGH (RTX) == 0 && (unsigned)CONST_DOUBLE_LOW (RTX) < 64 \ - || OUTER_CODE == PLUS && CONST_DOUBLE_HIGH (RTX) == -1 && (unsigned)-CONST_DOUBLE_LOW (RTX) < 64) ? 2 : 5; + else \ + return (((CONST_DOUBLE_HIGH (RTX) == 0 \ + && (unsigned) CONST_DOUBLE_LOW (RTX) < 64) \ + || ((OUTER_CODE) == PLUS \ + && CONST_DOUBLE_HIGH (RTX) == -1 \ + && (unsigned)-CONST_DOUBLE_LOW (RTX) < 64)) \ + ? 2 : 5); #define RTX_COSTS(RTX,CODE,OUTER_CODE) case FIX: case FLOAT: \ case MULT: case DIV: case UDIV: case MOD: case UMOD: \ -- 2.7.4