Use SIMD libc.

embed/bcw2/build.sh

@@ -13,11 +13,10 @@ mkdir -p build/ext/
 cp "$ROOT"/sqlite3/*.[ch] build/
 cp "$ROOT"/sqlite3/*.patch build/
 
-# https://sqlite.org/src/info/c09656c62155a6e8
-curl -# https://sqlite.org/src/tarball/sqlite.tar.gz?r=c09656c6 | tar xz
+# https://sqlite.org/src/info/4196efe83c2fa850
+curl -# https://sqlite.org/src/tarball/sqlite.tar.gz?r=4196efe8 | tar xz
 
 cd sqlite
-cat ../repro.patch | patch -p0 --no-backup-if-mismatch
 if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
 	MSYS_NO_PATHCONV=1 nmake /f makefile.msc sqlite3.c "OPTS=-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT -DSQLITE_ENABLE_ORDERED_SET_AGGREGATES"
 else

embed/bcw2/go.mod

@@ -4,11 +4,11 @@ go 1.23.0
 
 toolchain go1.24.0
 
-require github.com/ncruces/go-sqlite3 v0.24.0
+require github.com/ncruces/go-sqlite3 v0.25.0
 
 require (
 	github.com/ncruces/julianday v1.0.0 // indirect
 	github.com/ncruces/sort v0.1.5 // indirect
 	github.com/tetratelabs/wazero v1.9.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
 )

embed/bcw2/go.sum

@@ -1,12 +1,12 @@
-github.com/ncruces/go-sqlite3 v0.24.0 h1:Z4jfmzu2NCd4SmyFwLT2OmF3EnTZbqwATvdiuNHNhLA=
-github.com/ncruces/go-sqlite3 v0.24.0/go.mod h1:/Vs8ACZHjJ1SA6E9RZUn3EyB1OP3nDQ4z/ar+0fplTQ=
+github.com/ncruces/go-sqlite3 v0.25.0 h1:trugKUs98Zwy9KwRr/EUxZHL92LYt7UqcKqAfpGpK+I=
+github.com/ncruces/go-sqlite3 v0.25.0/go.mod h1:n6Z7036yFilJx04yV0mi5JWaF66rUmXn1It9Ux8dx68=
 github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
 github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
 github.com/ncruces/sort v0.1.5 h1:fiFWXXAqKI8QckPf/6hu/bGFwcEPrirIOFaJqWujs4k=
 github.com/ncruces/sort v0.1.5/go.mod h1:obJToO4rYr6VWP0Uw5FYymgYGt3Br4RXcs/JdKaXAPk=
 github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
 github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=

embed/bcw2/repro.patch

@@ -1,23 +0,0 @@
-# https://sqlite.org/src/vpatch?from=67809715977a5bad&to=3f57584710d61174
---- tool/mkpragmatab.tcl
-+++ tool/mkpragmatab.tcl
-@@ -526,14 +526,17 @@
-   puts $fd [format {#define PragFlg_%-10s 0x%02x /* %s */} \
-              $f $fv $flagMeaning($f)]
-   set fv [expr {$fv*2}]
- }
- 
--# Sort the column lists so that longer column lists occur first
-+# Sort the column lists so that longer column lists occur first.
-+# In the event of a tie, sort column lists lexicographically.
- #
- proc colscmp {a b} {
--  return [expr {[llength $b] - [llength $a]}]
-+  set rc [expr {[llength $b] - [llength $a]}]
-+  if {$rc} {return $rc}
-+  return [string compare $a $b]
- }
- set cols_list [lsort -command colscmp $cols_list]
- 
- # Generate the array of column names used by pragmas that act like
- # queries.

embed/exports.txt

@@ -66,6 +66,7 @@ sqlite3_errmsg
 sqlite3_error_offset
 sqlite3_errstr
 sqlite3_exec
+sqlite3_exec_go
 sqlite3_expanded_sql
 sqlite3_file_control
 sqlite3_filename_database

go.mod

