Bench the three-stack lalr1.cc.

[bison.git] / lib / vbitset.c

diff --git a/lib/vbitset.c b/lib/vbitset.c
index c055fbfe13b3ea85b9cefcded8221ebf12899da3..802fdae4866bc0624f75a726527303b054c3e3e4 100644 (file)
--- a/lib/vbitset.c
+++ b/lib/vbitset.c
@@ -1,10 +1,10 @@
 /* Variable array bitsets.
 /* Variable array bitsets.

-   Copyright (C) 2002, 2003, 2004 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).
 
    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
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -13,21 +13,18 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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 <http://www.gnu.org/licenses/>.  */

 
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 #include "vbitset.h"
 
 #include "vbitset.h"

+

 #include <stdlib.h>
 #include <string.h>
 
 /* This file implements variable size bitsets stored as a variable
    length array of words.  Any unused bits in the last word must be
 #include <stdlib.h>
 #include <string.h>
 
 /* 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.
 
    Note that binary or ternary operations assume that each bitset operand
    has the same size.


@@ -38,7 +35,7 @@ static void vbitset_unused_clear (bitset);
 static void vbitset_set (bitset, bitset_bindex);
 static void vbitset_reset (bitset, bitset_bindex);
 static bool vbitset_test (bitset, 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 *, 
+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 *);
                                   bitset_bindex, bitset_bindex *);
 static bitset_bindex vbitset_list_reverse (bitset, bitset_bindex *,
                                           bitset_bindex, bitset_bindex *);


@@ -48,7 +45,8 @@ static bitset_bindex vbitset_list_reverse (bitset, bitset_bindex *,
 #define VBITSET_SIZE(X) ((X)->b.csize)
 #define VBITSET_ASIZE(X) ((X)->v.size)
 
 #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))
 
 #define min(a, b) ((a) > (b) ? (b) : (a))
 #define max(a, b) ((a) > (b) ? (a) : (b))
 


@@ -68,7 +66,7 @@ vbitset_resize (bitset src, bitset_bindex n_bits)
     {
       bitset_windex size;
 
     {
       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))
        {
         allocated, then just zero what we need.  */
       if (newsize > VBITSET_ASIZE (src))
        {


@@ -81,13 +79,13 @@ vbitset_resize (bitset src, bitset_bindex n_bits)
            size = newsize;
          else
            size = newsize + newsize / 4;
            size = newsize;
          else
            size = newsize + newsize / 4;

-         
+

          VBITSET_WORDS (src)
            = realloc (VBITSET_WORDS (src), size * sizeof (bitset_word));
          VBITSET_ASIZE (src) = size;
        }
 
          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;
     }
              (newsize - oldsize) * sizeof (bitset_word));
       VBITSET_SIZE (src) = newsize;
     }


@@ -426,7 +424,7 @@ vbitset_not (bitset dst, bitset src)
          sizeof (bitset_word) * (dsize - ssize));
 }
 
          sizeof (bitset_word) * (dsize - ssize));
 }
 

- 
+

 static bool
 vbitset_equal_p (bitset dst, bitset src)
 {
 static bool
 vbitset_equal_p (bitset dst, bitset src)
 {


@@ -465,7 +463,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);
   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;
   for (i = 0; i < min (ssize, dsize); i++, dstp++, srcp++)
       if (*dstp != (*srcp | *dstp))
          return 0;


@@ -520,7 +518,7 @@ vbitset_and (bitset dst, bitset src1, bitset src2)
 
   for (i = 0; i < min (ssize1, ssize2); i++)
       *dstp++ = *src1p++ & *src2p++;
 
   for (i = 0; i < min (ssize1, ssize2); i++)
       *dstp++ = *src1p++ & *src2p++;

-  
+

   memset (dstp, 0, sizeof (bitset_word) * (dsize - min (ssize1, ssize2)));
 }
 
   memset (dstp, 0, sizeof (bitset_word) * (dsize - min (ssize1, ssize2)));
 }
 


