- Implement popcount in ASM if available

[SXSI/XMLTree.git] / bpcore.c

diff --git a/bpcore.c b/bpcore.c
index df39e2c..5c8ec4a 100644 (file)
--- a/bpcore.c
+++ b/bpcore.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "bp.h"
+#include "utils.h"
+
 
 #ifndef min
 #define min(x,y) ((x)<(y)?(x):(y))
@@ -130,7 +132,7 @@ int search_SB_r(bp *b, int i, int rel)
        }
       }
       r = min(j,ETW);
-      rel -= 2*popCount[w]-r;
+      rel -= 2*popcount(w)-r;
       x <<= r;
       i += r;
       j -= r;
@@ -329,7 +331,7 @@ int degree_SB(bp *b, int i, int t, int rel, int *ans, int ith)
       }
 
       r = min(j,ETW);
-      d += 2*popCount[w]-r;
+      d += 2*popcount(w)-r;
       x <<= r;
       i += r;
       j -= r;
@@ -615,7 +617,7 @@ int search_SB_l(bp *b, int i, int rel)
        }
       }
       r = min(j,ETW);
-      rel += 2*popCount[w]-r;
+      rel += 2*popcount(w)-r;
       x >>= r;
       i -= r;
       j -= r;
@@ -764,7 +766,7 @@ int rmq_SB(bp *b, int s, int t, int opt, int *dm)
       }
 
       r = min(j,ETW);
-      d += 2*popCount[w]-r;
+      d += 2*popcount(w)-r;
       x <<= r;
       i += r;
       j -= r;