i386.h (MODES_TIEABLE_P): Reorganize to shut up warnings.

	* i386.h (MODES_TIEABLE_P): Reorganize to shut up warnings.
	* alias.c (memrefs_conflict_p): Add braces to shut up warnings.
	* cse.c (cse_basic_block): Add parens to shut up warnings.

From-SVN: r21734

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dd51f8da19e581c58615356644257f7a6463c4e2..0a84cba7563c937e813d7860411f4fd7a0ee797a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 14 14:12:59 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * i386.h (MODES_TIEABLE_P): Reorganize to shut up warnings.
+       * alias.c (memrefs_conflict_p): Add braces to shut up warnings.
+       * cse.c (cse_basic_block): Add parens to shut up warnings.
+
 Fri Aug 14 12:58:21 1998  David S. Miller  <davem@pierdol.cobaltmicro.com>
 
        * config/sparc/sparc.c (sparc_emit_set_const64_quick2,
@@ -26,8 +32,8 @@ Fri Aug 14 21:52:53 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 Fri Aug 14 16:50:10 1998  John Carr  <jfc@mit.edu>
 
-       * genrecog.c (add_to_sequence): Fatal error if the modes of the operands
-       of SET are incompatible.
+       * genrecog.c (add_to_sequence): Fatal error if the modes of the
+       operands of SET are incompatible.
 
        * alpha.md: Fix max and min patterns so modes of SET operands match.
 

diff --git a/gcc/alias.c b/gcc/alias.c
index de471394d561949fa2daf8192abe64c4e37fa71e..8e0d21bef64ce88b3b275412d45710da9e57ddfd 100644 (file)
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -726,11 +726,14 @@ memrefs_conflict_p (xsize, x, ysize, y, c)
          if (rtx_equal_for_memref_p (x0, y0))
            return memrefs_conflict_p (xsize, x1, ysize, y1, c);
          if (GET_CODE (x1) == CONST_INT)
-           if (GET_CODE (y1) == CONST_INT)
-             return memrefs_conflict_p (xsize, x0, ysize, y0,
-                                        c - INTVAL (x1) + INTVAL (y1));
-           else
-             return memrefs_conflict_p (xsize, x0, ysize, y, c - INTVAL (x1));
+           {
+             if (GET_CODE (y1) == CONST_INT)
+               return memrefs_conflict_p (xsize, x0, ysize, y0,
+                                          c - INTVAL (x1) + INTVAL (y1));
+             else
+               return memrefs_conflict_p (xsize, x0, ysize, y,
+                                          c - INTVAL (x1));
+           }
          else if (GET_CODE (y1) == CONST_INT)
            return memrefs_conflict_p (xsize, x, ysize, y0, c + INTVAL (y1));
 

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 75e8baef1c1fd5994a2c153a58f73ad60d3c9fb0..540cfec35f5a411a306045e4922907d33e51aa8a 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -664,8 +664,8 @@ extern int ix86_arch;
 
 #define MODES_TIEABLE_P(MODE1, MODE2)                          \
   ((MODE1) == (MODE2)                                          \
-   || ((MODE1) == SImode && (MODE2) == HImode                  \
-       || (MODE1) == HImode && (MODE2) == SImode))
+   || ((MODE1) == SImode && (MODE2) == HImode)                 \
+   || ((MODE1) == HImode && (MODE2) == SImode))
 
 /* Specify the registers used for certain standard purposes.
    The values of these macros are register numbers.  */

diff --git a/gcc/cse.c b/gcc/cse.c
index 5d121870afb0a7153c8e3249f880a335b2312cca..94e80c3ee6d6a4be396432194eac2e823561ccb5 100644 (file)
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -8647,7 +8647,7 @@ cse_basic_block (from, to, next_branch, around_loop)
             its destination is the result of the block and hence should be
             recorded.  */
 
-         if (p = find_reg_note (insn, REG_LIBCALL, NULL_RTX))
+         if ((p = find_reg_note (insn, REG_LIBCALL, NULL_RTX)))
            libcall_insn = XEXP (p, 0);
          else if (find_reg_note (insn, REG_RETVAL, NULL_RTX))
            libcall_insn = NULL_RTX;