refactor select to spare one load

mnater · Dec 6, 2023 · cecf7df · cecf7df
1 parent 3af1137
commit cecf7df
Show file tree

Hide file tree

Showing 220 changed files with 518 additions and 666 deletions.
diff --git a/lang/af/af.wasm b/lang/af/af.wasm
diff --git a/lang/af/src/hyphenEngine.ts b/lang/af/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/as/as.wasm b/lang/as/as.wasm
diff --git a/lang/as/src/hyphenEngine.ts b/lang/as/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/be/be.wasm b/lang/be/be.wasm
diff --git a/lang/be/src/hyphenEngine.ts b/lang/be/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/bg/bg.wasm b/lang/bg/bg.wasm
diff --git a/lang/bg/src/hyphenEngine.ts b/lang/bg/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/bn/bn.wasm b/lang/bn/bn.wasm
diff --git a/lang/bn/src/hyphenEngine.ts b/lang/bn/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/ca/ca.wasm b/lang/ca/ca.wasm
diff --git a/lang/ca/src/hyphenEngine.ts b/lang/ca/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/cs/cs.wasm b/lang/cs/cs.wasm
diff --git a/lang/cs/src/hyphenEngine.ts b/lang/cs/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/cy/cy.wasm b/lang/cy/cy.wasm
diff --git a/lang/cy/src/hyphenEngine.ts b/lang/cy/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/da/da.wasm b/lang/da/da.wasm
diff --git a/lang/da/src/hyphenEngine.ts b/lang/da/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/de-x-syllable/de-x-syllable.wasm b/lang/de-x-syllable/de-x-syllable.wasm
diff --git a/lang/de-x-syllable/src/hyphenEngine.ts b/lang/de-x-syllable/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/de/de.wasm b/lang/de/de.wasm
diff --git a/lang/de/src/hyphenEngine.ts b/lang/de/src/hyphenEngine.ts
@@ -276,27 +276,25 @@ function select(ith: i32, startByte: i32, endByte: i32): i32 {
     let posInByte: i32 = 0;
     let pos: i32 = 0;
     let firstPos: i32 = 0;
-
-    do {
+  
+    while (run < 2) {
         ith += run;
-        do {
+        while (count < ith) {
             if (bytePos > endByte) {
                 return 0;
             }
             dWord = load<i64>(bytePos, 0, 8);
             dWord0Count = 64 - <i32>popcnt<i64>(dWord);
             count += dWord0Count;
             bytePos += 8;
-        } while (count < ith);
-        count -= dWord0Count;
-        bytePos -= 8;
-        posInByte = get0PosInDWord(dWord, ith - count);
-        pos = ((bytePos - startByte) << 3) + posInByte;
+        }
+        posInByte = get0PosInDWord(dWord, ith - (count - dWord0Count));
+        pos = ((bytePos - 8 - startByte) << 3) + posInByte;
         if (run === 0) {
             firstPos = pos;
         }
         run += 1;
-    } while (run < 2);
+    }
     return (firstPos << 8) + (pos - firstPos - 1);
 }
 

diff --git a/lang/el-monoton/el-monoton.wasm b/lang/el-monoton/el-monoton.wasm