@@ -549,14 +547,14 @@ vbitset_and_cmp (bitset dst, bitset src1, bitset src2)
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
       bitset_word tmp = *src1p++ & *src2p++;
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
       bitset_word tmp = *src1p++ & *src2p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
          *dstp = tmp;
        }
     }
       if (*dstp != tmp)
        {
          changed = 1;
          *dstp = tmp;
        }
     }

-  
+

   if (ssize2 > ssize1)
     {
       src1p = src2p;
   if (ssize2 > ssize1)
     {
       src1p = src2p;


@@ -600,7 +598,7 @@ vbitset_andn (bitset dst, bitset src1, bitset src2)
 
   for (i = 0; i < min (ssize1, ssize2); i++)
       *dstp++ = *src1p++ & ~(*src2p++);
 
   for (i = 0; i < min (ssize1, ssize2); i++)
       *dstp++ = *src1p++ & ~(*src2p++);

-  
+

   if (ssize2 > ssize1)
     {
       for (; i < ssize2; i++)
   if (ssize2 > ssize1)
     {
       for (; i < ssize2; i++)


@@ -642,14 +640,14 @@ vbitset_andn_cmp (bitset dst, bitset src1, bitset src2)
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
       bitset_word tmp = *src1p++ & ~(*src2p++);
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
       bitset_word tmp = *src1p++ & ~(*src2p++);

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
          *dstp = tmp;
        }
     }
       if (*dstp != tmp)
        {
          changed = 1;
          *dstp = tmp;
        }
     }

-  
+

   if (ssize2 > ssize1)
     {
       for (; i < ssize2; i++, dstp++)
   if (ssize2 > ssize1)
     {
       for (; i < ssize2; i++, dstp++)


@@ -668,7 +666,7 @@ vbitset_andn_cmp (bitset dst, bitset src1, bitset src2)
       for (; i < ssize1; i++, dstp++)
        {
          bitset_word tmp = *src1p++;
       for (; i < ssize1; i++, dstp++)
        {
          bitset_word tmp = *src1p++;

-         
+

          if (*dstp != tmp)
            {
              changed = 1;
          if (*dstp != tmp)
            {
              changed = 1;


@@ -705,7 +703,7 @@ vbitset_or (bitset dst, bitset src1, bitset src2)
 
   for (i = 0; i < min (ssize1, ssize2); i++)
       *dstp++ = *src1p++ | *src2p++;
 
   for (i = 0; i < min (ssize1, ssize2); i++)
       *dstp++ = *src1p++ | *src2p++;

-  
+

   if (ssize2 > ssize1)
     {
       src1p = src2p;
   if (ssize2 > ssize1)
     {
       src1p = src2p;


@@ -743,14 +741,14 @@ vbitset_or_cmp (bitset dst, bitset src1, bitset src2)
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
       bitset_word tmp = *src1p++ | *src2p++;
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
       bitset_word tmp = *src1p++ | *src2p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
          *dstp = tmp;
        }
     }
       if (*dstp != tmp)
        {
          changed = 1;
          *dstp = tmp;
        }
     }

-  
+

   if (ssize2 > ssize1)
     {
       src1p = src2p;
   if (ssize2 > ssize1)
     {
       src1p = src2p;


@@ -760,7 +758,7 @@ vbitset_or_cmp (bitset dst, bitset src1, bitset src2)
   for (; i < ssize1; i++, dstp++)
     {
       bitset_word tmp = *src1p++;
   for (; i < ssize1; i++, dstp++)
     {
       bitset_word tmp = *src1p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -796,7 +794,7 @@ vbitset_xor (bitset dst, bitset src1, bitset src2)
 
   for (i = 0; i < min (ssize1, ssize2); i++)
       *dstp++ = *src1p++ ^ *src2p++;
 
   for (i = 0; i < min (ssize1, ssize2); i++)
       *dstp++ = *src1p++ ^ *src2p++;

-  
+

   if (ssize2 > ssize1)
     {
       src1p = src2p;
   if (ssize2 > ssize1)
     {
       src1p = src2p;


@@ -834,14 +832,14 @@ vbitset_xor_cmp (bitset dst, bitset src1, bitset src2)
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
       bitset_word tmp = *src1p++ ^ *src2p++;
   for (i = 0; i < min (ssize1, ssize2); i++, dstp++)
     {
       bitset_word tmp = *src1p++ ^ *src2p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
          *dstp = tmp;
        }
     }
       if (*dstp != tmp)
        {
          changed = 1;
          *dstp = tmp;
        }
     }

-  
+

   if (ssize2 > ssize1)
     {
       src1p = src2p;
   if (ssize2 > ssize1)
     {
       src1p = src2p;


@@ -851,7 +849,7 @@ vbitset_xor_cmp (bitset dst, bitset src1, bitset src2)
   for (; i < ssize1; i++, dstp++)
     {
       bitset_word tmp = *src1p++;
   for (; i < ssize1; i++, dstp++)
     {
       bitset_word tmp = *src1p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -877,7 +875,7 @@ vbitset_and_or (bitset dst, bitset src1, bitset src2, bitset src3)
   bitset_word *src3p;
   bitset_word *dstp;
   bitset_windex size;
   bitset_word *src3p;
   bitset_word *dstp;
   bitset_windex size;

-  
+

   if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2)
       || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3))
     {
   if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2)
       || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3))
     {


@@ -908,7 +906,7 @@ vbitset_and_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3)
   bitset_word *src3p;
   bitset_word *dstp;
   bitset_windex size;
   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);
   if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2)
       || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3))
     return bitset_and_or_cmp_ (dst, src1, src2, src3);


@@ -920,11 +918,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);
   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++;
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = (*src1p++ & *src2p++) | *src3p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -944,7 +942,7 @@ vbitset_andn_or (bitset dst, bitset src1, bitset src2, bitset src3)
   bitset_word *src3p;
   bitset_word *dstp;
   bitset_windex size;
   bitset_word *src3p;
   bitset_word *dstp;
   bitset_windex size;

-  
+

   if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2)
       || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3))
     {
   if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2)
       || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3))
     {


@@ -975,7 +973,7 @@ vbitset_andn_or_cmp (bitset dst, bitset src1, bitset src2, bitset src3)
   bitset_word *src3p;
   bitset_word *dstp;
   bitset_windex size;
   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);
   if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2)
       || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3))
     return bitset_andn_or_cmp_ (dst, src1, src2, src3);


