Changeset 3093 for trunk/lib

Timestamp:

Apr 29, 2013, 6:56:17 AM (6 years ago)

Author:

cameron

Message:

Use template type for string base; remove Bytedata dependency

Location:

trunk/lib

Files:

• pabloSupport.hpp (modified) (2 diffs)
• transpose.hpp (modified) (1 diff)

trunk/lib/pabloSupport.hpp

@@ -118 +118 @@
 }
 
-IDISA_ALWAYS_INLINE BitBlock pablo_blk_match(uint8_t bytedata[], const char match_str[], BitBlock v, int len) {
+template <typename T> IDISA_ALWAYS_INLINE BitBlock pablo_blk_match(T bytedata[], const T match_str[], BitBlock v, int len) {
         union {BitBlock bitblock; ScanWord elems[sizeof(BitBlock)/sizeof(ScanWord)];} u;
         u.bitblock = v;
@@ -129 +129 @@
                         t = s;
                         s = s & (s - 1); // clear rightmost bit
-                        if (memcmp((void *) &bytedata[pos], (void *) match_str, len)) {
+                        if (memcmp((void *) &bytedata[pos], (void *) match_str, len * sizeof(T))) {
                                 // Strings do not match; filter the result.
                                 bit = s ^ t;

trunk/lib/transpose.hpp

@@ -40 +40 @@
 struct Transpose {
   Transpose() {}
-  void do_block(Bytedata & bytedata, Basis_bits & basis_bits) {
+  void do_block(char * bytedata, Basis_bits & basis_bits) {
     s2p_do_block((BytePack *) bytedata, basis_bits);
   }
-  void do_final_block(Bytedata & bytedata, Basis_bits & basis_bits, BitBlock EOF_mask) {
+  void do_final_block(char * bytedata, Basis_bits & basis_bits, BitBlock EOF_mask) {
     s2p_do_final_block((BytePack *) bytedata, basis_bits, EOF_mask);
   }