more optimizations

arpruss · arpruss · commit 5c11cf69b704 · 2022-02-18T11:19:00.000-06:00
diff --git a/compress/compress5.py b/compress/compress5.py
@@ -5,7 +5,7 @@ def mask(n):
     m = 1
     while m <= n:
         m *= 2
-    return m-1
+    return m
 
 def toBitmap(length, decider):
     def encodeByte(offset, decider):
@@ -109,7 +109,7 @@ def encodeList(ww):
 with open("../sizes.h", "w") as sizes:
     sizes.write("#define NUM_WORDS %u\n" % len(allwords))
     sizes.write("#define NUM_ANSWERS %u\n" % len(answers))
-    sizes.write("#define NUM_ANSWERS_MASK %u" % mask(len(answers)))
+    sizes.write("#define NUM_ANSWERS_ROUNDED_UP_POW2 %u" % mask(len(answers)))
    
 #print(sum(map(len, encoded)))
 #print(max(map(len, encoded)))
diff --git a/decode.c b/decode.c
@@ -63,10 +63,9 @@ uint8_t filterWord(char* s) {
         w = (w << 5) | (s[i]-'A');
     
     i = s[0]-'A';
-    uint16_t n = words[i+1].wordNumber - words[i].wordNumber;
     currentWord = 0;
     blobPtr = wordBlob + words[i].blobOffset;
-    for (uint16_t j=0; j<n; j++) {
+    for (uint16_t j=words[i+1].wordNumber - words[i].wordNumber; j; j--) {
         updateWord();
         if (currentWord >= w) {
             return currentWord == w;