@@ -987,11 +985,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);
   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++;
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = (*src1p++ & ~(*src2p++)) | *src3p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;


@@ -1011,7 +1009,7 @@ vbitset_or_and (bitset dst, bitset src1, bitset src2, bitset src3)
   bitset_word *src3p;
   bitset_word *dstp;
   bitset_windex size;
   bitset_word *src3p;
   bitset_word *dstp;
   bitset_windex size;

-  
+

   if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2)
       || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3))
     {
   if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2)
       || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3))
     {


@@ -1026,7 +1024,7 @@ vbitset_or_and (bitset dst, bitset src1, bitset src2, bitset src3)
   src3p = VBITSET_WORDS (src3);
   dstp = VBITSET_WORDS (dst);
   size = VBITSET_SIZE (dst);
   src3p = VBITSET_WORDS (src3);
   dstp = VBITSET_WORDS (dst);
   size = VBITSET_SIZE (dst);

-  
+

   for (i = 0; i < size; i++)
       *dstp++ = (*src1p++ | *src2p++) & *src3p++;
 }
   for (i = 0; i < size; i++)
       *dstp++ = (*src1p++ | *src2p++) & *src3p++;
 }


@@ -1042,7 +1040,7 @@ vbitset_or_and_cmp (bitset dst, bitset src1, bitset src2, bitset src3)
   bitset_word *src3p;
   bitset_word *dstp;
   bitset_windex size;
   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);
   if (BITSET_NBITS_ (src1) != BITSET_NBITS_ (src2)
       || BITSET_NBITS_ (src1) != BITSET_NBITS_ (src3))
     return bitset_or_and_cmp_ (dst, src1, src2, src3);


@@ -1054,11 +1052,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);
   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++;
   for (i = 0; i < size; i++, dstp++)
     {
       bitset_word tmp = (*src1p++ | *src2p++) & *src3p++;

-      
+

       if (*dstp != tmp)
        {
          changed = 1;
       if (*dstp != tmp)
        {
          changed = 1;