* sbitmap.h (EXECUTE_IF_SET_IN_SBITMAP): Revert last change.

From-SVN: r33153

gcc/ChangeLog

+Fri Apr 14 18:07:30 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+	* sbitmap.h (EXECUTE_IF_SET_IN_SBITMAP): Revert last change.
+
 Fri Apr 14 10:54:22 2000  Jim Wilson  <wilson@cygnus.com>
 
 	* config/ia64/lib1funcs.asm (__ia64_nonlocal_goto): Drop obsolete
@@ -46,15 +50,14 @@ Thu Apr 13 19:39:56 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
 Thu Apr 13 15:55:08 MET DST 2000  Jan Hubicka  <jh@suse.cz>
 
-	* alias.c (nonlocal_reference_p): Take a care for
-	CALL_INSNS's fusage field.
+	* alias.c (nonlocal_reference_p): Take care of CALL_INSNS's fusage.
 	* calls.c (ECF_PURE): New flag.
 	(emit_call_1): Handle ECF_PURE calls.
 	(initialize_argument_information): Unset ECF_PURE flag too.
 	(precompute_arguments): Precompute for ECF_PURE too.
 	(expand_call): Handle ECF_PURE calls too.
-	(emit_library_call_value_1): Rename no_queue argument to
-	fn_type, accept value of 2 as pure function.
+	(emit_library_call_value_1): Rename no_queue argument to fn_type,
+	accept value of 2 as pure function.
 	(emit_library_call_value, emit_library_call): Rename no_queue argument
 	to fn_type.
 	* optabs.c (prepare_cmp_insn): Pass fn_type 2 to memcmp call.
@@ -116,7 +119,7 @@ Wed Apr 12 20:51:20 2000  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 Wed Apr 12 17:20:41 MET DST 2000  Jan Hubicka  <jh@suse.cz>
 
-	(expand_call): Do not reverse args in "equal from" field.
+	* calls.c (expand_call): Do not reverse args in "equal from" field.
 	(emit_library_call_value_1): Emit_libcall_block for const and pure
 	function.
 

gcc/sbitmap.h

@@ -58,27 +58,27 @@ typedef SBITMAP_ELT_TYPE *sbitmap_ptr;
 /* Loop over all elements of SBITSET, starting with MIN.  */
 #define EXECUTE_IF_SET_IN_SBITMAP(SBITMAP, MIN, N, CODE)		\
 do {									\
-  unsigned int _word_num;						\
-  unsigned int _bit_num = (MIN) % (unsigned int) SBITMAP_ELT_BITS;	\
-  unsigned int _size = (SBITMAP)->size;					\
-  SBITMAP_ELT_TYPE *_ptr = (SBITMAP)->elms;				\
+  unsigned int word_num_;						\
+  unsigned int bit_num_ = (MIN) % (unsigned int) SBITMAP_ELT_BITS;	\
+  unsigned int size_ = (SBITMAP)->size;					\
+  SBITMAP_ELT_TYPE *ptr_ = (SBITMAP)->elms;				\
 									\
-  for (_word_num = (MIN) / (unsigned int) SBITMAP_ELT_BITS;		\
-       _word_num < _size; _word_num++, _bit_num = 0)			\
+  for (word_num_ = (MIN) / (unsigned int) SBITMAP_ELT_BITS;		\
+       word_num_ < size_; word_num_++, bit_num_ = 0)			\
     {									\
-      SBITMAP_ELT_TYPE _word = _ptr[_word_num];				\
+      SBITMAP_ELT_TYPE word_ = ptr_[word_num_];				\
 									\
-      if (_word != 0)							\
-	for (; _bit_num < SBITMAP_ELT_BITS; _bit_num++)			\
+      if (word_ != 0)							\
+	for (; bit_num_ < SBITMAP_ELT_BITS; bit_num_++)			\
 	  {								\
-	    SBITMAP_ELT_TYPE _mask = (SBITMAP_ELT_TYPE)1 << _bit_num;	\
+	    SBITMAP_ELT_TYPE _mask = (SBITMAP_ELT_TYPE)1 << bit_num_;	\
 									\
-	    if ((_word & _mask) != 0)					\
+	    if ((word_ & _mask) != 0)					\
 	      {								\
-		_word &= ~ _mask;					\
-		(N) = _word_num * SBITMAP_ELT_BITS + _bit_num;		\
+		word_ &= ~ _mask;					\
+		(N) = word_num_ * SBITMAP_ELT_BITS + bit_num_;		\
 		CODE;							\
-		if (_word == 0)						\
+		if (word_ == 0)						\
 		  break;						\
 	      }								\
 	  }								\