Reversion of part of patch to sbitmap.h.

[Richard Kenner]

I just commmited this:

Fri Apr 14 18:07:30 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>

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

*** sbitmap.h	2000/04/10 12:31:19	1.10
--- sbitmap.h	2000/04/14 17:02:03
*************** typedef SBITMAP_ELT_TYPE *sbitmap_ptr;
*** 59,83 ****
  #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;				\
  									\
!   for (_word_num = (MIN) / (unsigned int) SBITMAP_ELT_BITS;		\
!        _word_num < _size; _word_num++, _bit_num = 0)			\
      {									\
!       SBITMAP_ELT_TYPE _word = _ptr[_word_num];				\
  									\
!       if (_word != 0)							\
! 	for (; _bit_num < SBITMAP_ELT_BITS; _bit_num++)			\
  	  {								\
! 	    SBITMAP_ELT_TYPE _mask = (SBITMAP_ELT_TYPE)1 << _bit_num;	\
  									\
! 	    if ((_word & _mask) != 0)					\
  	      {								\
! 		_word &= ~ _mask;					\
! 		(N) = _word_num * SBITMAP_ELT_BITS + _bit_num;		\
  		CODE;							\
! 		if (_word == 0)						\
  		  break;						\
  	      }								\
--- 59,83 ----
  #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;				\
  									\
!   for (word_num_ = (MIN) / (unsigned int) SBITMAP_ELT_BITS;		\
!        word_num_ < size_; word_num_++, bit_num_ = 0)			\
      {									\
!       SBITMAP_ELT_TYPE word_ = ptr_[word_num_];				\
  									\
!       if (word_ != 0)							\
! 	for (; bit_num_ < SBITMAP_ELT_BITS; bit_num_++)			\
  	  {								\
! 	    SBITMAP_ELT_TYPE _mask = (SBITMAP_ELT_TYPE)1 << bit_num_;	\
  									\
! 	    if ((word_ & _mask) != 0)					\
  	      {								\
! 		word_ &= ~ _mask;					\
! 		(N) = word_num_ * SBITMAP_ELT_BITS + bit_num_;		\
  		CODE;							\
! 		if (word_ == 0)						\
  		  break;						\
  	      }								\