@@ -8,16 +8,16 @@ require (
 	github.com/ncruces/julianday v1.0.0
 	github.com/ncruces/sort v0.1.5
 	github.com/tetratelabs/wazero v1.9.0
-	golang.org/x/crypto v0.36.0
-	golang.org/x/sys v0.31.0
+	golang.org/x/crypto v0.37.0
+	golang.org/x/sys v0.32.0
 )
 
 require (
 	github.com/dchest/siphash v1.2.3 // ext/bloom
 	github.com/google/uuid v1.6.0 // ext/uuid
 	github.com/psanford/httpreadat v0.1.0 // example
-	golang.org/x/sync v0.12.0 // test
-	golang.org/x/text v0.23.0 // ext/unicode
+	golang.org/x/sync v0.13.0 // test
+	golang.org/x/text v0.24.0 // ext/unicode
 	lukechampine.com/adiantum v1.1.1 // vfs/adiantum
 )
 

go.sum

@@ -10,13 +10,13 @@ github.com/psanford/httpreadat v0.1.0 h1:VleW1HS2zO7/4c7c7zNl33fO6oYACSagjJIyMIw
 github.com/psanford/httpreadat v0.1.0/go.mod h1:Zg7P+TlBm3bYbyHTKv/EdtSJZn3qwbPwpfZ/I9GKCRE=
 github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
 github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
+golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
+golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 lukechampine.com/adiantum v1.1.1 h1:4fp6gTxWCqpEbLy40ExiYDDED3oUNWx5cTqBCtPdZqA=
 lukechampine.com/adiantum v1.1.1/go.mod h1:LrAYVnTYLnUtE/yMp5bQr0HstAf060YUF8nM0B6+rUw=

gormlite/go.mod

@@ -5,7 +5,7 @@ go 1.23.0
 toolchain go1.24.0
 
 require (
-	github.com/ncruces/go-sqlite3 v0.24.0
+	github.com/ncruces/go-sqlite3 v0.25.0
 	gorm.io/gorm v1.25.12
 )
 
@@ -14,6 +14,6 @@ require (
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/ncruces/julianday v1.0.0 // indirect
 	github.com/tetratelabs/wazero v1.9.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
 )

gormlite/go.sum

@@ -2,15 +2,15 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/ncruces/go-sqlite3 v0.24.0 h1:Z4jfmzu2NCd4SmyFwLT2OmF3EnTZbqwATvdiuNHNhLA=
-github.com/ncruces/go-sqlite3 v0.24.0/go.mod h1:/Vs8ACZHjJ1SA6E9RZUn3EyB1OP3nDQ4z/ar+0fplTQ=
+github.com/ncruces/go-sqlite3 v0.25.0 h1:trugKUs98Zwy9KwRr/EUxZHL92LYt7UqcKqAfpGpK+I=
+github.com/ncruces/go-sqlite3 v0.25.0/go.mod h1:n6Z7036yFilJx04yV0mi5JWaF66rUmXn1It9Ux8dx68=
 github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
 github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
 github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I=
 github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
 gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=

sqlite3/libc/build.sh

@@ -19,15 +19,17 @@ trap 'rm -f libc.tmp' EXIT
 	-mnontrapping-fptoint -msign-ext \
 	-fno-stack-protector -fno-stack-clash-protection \
 	-Wl,--initial-memory=16777216 \
-	-Wl,--export=memset \
-	-Wl,--export=memcpy \
 	-Wl,--export=memchr \
 	-Wl,--export=memcmp \
-	-Wl,--export=strlen \
+	-Wl,--export=memcpy \
+	-Wl,--export=memset \
 	-Wl,--export=strchr \
+	-Wl,--export=strchrnul \
 	-Wl,--export=strcmp \
+	-Wl,--export=strcspn \
+	-Wl,--export=strlen \
 	-Wl,--export=strncmp \
-	-Wl,--export=strchrnul
+	-Wl,--export=strspn
 
 "$BINARYEN/wasm-ctor-eval" -g -c _initialize libc.wasm -o libc.tmp
 "$BINARYEN/wasm-opt" -g --strip --strip-producers -c -O3 \

sqlite3/main.c

@@ -1,3 +1,4 @@
+#include "strings.c"
 // Amalgamation
 #include "sqlite3.c"
 // Extensions
@@ -10,12 +11,11 @@
 #include "ext/spellfix.c"
 #include "ext/uint.c"
 // Bindings
-#include "bind.c"
-#include "column.c"
 #include "func.c"
 #include "hooks.c"
 #include "pointer.c"
-#include "result.c"
+#include "stmt.c"
+#include "text.c"
 #include "time.c"
 #include "vfs.c"
 #include "vtab.c"

sqlite3/result.c

