ncruces
diff --git a/‎.github/workflows/test.yml
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/test.yml
Lines changed: 2 additions & 2 deletions
diff --git a/‎sqlite3/libc/libc.wasm
4 Bytes b/‎sqlite3/libc/libc.wasm
4 Bytes
diff --git a/‎sqlite3/libc/libc.wat
Lines changed: 107 additions & 100 deletions b/‎sqlite3/libc/libc.wat
Lines changed: 107 additions & 100 deletions
@@ -112,7 +112,7 @@ jobs:
             version: '10.1'
             flags: '-test.v -test.short'
           - name: openbsd
-            version: '7.6'
+            version: '7.7'
             flags: '-test.v -test.short'
     runs-on: ubuntu-latest
     needs: test
@@ -128,7 +128,7 @@ jobs:
       run: .github/workflows/build-test.sh
 
     - name: Test
-      uses: cross-platform-actions/action@v0.27.0
+      uses: cross-platform-actions/action@v0.28.0
       with:
         operating_system: ${{ matrix.os.name }}
         architecture: ${{ matrix.os.arch }}
 
@@ -3115,10 +3115,24 @@
     (local.get $11)
    )
   )
-  (block $block6
+  (local.set $1
+   (select
+    (i32.const -1)
+    (i32.sub
+     (local.get $1)
+     (local.get $3)
+    )
+    (i32.eq
+     (local.get $1)
+     (i32.const -1)
+    )
+   )
+  )
+  (block $block5
    (block $block1
-    (br_if $block1
-     (i32.lt_u
+    (if
+     (i32.gt_u
+      (local.get $0)
       (local.tee $14
        (i32.sub
         (i32.sub
@@ -3131,7 +3145,12 @@
         (i32.const 16)
        )
       )
-      (local.get $0)
+     )
+     (then
+      (local.set $5
+       (local.get $1)
+      )
+      (br $block1)
      )
     )
     (local.set $18
@@ -3185,22 +3204,21 @@
         )
        )
       )
-      (block $block3
-       (br_if $block3
-        (i32.ne
+      (local.set $5
+       (i32.const -1)
+      )
+      (br_if $block1
+       (i32.and
+        (i32.eqz
+         (i8x16.all_true
+          (local.get $17)
+         )
+        )
+        (i32.eq
          (local.get $1)
          (i32.const -1)
         )
        )
-       (br_if $block3
-        (i8x16.all_true
-         (local.get $17)
-        )
-       )
-       (local.set $1
-        (i32.const -1)
-       )
-       (br $block1)
       )
       (br_if $block2
        (i32.eqz
@@ -3215,13 +3233,10 @@
        (if
         (i32.lt_u
          (local.get $1)
-         (i32.add
-          (local.tee $5
-           (i32.ctz
-            (local.get $7)
-           )
+         (local.tee $5
+          (i32.ctz
+           (local.get $7)
           )
-          (local.get $3)
          )
         )
         (then
@@ -3230,9 +3245,9 @@
          )
         )
        )
-       (br_if $block6
+       (br_if $block5
         (i32.eqz
-         (block $block5 (result i32)
+         (block $block4 (result i32)
           (local.set $9
            (i32.add
             (local.tee $8
@@ -3250,7 +3265,7 @@
           (local.set $12
            (i32.const 0)
           )
-          (block $block4
+          (block $block3
            (if
             (i32.ge_u
              (local.tee $10
@@ -3263,7 +3278,7 @@
               (i32.const 1)
              )
              (loop $label1
-              (br_if $block4
+              (br_if $block3
                (v128.any_true
                 (v128.xor
                  (v128.load align=1
@@ -3307,19 +3322,19 @@
                )
               )
              )
-             (br $block5
+             (br $block4
               (i32.const 0)
              )
             )
            )
-           (br_if $block4
+           (br_if $block3
             (i32.eqz
              (local.get $10)
             )
            )
            (loop $label2
             (drop
-             (br_if $block5
+             (br_if $block4
               (i32.const 1)
               (i32.ne
                (i32.load8_u
@@ -3370,7 +3385,7 @@
        )
       )
      )
-     (block $block7
+     (block $block6
       (if
        (i32.eq
         (local.get $1)
@@ -3385,24 +3400,20 @@
           (local.set $7
            (i32.const 16)
           )
-          (local.set $1
+          (local.set $5
            (i32.const -1)
           )
-          (br $block7)
+          (br $block6)
          )
         )
         (return
          (i32.const 0)
         )
        )
       )
-      (local.set $8
-       (i32.const 0)
-      )
       (br_if $block6
-       (i32.lt_u
-        (local.get $1)
-        (local.tee $1
+       (i32.le_u
+        (local.tee $5
          (i32.sub
           (local.get $1)
           (local.tee $7
@@ -3431,14 +3442,15 @@
           )
          )
         )
-       )
-      )
-      (br_if $block6
-       (i32.lt_u
         (local.get $1)
-        (local.get $3)
        )
       )
+      (return
+       (i32.const 0)
+      )
+     )
+     (local.set $1
+      (local.get $5)
      )
      (br_if $label4
       (i32.le_u
@@ -3453,90 +3465,85 @@
      )
     )
    )
-   (local.set $11
-    (i32.sub
-     (local.get $1)
-     (local.get $3)
-    )
-   )
-   (local.set $4
+   (local.set $1
     (i32.const 0)
    )
-   (local.set $1
+   (local.set $4
     (i32.ne
-     (local.get $1)
+     (local.get $5)
      (i32.const -1)
     )
    )
-   (loop $label6
+   (loop $label5
     (local.set $6
      (i32.const 0)
     )
-    (block $block8
-     (loop $label5
-      (local.set $8
-       (i32.const 0)
-      )
-      (br_if $block6
-       (i32.eqz
-        (i32.or
-         (local.get $1)
-         (local.tee $5
-          (i32.load8_u
-           (i32.add
-            (local.get $0)
-            (local.get $6)
-           )
+    (loop $label6
+     (local.set $8
+      (i32.const 0)
+     )
+     (br_if $block5
+      (i32.eqz
+       (i32.or
+        (local.get $4)
+        (local.tee $11
+         (i32.load8_u
+          (i32.add
+           (local.get $0)
+           (local.get $6)
           )
          )
         )
        )
       )
-      (br_if $block8
-       (i32.ne
-        (i32.load8_u
-         (i32.add
-          (local.get $2)
-          (local.get $6)
-         )
+     )
+     (if
+      (i32.ne
+       (local.get $11)
+       (i32.load8_u
+        (i32.add
+         (local.get $2)
+         (local.get $6)
         )
-        (local.get $5)
        )
       )
-      (br_if $label5
-       (i32.ne
-        (local.get $3)
-        (local.tee $6
-         (i32.add
-          (local.get $6)
-          (i32.const 1)
+      (then
+       (local.set $0
+        (i32.add
+         (local.get $0)
+         (i32.const 1)
+        )
+       )
+       (br_if $label5
+        (i32.le_u
+         (local.tee $1
+          (i32.add
+           (local.get $1)
+           (i32.const 1)
+          )
          )
+         (local.get $5)
         )
        )
+       (br $block5)
       )
      )
-     (return
-      (local.get $0)
-     )
-    )
-    (local.set $0
-     (i32.add
-      (local.get $0)
-      (i32.const 1)
-     )
-    )
-    (br_if $label6
-     (i32.le_u
-      (local.tee $4
-       (i32.add
-        (local.get $4)
-        (i32.const 1)
+     (br_if $label6
+      (i32.ne
+       (local.get $3)
+       (local.tee $6
+        (i32.add
+         (local.get $6)
+         (i32.const 1)
+        )
        )
       )
-      (local.get $11)
      )
     )
    )
+   (local.set $8
+    (local.get $0)
+   )
   )
   (local.get $8)
  )
Original file line number	Diff line number	Diff line change
`@@ -3115,10 +3115,24 @@`
`3115`	`3115`	`(local.get $11)`
`3116`	`3116`	`)`
`3117`	`3117`	`)`
`3118`		`- (block $block6`
	`3118`	`+ (local.set $1`
	`3119`	`+ (select`
	`3120`	`+ (i32.const -1)`
	`3121`	`+ (i32.sub`
	`3122`	`+ (local.get $1)`
	`3123`	`+ (local.get $3)`
	`3124`	`+ )`
	`3125`	`+ (i32.eq`
	`3126`	`+ (local.get $1)`
	`3127`	`+ (i32.const -1)`
	`3128`	`+ )`
	`3129`	`+ )`
	`3130`	`+ )`
	`3131`	`+ (block $block5`
`3119`	`3132`	`(block $block1`
`3120`		`- (br_if $block1`
`3121`		`- (i32.lt_u`
	`3133`	`+ (if`
	`3134`	`+ (i32.gt_u`
	`3135`	`+ (local.get $0)`
`3122`	`3136`	`(local.tee $14`
`3123`	`3137`	`(i32.sub`
`3124`	`3138`	`(i32.sub`
`@@ -3131,7 +3145,12 @@`
`3131`	`3145`	`(i32.const 16)`
`3132`	`3146`	`)`
`3133`	`3147`	`)`
`3134`		`- (local.get $0)`
	`3148`	`+ )`
	`3149`	`+ (then`
	`3150`	`+ (local.set $5`
	`3151`	`+ (local.get $1)`
	`3152`	`+ )`
	`3153`	`+ (br $block1)`
`3135`	`3154`	`)`
`3136`	`3155`	`)`
`3137`	`3156`	`(local.set $18`
`@@ -3185,22 +3204,21 @@`
`3185`	`3204`	`)`
`3186`	`3205`	`)`
`3187`	`3206`	`)`
`3188`		`- (block $block3`
`3189`		`- (br_if $block3`
`3190`		`- (i32.ne`
	`3207`	`+ (local.set $5`
	`3208`	`+ (i32.const -1)`
	`3209`	`+ )`
	`3210`	`+ (br_if $block1`
	`3211`	`+ (i32.and`
	`3212`	`+ (i32.eqz`
	`3213`	`+ (i8x16.all_true`
	`3214`	`+ (local.get $17)`
	`3215`	`+ )`
	`3216`	`+ )`
	`3217`	`+ (i32.eq`
`3191`	`3218`	`(local.get $1)`
`3192`	`3219`	`(i32.const -1)`
`3193`	`3220`	`)`
`3194`	`3221`	`)`
`3195`		`- (br_if $block3`
`3196`		`- (i8x16.all_true`
`3197`		`- (local.get $17)`
`3198`		`- )`
`3199`		`- )`
`3200`		`- (local.set $1`
`3201`		`- (i32.const -1)`
`3202`		`- )`
`3203`		`- (br $block1)`
`3204`	`3222`	`)`
`3205`	`3223`	`(br_if $block2`
`3206`	`3224`	`(i32.eqz`
`@@ -3215,13 +3233,10 @@`
`3215`	`3233`	`(if`
`3216`	`3234`	`(i32.lt_u`
`3217`	`3235`	`(local.get $1)`
`3218`		`- (i32.add`
`3219`		`- (local.tee $5`
`3220`		`- (i32.ctz`
`3221`		`- (local.get $7)`
`3222`		`- )`
	`3236`	`+ (local.tee $5`
	`3237`	`+ (i32.ctz`
	`3238`	`+ (local.get $7)`
`3223`	`3239`	`)`
`3224`		`- (local.get $3)`
`3225`	`3240`	`)`
`3226`	`3241`	`)`
`3227`	`3242`	`(then`
`@@ -3230,9 +3245,9 @@`
`3230`	`3245`	`)`
`3231`	`3246`	`)`
`3232`	`3247`	`)`
`3233`		`- (br_if $block6`
	`3248`	`+ (br_if $block5`
`3234`	`3249`	`(i32.eqz`
`3235`		`- (block $block5 (result i32)`
	`3250`	`+ (block $block4 (result i32)`
`3236`	`3251`	`(local.set $9`
`3237`	`3252`	`(i32.add`
`3238`	`3253`	`(local.tee $8`
`@@ -3250,7 +3265,7 @@`
`3250`	`3265`	`(local.set $12`
`3251`	`3266`	`(i32.const 0)`
`3252`	`3267`	`)`
`3253`		`- (block $block4`
	`3268`	`+ (block $block3`
`3254`	`3269`	`(if`
`3255`	`3270`	`(i32.ge_u`
`3256`	`3271`	`(local.tee $10`
`@@ -3263,7 +3278,7 @@`
`3263`	`3278`	`(i32.const 1)`
`3264`	`3279`	`)`
`3265`	`3280`	`(loop $label1`
`3266`		`- (br_if $block4`
	`3281`	`+ (br_if $block3`
`3267`	`3282`	`(v128.any_true`
`3268`	`3283`	`(v128.xor`
`3269`	`3284`	`(v128.load align=1`
`@@ -3307,19 +3322,19 @@`
`3307`	`3322`	`)`
`3308`	`3323`	`)`
`3309`	`3324`	`)`
`3310`		`- (br $block5`
	`3325`	`+ (br $block4`
`3311`	`3326`	`(i32.const 0)`
`3312`	`3327`	`)`
`3313`	`3328`	`)`
`3314`	`3329`	`)`
`3315`		`- (br_if $block4`
	`3330`	`+ (br_if $block3`
`3316`	`3331`	`(i32.eqz`
`3317`	`3332`	`(local.get $10)`
`3318`	`3333`	`)`
`3319`	`3334`	`)`
`3320`	`3335`	`(loop $label2`
`3321`	`3336`	`(drop`
`3322`		`- (br_if $block5`
	`3337`	`+ (br_if $block4`
`3323`	`3338`	`(i32.const 1)`
`3324`	`3339`	`(i32.ne`
`3325`	`3340`	`(i32.load8_u`
`@@ -3370,7 +3385,7 @@`
`3370`	`3385`	`)`
`3371`	`3386`	`)`
`3372`	`3387`	`)`
`3373`		`- (block $block7`
	`3388`	`+ (block $block6`
`3374`	`3389`	`(if`
`3375`	`3390`	`(i32.eq`
`3376`	`3391`	`(local.get $1)`
`@@ -3385,24 +3400,20 @@`
`3385`	`3400`	`(local.set $7`
`3386`	`3401`	`(i32.const 16)`
`3387`	`3402`	`)`
`3388`		`- (local.set $1`
	`3403`	`+ (local.set $5`
`3389`	`3404`	`(i32.const -1)`
`3390`	`3405`	`)`
`3391`		`- (br $block7)`
	`3406`	`+ (br $block6)`
`3392`	`3407`	`)`
`3393`	`3408`	`)`
`3394`	`3409`	`(return`
`3395`	`3410`	`(i32.const 0)`
`3396`	`3411`	`)`
`3397`	`3412`	`)`
`3398`	`3413`	`)`
`3399`		`- (local.set $8`
`3400`		`- (i32.const 0)`
`3401`		`- )`
`3402`	`3414`	`(br_if $block6`
`3403`		`- (i32.lt_u`
`3404`		`- (local.get $1)`
`3405`		`- (local.tee $1`
	`3415`	`+ (i32.le_u`
	`3416`	`+ (local.tee $5`
`3406`	`3417`	`(i32.sub`
`3407`	`3418`	`(local.get $1)`
`3408`	`3419`	`(local.tee $7`
`@@ -3431,14 +3442,15 @@`
`3431`	`3442`	`)`
`3432`	`3443`	`)`
`3433`	`3444`	`)`
`3434`		`- )`
`3435`		`- )`
`3436`		`- (br_if $block6`
`3437`		`- (i32.lt_u`
`3438`	`3445`	`(local.get $1)`
`3439`		`- (local.get $3)`
`3440`	`3446`	`)`
`3441`	`3447`	`)`
	`3448`	`+ (return`
	`3449`	`+ (i32.const 0)`
	`3450`	`+ )`
	`3451`	`+ )`
	`3452`	`+ (local.set $1`
	`3453`	`+ (local.get $5)`
`3442`	`3454`	`)`
`3443`	`3455`	`(br_if $label4`
`3444`	`3456`	`(i32.le_u`
`@@ -3453,90 +3465,85 @@`
`3453`	`3465`	`)`
`3454`	`3466`	`)`
`3455`	`3467`	`)`
`3456`		`- (local.set $11`
`3457`		`- (i32.sub`
`3458`		`- (local.get $1)`
`3459`		`- (local.get $3)`
`3460`		`- )`
`3461`		`- )`
`3462`		`- (local.set $4`
	`3468`	`+ (local.set $1`
`3463`	`3469`	`(i32.const 0)`
`3464`	`3470`	`)`
`3465`		`- (local.set $1`
	`3471`	`+ (local.set $4`
`3466`	`3472`	`(i32.ne`
`3467`		`- (local.get $1)`
	`3473`	`+ (local.get $5)`
`3468`	`3474`	`(i32.const -1)`
`3469`	`3475`	`)`
`3470`	`3476`	`)`
`3471`		`- (loop $label6`
	`3477`	`+ (loop $label5`
`3472`	`3478`	`(local.set $6`
`3473`	`3479`	`(i32.const 0)`
`3474`	`3480`	`)`
`3475`		`- (block $block8`
`3476`		`- (loop $label5`
`3477`		`- (local.set $8`
`3478`		`- (i32.const 0)`
`3479`		`- )`
`3480`		`- (br_if $block6`
`3481`		`- (i32.eqz`
`3482`		`- (i32.or`
`3483`		`- (local.get $1)`
`3484`		`- (local.tee $5`
`3485`		`- (i32.load8_u`
`3486`		`- (i32.add`
`3487`		`- (local.get $0)`
`3488`		`- (local.get $6)`
`3489`		`- )`
	`3481`	`+ (loop $label6`
	`3482`	`+ (local.set $8`
	`3483`	`+ (i32.const 0)`
	`3484`	`+ )`
	`3485`	`+ (br_if $block5`
	`3486`	`+ (i32.eqz`
	`3487`	`+ (i32.or`
	`3488`	`+ (local.get $4)`
	`3489`	`+ (local.tee $11`
	`3490`	`+ (i32.load8_u`
	`3491`	`+ (i32.add`
	`3492`	`+ (local.get $0)`
	`3493`	`+ (local.get $6)`
`3490`	`3494`	`)`
`3491`	`3495`	`)`
`3492`	`3496`	`)`
`3493`	`3497`	`)`
`3494`	`3498`	`)`
`3495`		`- (br_if $block8`
`3496`		`- (i32.ne`
`3497`		`- (i32.load8_u`
`3498`		`- (i32.add`
`3499`		`- (local.get $2)`
`3500`		`- (local.get $6)`
`3501`		`- )`
	`3499`	`+ )`
	`3500`	`+ (if`
	`3501`	`+ (i32.ne`
	`3502`	`+ (local.get $11)`
	`3503`	`+ (i32.load8_u`
	`3504`	`+ (i32.add`
	`3505`	`+ (local.get $2)`
	`3506`	`+ (local.get $6)`
`3502`	`3507`	`)`
`3503`		`- (local.get $5)`
`3504`	`3508`	`)`
`3505`	`3509`	`)`
`3506`		`- (br_if $label5`
`3507`		`- (i32.ne`
`3508`		`- (local.get $3)`
`3509`		`- (local.tee $6`
`3510`		`- (i32.add`
`3511`		`- (local.get $6)`
`3512`		`- (i32.const 1)`
	`3510`	`+ (then`
	`3511`	`+ (local.set $0`
	`3512`	`+ (i32.add`
	`3513`	`+ (local.get $0)`
	`3514`	`+ (i32.const 1)`
	`3515`	`+ )`
	`3516`	`+ )`
	`3517`	`+ (br_if $label5`
	`3518`	`+ (i32.le_u`
	`3519`	`+ (local.tee $1`
	`3520`	`+ (i32.add`
	`3521`	`+ (local.get $1)`
	`3522`	`+ (i32.const 1)`
	`3523`	`+ )`
`3513`	`3524`	`)`
	`3525`	`+ (local.get $5)`
`3514`	`3526`	`)`
`3515`	`3527`	`)`
	`3528`	`+ (br $block5)`
`3516`	`3529`	`)`
`3517`	`3530`	`)`
`3518`		`- (return`
`3519`		`- (local.get $0)`
`3520`		`- )`
`3521`		`- )`
`3522`		`- (local.set $0`
`3523`		`- (i32.add`
`3524`		`- (local.get $0)`
`3525`		`- (i32.const 1)`
`3526`		`- )`
`3527`		`- )`
`3528`		`- (br_if $label6`
`3529`		`- (i32.le_u`
`3530`		`- (local.tee $4`
`3531`		`- (i32.add`
`3532`		`- (local.get $4)`
`3533`		`- (i32.const 1)`
	`3531`	`+ (br_if $label6`
	`3532`	`+ (i32.ne`
	`3533`	`+ (local.get $3)`
	`3534`	`+ (local.tee $6`
	`3535`	`+ (i32.add`
	`3536`	`+ (local.get $6)`
	`3537`	`+ (i32.const 1)`
	`3538`	`+ )`
`3534`	`3539`	`)`
`3535`	`3540`	`)`
`3536`		`- (local.get $11)`
`3537`	`3541`	`)`
`3538`	`3542`	`)`
`3539`	`3543`	`)`
	`3544`	`+ (local.set $8`
	`3545`	`+ (local.get $0)`
	`3546`	`+ )`
`3540`	`3547`	`)`
`3541`	`3548`	`(local.get $8)`
`3542`	`3549`	`)`