X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d08290769c798befc27e9f8bbc3f1a3da12d1f08..b55b68608ff93cede27113663c6c0b0c82539ebc:/lib/abitset.c diff --git a/lib/abitset.c b/lib/abitset.c index 99c1c2f1..a4a2fa8e 100644 --- a/lib/abitset.c +++ b/lib/abitset.c @@ -1,10 +1,13 @@ /* Array bitsets. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + + Copyright (C) 2002-2003, 2006, 2009-2011 Free Software Foundation, + Inc. + Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz). - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -13,13 +16,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ + along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "abitset.h" #include @@ -31,16 +30,17 @@ #define ABITSET_N_WORDS(N) (((N) + BITSET_WORD_BITS - 1) / BITSET_WORD_BITS) #define ABITSET_WORDS(X) ((X)->a.words) -#define ABITSET_N_BITS(X) ((X)->a.n_bits) -/* Return size in bits of bitset SRC. */ static bitset_bindex -abitset_size (bitset src) +abitset_resize (bitset src, bitset_bindex size) { - return ABITSET_N_BITS (src); -} + /* These bitsets have a fixed size. */ + if (BITSET_SIZE_ (src) != size) + abort (); + return size; +} /* Find list of up to NUM bits set in BSET starting from and including *NEXT and store in array LIST. Return with actual number of bits @@ -60,7 +60,7 @@ abitset_small_list (bitset src, bitset_bindex *list, if (!word) return 0; - size = ABITSET_N_BITS (src); + size = BITSET_SIZE_ (src); bitno = *next; if (bitno >= size) return 0; @@ -105,8 +105,9 @@ abitset_small_list (bitset src, bitset_bindex *list, static void abitset_set (bitset dst ATTRIBUTE_UNUSED, bitset_bindex bitno ATTRIBUTE_UNUSED) { - /* This should never occur for abitsets since we should always - hit the cache. */ + /* This should never occur for abitsets since we should always hit + the cache. It is likely someone is trying to access outside the + bounds of the bitset. */ abort (); } @@ -116,9 +117,9 @@ static void abitset_reset (bitset dst ATTRIBUTE_UNUSED, bitset_bindex bitno ATTRIBUTE_UNUSED) { - /* This should never occur for abitsets since we should always - hit the cache. */ - abort (); + /* This should never occur for abitsets since we should always hit + the cache. It is likely someone is trying to access outside the + bounds of the bitset. Since the bit is zero anyway, let it pass. */ } @@ -129,7 +130,6 @@ abitset_test (bitset src ATTRIBUTE_UNUSED, { /* This should never occur for abitsets since we should always hit the cache. */ - abort (); return false; } @@ -149,7 +149,7 @@ abitset_list_reverse (bitset src, bitset_bindex *list, unsigned int bitcnt; bitset_bindex bitoff; bitset_word *srcp = ABITSET_WORDS (src); - bitset_bindex n_bits = ABITSET_N_BITS (src); + bitset_bindex n_bits = BITSET_SIZE_ (src); rbitno = *next; @@ -228,7 +228,7 @@ abitset_list (bitset src, bitset_bindex *list, } else { - if (bitno >= ABITSET_N_BITS (src)) + if (bitno >= BITSET_SIZE_ (src)) return 0; windex = bitno / BITSET_WORD_BITS; @@ -304,7 +304,7 @@ abitset_unused_clear (bitset dst) { unsigned int last_bit; - last_bit = ABITSET_N_BITS (dst) % BITSET_WORD_BITS; + last_bit = BITSET_SIZE_ (dst) % BITSET_WORD_BITS; if (last_bit) ABITSET_WORDS (dst)[dst->b.csize - 1] &= ((bitset_word) 1 << last_bit) - 1; @@ -711,7 +711,8 @@ struct bitset_vtable abitset_small_vtable = { abitset_reset, bitset_toggle_, abitset_test, - abitset_size, + abitset_resize, + bitset_size_, bitset_count_, abitset_empty_p, abitset_ones, @@ -748,7 +749,8 @@ struct bitset_vtable abitset_vtable = { abitset_reset, bitset_toggle_, abitset_test, - abitset_size, + abitset_resize, + bitset_size_, bitset_count_, abitset_empty_p, abitset_ones, @@ -809,7 +811,7 @@ abitset_init (bitset bset, bitset_bindex n_bits) bitset_windex size; size = ABITSET_N_WORDS (n_bits); - ABITSET_N_BITS (bset) = n_bits; + BITSET_NBITS_ (bset) = n_bits; /* Use optimized routines if bitset fits within a single word. There is probably little merit if using caching since