@@ -1,14 +0,0 @@
-#include <math.h>
-#include <stdlib.h>
-
-#include "sqlite3.h"
-
-void sqlite3_result_text_go(sqlite3_context *ctx, const char *zData,
-                            sqlite3_uint64 nData) {
-  sqlite3_result_text64(ctx, zData, nData, &sqlite3_free, SQLITE_UTF8);
-}
-
-void sqlite3_result_blob_go(sqlite3_context *ctx, const void *zData,
-                            sqlite3_uint64 nData) {
-  sqlite3_result_blob64(ctx, zData, nData, &sqlite3_free);
-}

sqlite3/sqlite_opt.h

@@ -16,14 +16,12 @@
 // #define SQLITE_OMIT_DECLTYPE
 // #define SQLITE_OMIT_PROGRESS_CALLBACK
 
-// TODO add this:
-// #define SQLITE_ENABLE_API_ARMOR
-
 // Other Options
 
 #define SQLITE_ALLOW_URI_AUTHORITY
 #define SQLITE_TRUSTED_SCHEMA 0
 #define SQLITE_DEFAULT_FOREIGN_KEYS 1
+#define SQLITE_ENABLE_API_ARMOR
 #define SQLITE_ENABLE_ATOMIC_WRITE
 #define SQLITE_ENABLE_BATCH_ATOMIC_WRITE
 #define SQLITE_ENABLE_COLUMN_METADATA

sqlite3/stmt.c

@@ -2,6 +2,11 @@
 
 #include "sqlite3.h"
 
