* gengenrtl.c (find_formats, genheader): Make i an unsigned

	int, remove cast of NUM_RTX_CODE.
	* machmode.h: Make the HAVE_MACHINE_MODES #ifdef encompass the
	entire file.  Remove the #ifs on GET_MODE_MASK etc and
	GET_MODE_WIDER_MODE etc.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72321 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 23 insertions, 25 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cf0a5f8be52..c0800b30343 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,14 +1,22 @@
+2003-10-10  Zack Weinberg  <zack@codesourcery.com>
+
+	* gengenrtl.c (find_formats, genheader): Make i an unsigned
+	int, remove cast of NUM_RTX_CODE.
+	* machmode.h: Make the HAVE_MACHINE_MODES #ifdef encompass the
+	entire file.  Remove the #ifs on GET_MODE_MASK etc and
+	GET_MODE_WIDER_MODE etc.
+
 2003-10-10  Eric Christopher  <echristo@redhat.com>
 
-        * lcm.c (optimize_mode_switching): Change NORMAL_MODE
-        to MODE_ENTRY and MODE_EXIT. Add MODE_AFTER for insns
-        that set mode.
-        * config/sh/sh.h (MODE_ENTRY): New macro.
-        (MODE_EXIT): Ditto.
-        (MODE_AFTER): Ditto.
-        * config/sh/sh.md: Change for MODE_AFTER. Add
-        fp_set attribute.
-        * doc/tm.texi: Document MODE_AFTER, MODE_ENTRY, and MODE_EXIT.
+	* lcm.c (optimize_mode_switching): Change NORMAL_MODE
+	to MODE_ENTRY and MODE_EXIT. Add MODE_AFTER for insns
+	that set mode.
+	* config/sh/sh.h (MODE_ENTRY): New macro.
+	(MODE_EXIT): Ditto.
+	(MODE_AFTER): Ditto.
+	* config/sh/sh.md: Change for MODE_AFTER. Add
+	fp_set attribute.
+	* doc/tm.texi: Document MODE_AFTER, MODE_ENTRY, and MODE_EXIT.
 
 2003-10-10  Zack Weinberg  <zack@codesourcery.com>
 
@@ -54,7 +62,7 @@
 	as global.
 	* config/ia64/ia64.h (ASM_APP_ON, ASM_APP_OFF): Add vers for not GAS.
 	(ASM_OUTPUT_DEBUG_LABEL): Likewise.
-	
+
 	* stor-layout.c (compute_record_mode): Don't force BLKmode if
 	field is zero-length BLKmode.
 	* expr.c (expand_expr, case COMPONENT_REF): Handle case of BLKmode
diff --git a/gcc/gengenrtl.c b/gcc/gengenrtl.c
index 9fe9481bc8e..740128b8e9d 100644
--- a/gcc/gengenrtl.c
+++ b/gcc/gengenrtl.c
@@ -165,9 +165,9 @@ excluded_rtx (int idx)
 static void
 find_formats (void)
 {
-  int i;
+  unsigned int i;
 
-  for (i = 0; i < (int)NUM_RTX_CODE; i++)
+  for (i = 0; i < NUM_RTX_CODE; i++)
     {
       const char **f;
 
@@ -296,7 +296,7 @@ genlegend (void)
 static void
 genheader (void)
 {
-  int i;
+  unsigned int i;
   const char **fmt;
 
   puts ("#ifndef GCC_GENRTL_H");
@@ -307,7 +307,7 @@ genheader (void)
 
   putchar ('\n');
 
-  for (i = 0; i < (int) NUM_RTX_CODE; i++)
+  for (i = 0; i < NUM_RTX_CODE; i++)
     if (! special_format (defs[i].format))
       genmacro (i);
 
diff --git a/gcc/machmode.h b/gcc/machmode.h
index 4c4086c312d..04b2de16753 100644
--- a/gcc/machmode.h
+++ b/gcc/machmode.h
@@ -97,10 +97,6 @@ extern const unsigned char mode_unit_size[NUM_MACHINE_MODES];
 extern const unsigned short mode_bitsize[NUM_MACHINE_MODES];
 #define GET_MODE_BITSIZE(MODE)  mode_bitsize[MODE]
 
-#endif /* not HAVE_MACHINE_MODES */
-
-#if defined HOST_WIDE_INT && ! defined GET_MODE_MASK
-
 /* Get a bitmask containing 1 for all bits in a word
    that fit within mode MODE.  */
 
@@ -114,11 +110,6 @@ extern const unsigned char mode_inner[NUM_MACHINE_MODES];
 
 #define GET_MODE_INNER(MODE) mode_inner[MODE]
 
-#endif /* defined (HOST_WIDE_INT) && ! defined GET_MODE_MASK */
-
-#if ! defined GET_MODE_WIDER_MODE || ! defined GET_MODE_ALIGNMENT \
-    || ! defined GET_CLASS_NARROWEST_MODE
-
 /* Get the next wider natural mode (eg, QI -> HI -> SI -> DI -> TI).  */
 
 extern const unsigned char mode_wider[NUM_MACHINE_MODES];
@@ -166,5 +157,4 @@ extern enum machine_mode byte_mode;
 extern enum machine_mode word_mode;
 extern enum machine_mode ptr_mode;
 
-#endif /* ! defined GET_MODE_WIDER_MODE || ! defined GET_MODE_ALIGNMENT
-	  || ! defined GET_CLASS_NARROWEST_MODE */
+#endif /* not HAVE_MACHINE_MODES */