X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/88ab880d90020666c39614a01e388eee5c6505e8..231ed89af1eaff303a22f72aeb1c2c0cf5e25c21:/lib/vbitset.c diff --git a/lib/vbitset.c b/lib/vbitset.c index 609aca31..bec2aec4 100644 --- a/lib/vbitset.c +++ b/lib/vbitset.c @@ -1,5 +1,5 @@ /* Variable array bitsets. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 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 @@ -13,44 +13,41 @@ 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, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include "vbitset.h" + #include #include /* This file implements variable size bitsets stored as a variable length array of words. Any unused bits in the last word must be - zero. + zero. Note that binary or ternary operations assume that each bitset operand has the same size. */ -static void vbitset_unused_clear PARAMS ((bitset)); +static void vbitset_unused_clear (bitset); -static void vbitset_set PARAMS ((bitset, bitset_bindex)); -static void vbitset_reset PARAMS ((bitset, bitset_bindex)); -static bool vbitset_test PARAMS ((bitset, bitset_bindex)); -static bitset_bindex vbitset_list PARAMS ((bitset, bitset_bindex *, - bitset_bindex, - bitset_bindex *)); -static bitset_bindex vbitset_list_reverse PARAMS ((bitset, bitset_bindex *, - bitset_bindex, - bitset_bindex *)); +static void vbitset_set (bitset, bitset_bindex); +static void vbitset_reset (bitset, bitset_bindex); +static bool vbitset_test (bitset, bitset_bindex); +static bitset_bindex vbitset_list (bitset, bitset_bindex *, + bitset_bindex, bitset_bindex *); +static bitset_bindex vbitset_list_reverse (bitset, bitset_bindex *, + bitset_bindex, bitset_bindex *); #define VBITSET_N_WORDS(N) (((N) + BITSET_WORD_BITS - 1) / BITSET_WORD_BITS) #define VBITSET_WORDS(X) ((X)->b.cdata) #define VBITSET_SIZE(X) ((X)->b.csize) #define VBITSET_ASIZE(X) ((X)->v.size) - +#undef min +#undef max #define min(a, b) ((a) > (b) ? (b) : (a)) #define max(a, b) ((a) > (b) ? (a) : (b)) @@ -70,7 +67,7 @@ vbitset_resize (bitset src, bitset_bindex n_bits) { bitset_windex size; - /* The bitset needs to grow. If we already have enough memory + /* The bitset needs to grow. If we already have enough memory allocated, then just zero what we need. */ if (newsize > VBITSET_ASIZE (src)) { @@ -83,13 +80,13 @@ vbitset_resize (bitset src, bitset_bindex n_bits) size = newsize; else size = newsize + newsize / 4; - + VBITSET_WORDS (src) = realloc (VBITSET_WORDS (src), size * sizeof (bitset_word)); VBITSET_ASIZE (src) = size; } - memset (VBITSET_WORDS (src) + oldsize, 0, + memset (VBITSET_WORDS (src) + oldsize, 0, (newsize - oldsize) * sizeof (bitset_word)); VBITSET_SIZE (src) = newsize; } @@ -428,7 +425,7 @@ vbitset_not (bitset dst, bitset src) sizeof (bitset_word) * (dsize - ssize)); } - + static bool vbitset_equal_p (bitset dst, bitset src) { @@ -467,7 +464,7 @@ vbitset_subset_p (bitset dst, bitset src) bitset_word *dstp = VBITSET_WORDS (dst); bitset_windex ssize = VBITSET_SIZE (src); bitset_windex dsize = VBITSET_SIZE (dst); - + for (i = 0; i < min (ssize, dsize); i++, dstp++, srcp++) if (*dstp != (*srcp | *dstp)) return 0; @@ -522,7 +519,7 @@ vbitset_and (bitset dst, bitset src1, bitset src2) for (i = 0; i < min (ssize1, ssize2); i++) *dstp++ = *src1p++ & *src2p++; - + memset (dstp, 0, sizeof (bitset_word) * (dsize - min (ssize1, ssize2))); } @@ -551,14 +548,14 @@ vbitset_and_cmp (bitset dst, bitset src1, bitset src2) for (i = 0; i < min (ssize1, ssize2); i++, dstp++) { bitset_word tmp = *src1p++ & *src2p++; - + if (*dstp != tmp) { changed = 1; *dstp = tmp; } } - + if (ssize2 > ssize1) { src1p = src2p; @@ -602,7 +599,7 @@ vbitset_andn (bitset dst, bitset src1, bitset src2) for (i = 0; i < min (ssize1, ssize2); i++) *dstp++ = *src1p++ & ~(*src2p++); - + if (ssize2 > ssize1) { for (; i < ssize2; i++) @@ -644,14 +641,14 @@ vbitset_andn_cmp (bitset dst, bitset src1, bitset src2) for (i = 0; i < min (ssize1, ssize2); i++, dstp++) { bitset_word tmp = *src1p++ & ~(*src2p++); - + if (*dstp != tmp) { changed = 1; *dstp = tmp; } } - + if (ssize2 > ssize1) { for (; i < ssize2; i++, dstp++) @@ -670,7 +667,7 @@ vbitset_andn_cmp (bitset dst, bitset src1, bitset src2) for (; i < ssize1; i++, dstp++) { bitset_word tmp = *src1p++; - + if (*dstp != tmp) { changed = 1; @@ -707,7 +704,7 @@ vbitset_or (bitset dst, bitset src1, bitset src2) for (i = 0; i < min (ssize1, ssize2); i++) *dstp++ = *src1p++ | *src2p++; - + if (ssize2 > ssize1) { src1p = src2p; @@ -745,14 +742,14 @@ vbitset_or_cmp (bitset dst, bitset src1, bitset src2) for (i = 0; i < min (ssize1, ssize2); i++, dstp++) { bitset_word tmp = *src1p++ | *src2p++; - + if (*dstp != tmp) { changed = 1; *dstp = tmp; } } - + if (ssize2 > ssize1) { src1p = src2p; @@ -762,7 +759,7 @@ vbitset_or_cmp (bitset dst, bitset src1, bitset src2) for (; i < ssize1; i++, dstp++) { bitset_word tmp = *src1p++; - + if (*dstp != tmp) { changed = 1; @@ -798,7 +795,7 @@ vbitset_xor (bitset dst, bitset src1, bitset src2) for (i = 0; i < min (ssize1, ssize2); i++) *dstp++ = *src1p++ ^ *src2p++; - + if (ssize2 > ssize1) { src1p = src2p; @@ -836,14 +833,14 @@ vbitset_xor_cmp (bitset dst, bitset src1, bitset src2) for (i = 0; i < min (ssize1, ssize2); i++, dstp++) { bitset_word tmp = *src1p++ ^ *src2p++; - + if (*dstp != tmp) { changed = 1; *dstp = tmp; } } - + if (ssize2 > ssize1) { src1p = src2p; @@ -853,7 +850,7 @@ vbitset_xor_cmp (bitset dst, bitset src1, bitset src2) for (; i < ssize1; i++, dstp++) { bitset_word tmp = *src1p++; - + if (*dstp != tmp) { changed = 1; @@ -879,7 +876,7 @@ vbitset_and_or (bitset dst, bitset src1, bitset src2, bitset src3) bitset_word *src3p; bitset_word *dstp; bitset_windex size; - + if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2) || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3)) { @@ -910,7 +907,7 @@ vbitset_and_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3) bitset_word *src3p; bitset_word *dstp; bitset_windex size; - + if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2) || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3)) return bitset_and_or_cmp_ (dst, src1, src2, src3); @@ -922,11 +919,11 @@ vbitset_and_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3) src3p = VBITSET_WORDS (src3); dstp = VBITSET_WORDS (dst); size = VBITSET_SIZE (dst); - + for (i = 0; i < size; i++, dstp++) { bitset_word tmp = (*src1p++ & *src2p++) | *src3p++; - + if (*dstp != tmp) { changed = 1; @@ -946,7 +943,7 @@ vbitset_andn_or (bitset dst, bitset src1, bitset src2, bitset src3) bitset_word *src3p; bitset_word *dstp; bitset_windex size; - + if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2) || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3)) { @@ -977,7 +974,7 @@ vbitset_andn_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3) bitset_word *src3p; bitset_word *dstp; bitset_windex size; - + if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2) || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3)) return bitset_andn_or_cmp_ (dst, src1, src2, src3); @@ -989,11 +986,11 @@ vbitset_andn_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3) src3p = VBITSET_WORDS (src3); dstp = VBITSET_WORDS (dst); size = VBITSET_SIZE (dst); - + for (i = 0; i < size; i++, dstp++) { bitset_word tmp = (*src1p++ & ~(*src2p++)) | *src3p++; - + if (*dstp != tmp) { changed = 1; @@ -1013,7 +1010,7 @@ vbitset_or_and (bitset dst, bitset src1, bitset src2, bitset src3) bitset_word *src3p; bitset_word *dstp; bitset_windex size; - + if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2) || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3)) { @@ -1028,7 +1025,7 @@ vbitset_or_and (bitset dst, bitset src1, bitset src2, bitset src3) src3p = VBITSET_WORDS (src3); dstp = VBITSET_WORDS (dst); size = VBITSET_SIZE (dst); - + for (i = 0; i < size; i++) *dstp++ = (*src1p++ | *src2p++) & *src3p++; } @@ -1044,7 +1041,7 @@ vbitset_or_and_cmp (bitset dst, bitset src1, bitset src2, bitset src3) bitset_word *src3p; bitset_word *dstp; bitset_windex size; - + if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2) || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3)) return bitset_or_and_cmp_ (dst, src1, src2, src3); @@ -1056,11 +1053,11 @@ vbitset_or_and_cmp (bitset dst, bitset src1, bitset src2, bitset src3) src3p = VBITSET_WORDS (src3); dstp = VBITSET_WORDS (dst); size = VBITSET_SIZE (dst); - + for (i = 0; i < size; i++, dstp++) { bitset_word tmp = (*src1p++ | *src2p++) & *src3p++; - + if (*dstp != tmp) { changed = 1; @@ -1071,7 +1068,7 @@ vbitset_or_and_cmp (bitset dst, bitset src1, bitset src2, bitset src3) } -void +static void vbitset_copy (bitset dst, bitset src) { if (BITSET_COMPATIBLE_ (dst, src))