Changeset 2869

Timestamp:

2001-11-28T15:14:56+13:00 (22 years ago)

Author:

paynter

Message:

Eliminate looping, use more memset and better bitmasks instead.

File:

• trunk/gsdl/src/phind/generate/check.h (modified) (7 diffs)

trunk/gsdl/src/phind/generate/check.h

@@ -15 +15 @@
 
 #include "suffix.h"
+#include <inttypes.h>
 
 // The suffixCheck array
-typedef unsigned char check;
+typedef uint8_t check;
 check *suffixCheck;
 
@@ -24 +25 @@
 
 // Some useful bitmask constants 
-const check ALLBITS = 255;
-const check LEFTMOSTBIT = (ALLBITS << 7);
-const check LEFTMOSTBITS[] = {0, 
-                  (ALLBITS << 7), (ALLBITS << 6), (ALLBITS << 5), (ALLBITS << 4),
-                  (ALLBITS << 3), (ALLBITS << 2), (ALLBITS << 1),  ALLBITS};
-//const check LEFTMOSTBIT = 128;
-//const check LEFTMOSTBITS[] = {0, 128, 192, 224, 240, 248, 252, 254, 255}; 
+const check ALLBITS        = 255;
+const check LEFTMOSTBIT    = static_cast<check>(ALLBITS << 7);
+const check LEFTMOSTBITS[] = {static_cast<check>(ALLBITS << 8), 
+                  static_cast<check>(ALLBITS << 7), 
+                  static_cast<check>(ALLBITS << 6), 
+                  static_cast<check>(ALLBITS << 5), 
+                  static_cast<check>(ALLBITS << 4),
+                  static_cast<check>(ALLBITS << 3), 
+                  static_cast<check>(ALLBITS << 2), 
+                  static_cast<check>(ALLBITS << 1),  
+                  static_cast<check>(ALLBITS << 0)};
 
 
@@ -54 +59 @@
 
 // Get the value of a particular bit in suffixCheck
-inline int getSuffixCheck(cellindex suff) 
+inline int getSuffixCheck(cellindex position) 
 {
-  cellindex cell = suff >> 3;
-  check remainder = suff & 0x07; // the last 3 bits
+  cellindex cell = position >> 3;
+  check remainder = position & 0x07; // the last 3 bits
   if (suffixCheck[cell] & (LEFTMOSTBIT >> remainder)) {
     return 1;
@@ -69 +74 @@
 {
   cellindex cell = suff >> 3;
-  check remainder = suff & 0x07; // the last 3 bits
+  check remainder = suff & 0x07u; // the last 3 bits
   suffixCheck[cell] |= (LEFTMOSTBIT >> remainder);
 }  
-
-
-// Set the value of a range of bits in suffixCheck to 1
-void setSuffixCheck(cellindex first, cellindex last) 
-{
-  for (cellcount i = first; i <= last; ++i)
-    setSuffixCheck(i);
-}
 
 
@@ -92 +89 @@
 
 
-inline void setSuffixCheck_new(cellindex first, cellindex last) 
+inline void setSuffixCheck(cellindex first, cellindex last) 
 {
   // If only one bit is set, use simpler function
-  // We should be able to remove this case.
   if (first == last) {
     setSuffixCheck(first);
@@ -107 +103 @@
   // If all the values are in the same cell, set them
   if (first_cell == last_cell) {
-    setCellBits(first_cell, (first & 0x07), (last & 0x07));
+    setCellBits(first_cell, (first & 0x07u), (last & 0x07u));
     return;
   }
 
   // Set the bits in the first and last cells
-  setCellBits(first_cell, (first & 0x07), 7);
-  setCellBits(last_cell, 0, (last & 0x07));
+  setCellBits(first_cell, (first & 0x07u), 7);
+  setCellBits(last_cell, 0, (last & 0x07u));
 
   // Set the bits in the intermediate cells
@@ -129 +125 @@
     cout << "cell " << i << "  \t";
     cout << "(" << (i * 8) << "-" << (i * 8 + 7) << ")    \t";
-    for (cellindex j = 0; j < 8; ++j) {
+    for (cellindex j = 0; j < 8; ++j)
       cout << getSuffixCheck(i * 8 + j);
-      // cout << " (" << (i * 8 + j) << ") "; 
-    }
     cout << " (" << (unsigned int) suffixCheck[i] << ")\n";
   }
 }
 
+// To test, insert at start of main:
 
-//  To test, put this at the start of main
+//    allocateSuffixCheck(300);
+//    clearSuffixCheck();
 
-//  allocateSuffixCheck(300);
-//  clearSuffixCheck();
-//  setSuffixCheck(20);
-//  setSuffixCheck(35,50);
-//  setSuffixCheck(68,150);
-//  setSuffixCheck(170,174);
-//  setSuffixCheck(220,230);
-//  setSuffixCheck(247);
-//  setSuffixCheck(256);
-//  printSuffixCheck();
-//  exit(0);
+//    setSuffixCheck(20);
+//    setSuffixCheck(35,50);
+//    setSuffixCheck(68,150);
+//    setSuffixCheck(170,174);
+//    setSuffixCheck(220,230);
+//    setSuffixCheck(247);
+//    setSuffixCheck(256);
 
+//    printSuffixCheck();
+//    exit(0);
+