+int sqlite3_exec_go(sqlite3_stmt *stmt) {
+  while (sqlite3_step(stmt) == SQLITE_ROW);
+  return sqlite3_reset(stmt);
+}
+
 union sqlite3_data {
   sqlite3_int64 i;
   double d;
@@ -16,7 +21,7 @@ int sqlite3_columns_go(sqlite3_stmt *stmt, int nCol, char *aType,
   if (nCol != sqlite3_column_count(stmt)) {
     return SQLITE_MISUSE;
   }
-  int rc = SQLITE_OK;
+  bool check = false;
   for (int i = 0; i < nCol; ++i) {
     const void *ptr = NULL;
     switch (aType[i] = sqlite3_column_type(stmt, i)) {
@@ -36,16 +41,14 @@ int sqlite3_columns_go(sqlite3_stmt *stmt, int nCol, char *aType,
         ptr = sqlite3_column_blob(stmt, i);
         break;
     }
-    if (ptr == NULL && rc == SQLITE_OK) {
-      rc = sqlite3_errcode(sqlite3_db_handle(stmt));
-      if (rc == SQLITE_ROW || rc == SQLITE_DONE) {
-        rc = SQLITE_OK;
-      }
-    }
     aData[i].ptr = ptr;
     aData[i].len = sqlite3_column_bytes(stmt, i);
+    if (ptr == NULL) check = true;
   }
-  return rc;
+  if (check && SQLITE_NOMEM == sqlite3_errcode(sqlite3_db_handle(stmt))) {
+    return SQLITE_NOMEM;
+  }
+  return SQLITE_OK;
 }
 
 static_assert(offsetof(union sqlite3_data, i) == 0, "Unexpected offset");

sqlite3/strings.c

@@ -1,5 +1,3 @@
-#include <__macro_PAGESIZE.h>
-#include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <wasm_simd128.h>
@@ -27,7 +25,7 @@ int memcmp(const void *v1, const void *v2, size_t n) {
   const v128_t *w2 = v2;
   for (; n >= sizeof(v128_t); n -= sizeof(v128_t)) {
     if (wasm_v128_any_true(wasm_v128_load(w1) ^ wasm_v128_load(w2))) {
-      break;  // *w1 != *w2
+      break;
     }
     w1++;
     w2++;
@@ -50,7 +48,7 @@ void *memchr(const void *v, int c, size_t n) {
   const v128_t *w = (void *)v;
   for (; n >= sizeof(v128_t); n -= sizeof(v128_t)) {
     if (wasm_v128_any_true(wasm_i8x16_eq(wasm_v128_load(w), wc))) {
-      break;  // *w has a c
+      break;
     }
     w++;
   }
@@ -64,51 +62,41 @@ void *memchr(const void *v, int c, size_t n) {
 }
 
 size_t strlen(const char *s) {
-  const v128_t *const limit =
-      (v128_t *)(__builtin_wasm_memory_size(0) * PAGESIZE) - 1;
+  uintptr_t align = (uintptr_t)s % sizeof(v128_t);
+  const v128_t *w = (void *)(s - align);
 
-  const v128_t *w = (void *)s;
-  while (w <= limit) {
-    if (!wasm_i8x16_all_true(wasm_v128_load(w))) {
-      break;  // *w has a NUL
+  while (true) {
+    int mask =
+        wasm_i8x16_bitmask(wasm_i8x16_eq(*w, (v128_t){})) >> align << align;
+    if (mask) {
+      return (char *)w - s + __builtin_ctz(mask);
     }
+    align = 0;
     w++;
   }
-
-  const char *ss = (void *)w;
-  while (true) {
-    if (*ss == 0) break;
-    ss++;
-  }
-  return ss - s;
 }
 
 int strcmp(const char *s1, const char *s2) {
-  const v128_t *const limit =
-      (v128_t *)(__builtin_wasm_memory_size(0) * PAGESIZE) - 1;
-
   const v128_t *w1 = (void *)s1;
   const v128_t *w2 = (void *)s2;
-  while (w1 <= limit && w2 <= limit) {
-    if (wasm_v128_any_true(wasm_v128_load(w1) ^ wasm_v128_load(w2))) {
-      break;  // *w1 != *w2
+  if (((uintptr_t)s1 | (uintptr_t)s2) % sizeof(v128_t) == 0) {
+    while (!wasm_v128_any_true(*w1 ^ *w2)) {
+      if (!wasm_i8x16_all_true(*w1)) {
+        return 0;
+      }
+      w1++;
+      w2++;
     }
-    if (!wasm_i8x16_all_true(wasm_v128_load(w1))) {
-      return 0;  // *w1 == *w2 and have a NUL
-    }
-    w1++;
-    w2++;
   }
 
   const uint8_t *u1 = (void *)w1;
   const uint8_t *u2 = (void *)w2;
   while (true) {
     if (*u1 != *u2) return *u1 - *u2;
-    if (*u1 == 0) break;
+    if (*u1 == 0) return 0;
     u1++;
     u2++;
   }
-  return 0;
 }
 
 int strncmp(const char *s1, const char *s2, size_t n) {
@@ -116,10 +104,10 @@ int strncmp(const char *s1, const char *s2, size_t n) {
   const v128_t *w2 = (void *)s2;
   for (; n >= sizeof(v128_t); n -= sizeof(v128_t)) {
     if (wasm_v128_any_true(wasm_v128_load(w1) ^ wasm_v128_load(w2))) {
-      break;  // *w1 != *w2
+      break;
     }
     if (!wasm_i8x16_all_true(wasm_v128_load(w1))) {
-      return 0;  // *w1 == *w2 and have a NUL
+      return 0;
     }
     w1++;
     w2++;
@@ -139,27 +127,24 @@ int strncmp(const char *s1, const char *s2, size_t n) {
 char *strchrnul(const char *s, int c) {
   c = (char)c;
 
-  const v128_t *const limit =
-      (v128_t *)(__builtin_wasm_memory_size(0) * PAGESIZE) - 1;
+  if (__builtin_constant_p(c) && c == 0) {
+    return (char *)s + strlen(s);
+  }
 
+  uintptr_t align = (uintptr_t)s % sizeof(v128_t);
+  const v128_t *w = (void *)(s - align);
   const v128_t wc = wasm_i8x16_splat(c);
-  const v128_t *w = (void *)s;
-  while (w <= limit) {
-    if (!wasm_i8x16_all_true(wasm_v128_load(w))) {
-      break;  // *w has a NUL
-    }
-    if (wasm_v128_any_true(wasm_i8x16_eq(wasm_v128_load(w), wc))) {
-      break;  // *w has a c
+
+  while (true) {
+    int mask = wasm_i8x16_bitmask(wasm_i8x16_eq(*w, (v128_t){}) |
+                                  wasm_i8x16_eq(*w, wc)) >>
+               align << align;
+    if (mask) {
+      return (char *)w + __builtin_ctz(mask);
     }
+    align = 0;
     w++;
   }
-
-  s = (void *)w;
-  while (true) {
-    if (*s == 0 || *s == c) break;
-    s++;
-  }
-  return (void *)s;
 }
 
 char *strchr(const char *s, int c) {
@@ -168,3 +153,29 @@ char *strchr(const char *s, int c) {
 }
 
 #endif
+
+#define BITOP(a, b, op)                          \
+  ((a)[(b) / (8 * sizeof(size_t))] op((size_t)1) \
+   << ((b) % (8 * sizeof(size_t))))
+
+size_t strspn(const char *s, const char *c) {
+  const char *const a = s;
+  size_t byteset[32 / sizeof(size_t)] = {0};
+
+  for (; *c && BITOP(byteset, *(uint8_t *)c, |=); c++);
+  for (; *s && BITOP(byteset, *(uint8_t *)s, &); s++);
+  return s - a;
+}
+
+size_t strcspn(const char *s, const char *c) {
+  if (!c[0] || !c[1]) return strchrnul(s, *c) - s;
+
+  const char *const a = s;
+  size_t byteset[32 / sizeof(size_t)] = {0};
+
+  for (; *c && BITOP(byteset, *(uint8_t *)c, |=); c++);
+  for (; *s && !BITOP(byteset, *(uint8_t *)s, &); s++);
+  return s - a;
+}
+
+#undef BITOP

sqlite3/text.c

@@ -10,4 +10,14 @@ int sqlite3_bind_text_go(sqlite3_stmt *stmt, int i, const char *zData,
 int sqlite3_bind_blob_go(sqlite3_stmt *stmt, int i, const char *zData,
                          sqlite3_uint64 nData) {
   return sqlite3_bind_blob64(stmt, i, zData, nData, &sqlite3_free);
+}
+
+void sqlite3_result_text_go(sqlite3_context *ctx, const char *zData,
+                            sqlite3_uint64 nData) {
+  sqlite3_result_text64(ctx, zData, nData, &sqlite3_free, SQLITE_UTF8);
+}
+
+void sqlite3_result_blob_go(sqlite3_context *ctx, const void *zData,
+                            sqlite3_uint64 nData) {
+  sqlite3_result_blob64(ctx, zData, nData, &sqlite3_free);
 }

stmt.go

@@ -110,10 +110,7 @@ func (s *Stmt) Step() bool {
 		s.err = INTERRUPT
 		return false
 	}
-	return s.step()
-}
 
-func (s *Stmt) step() bool {
 	rc := res_t(s.c.call("sqlite3_step", stk_t(s.handle)))
 	switch rc {
 	case _ROW:
@@ -141,10 +138,9 @@ func (s *Stmt) Exec() error {
 	if s.c.interrupt.Err() != nil {
 		return INTERRUPT
 	}
-	// TODO: implement this in C.
-	for s.step() {
-	}
-	return s.Reset()
+	rc := res_t(s.c.call("sqlite3_exec_go", stk_t(s.handle)))
+	s.err = nil
+	return s.c.error(rc)
 }
 
 // Status monitors the performance characteristics of prepared statements.

util/sql3util/wasm/build.sh

@@ -10,7 +10,9 @@ WASI_SDK="$ROOT/tools/wasi-sdk/bin"
 trap 'rm -f sql3parse_table.tmp' EXIT
 
 "$WASI_SDK/clang" --target=wasm32-wasi -std=c23 -g0 -Oz \
-	-Wall -Wextra -o sql3parse_table.wasm main.c \
+	-Wall -Wextra -Wno-unused-parameter -Wno-unused-function \
+	-o sql3parse_table.wasm main.c \
+	-I"$ROOT/sqlite3" \
 	-mexec-model=reactor \
 	-msimd128 -mmutable-globals -mmultivalue \
 	-mbulk-memory -mreference-types \

util/sql3util/wasm/main.c

@@ -1,5 +1,6 @@
 #include <stddef.h>
 
+#include "strings.c"
 #include "sql3parse_table.c"
 
 static_assert(offsetof(sql3table, name) == 0, "Unexpected offset");

vfs/tests/mptest/wasm/main.c

@@ -3,6 +3,7 @@
 // Use the default callback, not the Go one we patched in.
 #define sqliteBusyCallback sqliteDefaultBusyCallback
 
+#include "strings.c"
 // Amalgamation
 #include "sqlite3.c"
 // VFS

vfs/tests/speedtest1/wasm/main.c

@@ -1,6 +1,7 @@
 // Use the default callback, not the Go one we patched in.
 #define sqliteBusyCallback sqliteDefaultBusyCallback
 
+#include "strings.c"
 // Amalgamation
 #include "sqlite3.c"
 // VFS