From f2e624ea918d6509165a07205d08acd7ffe77927 Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Mon, 29 Aug 2022 12:31:57 +0000
Subject: [PATCH] Add get/setPtrValue() to the common wasm utils.

FossilOrigin-Name: 24d70fc458c6002d5ff3c9f8ce7c66bde299b32aca6417c2dd1236e1412b036d
---
 ext/wasm/api/sqlite3-api-oo1.js |  4 ++--
 ext/wasm/common/whwasmutil.js   |  9 +++++++++
 manifest                        | 14 +++++++-------
 manifest.uuid                   |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 6317f97f51..5d4b19b5a9 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -553,8 +553,8 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
           DB.checkRc(this, capi.sqlite3_prepare_v3(
             this.pointer, pSql, sqlByteLen, 0, ppStmt, pzTail
           ));
-          const pStmt = wasm.getMemValue(ppStmt, wasm.ptrIR);
-          pSql = wasm.getMemValue(pzTail, wasm.ptrIR);
+          const pStmt = wasm.getPtrValue(ppStmt);
+          pSql = wasm.getPtrValue(pzTail);
           sqlByteLen = pSqlEnd - pSql;
           if(!pStmt) continue;
           if(Array.isArray(opt.saveSql)){
diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js
index e51f690e29..3fef06f724 100644
--- a/ext/wasm/common/whwasmutil.js
+++ b/ext/wasm/common/whwasmutil.js
@@ -654,6 +654,15 @@ self.WhWasmUtilInstaller = function(target){
     toss('Invalid type for setMemValue(): ' + type);
   };
 
+
+  /** Convenience form of getMemValue() intended for fetching
+      pointer-to-pointer values. */
+  target.getPtrValue = (ptr)=>target.getMemValue(ptr, ptrIR);
+
+  /** Convenience form of setMemValue() intended for setting
+      pointer-to-pointer values. */
+  target.setPtrValue = (ptr, value)=>target.setMemValue(ptr, value, ptrIR);
+
   /**
      Expects ptr to be a pointer into the WASM heap memory which
      refers to a NUL-terminated C-style string encoded as UTF-8.
diff --git a/manifest b/manifest
index 1c823620f6..4ae286c3d5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sbegin/end\scomment\smarkers\sto\sthe\stest\sblocks\sin\sspeedtest1\s--script\soutput\sto\sfacilitate\schopping\sup\sthe\soutput\sinto\schunks\sfor\sJS-side\sprocessing.
-D 2022-08-29T09:51:17.953
+C Add\sget/setPtrValue()\sto\sthe\scommon\swasm\sutils.
+D 2022-08-29T12:31:57.599
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -483,7 +483,7 @@ F ext/wasm/api/post-js-footer.js b64319261d920211b8700004d08b956a6c285f3b0bba814
 F ext/wasm/api/post-js-header.js 0e853b78db83cb1c06b01663549e0e8b4f377f12f5a2d9a4a06cb776c003880b
 F ext/wasm/api/sqlite3-api-cleanup.js 1a12e64060c2cb0defd34656a76a9b1d7ed58459c290249bb31567c806fd44de
 F ext/wasm/api/sqlite3-api-glue.js 67ca83974410961953eeaa1dfed3518530d68381729ed1d27f95122f5baeabd3
-F ext/wasm/api/sqlite3-api-oo1.js ae7b07445b47cd3b875a8f926abad6c1b836aaba0c9e16c090051f5c8461949d
+F ext/wasm/api/sqlite3-api-oo1.js 46a5151610076f45472c8d4fd31b728cc12e6fac4d44ea5c7cd1af087a906539
 F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e810345f213a5774993c0
 F ext/wasm/api/sqlite3-api-prologue.js 2d5c5d3355f55eefe51922cec5bfedbec0f8300db98a17685ab7a34a03953c7a
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
@@ -492,7 +492,7 @@ F ext/wasm/api/sqlite3-wasm.c 0d81282eaeff2a6e9fc5c28a388c5c5b45cf25a9393992fa51
 F ext/wasm/common/SqliteTestUtil.js eb96275bed43fdb364b7d65bcded0ca5e22aaacff120d593d1385f852f486247
 F ext/wasm/common/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
 F ext/wasm/common/testing.css 572cf1ffae0b6eb7ca63684d3392bf350217a07b90e7a896e4fa850700c989b0
-F ext/wasm/common/whwasmutil.js 41b8e097e0a9cb07c24c0ede3c81b72470a63f4a4efb07f75586dc131569f5ae
+F ext/wasm/common/whwasmutil.js e1c6779c977c8614053e24311d489dd4872962cb58c27013d4778f0dd7329e9c
 F ext/wasm/demo-oo1.html 75646855b38405d82781246fd08c852a2b3bee05dd9f0fe10ab655a8cffb79aa
 F ext/wasm/demo-oo1.js aad38cb90b6fa7fd4d1184e759b25056fb4ed45c4957c458896354281259515f
 F ext/wasm/fiddle/emscripten.css 3d253a6fdb8983a2ac983855bfbdd4b6fa1ff267c28d69513dd6ef1f289ada3f
@@ -2009,8 +2009,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b5058f14fadbc8a1886f27cff08593dd2c8e2b2cb6d7bed3b8733a55f031989f
-R 36f1b21cb1d4644e92fb6c673b070ffc
+P ef0b7ef2d2e19b1f9437fdd7e24f040f662d9907d1fa17c6a3892fcf091b849e
+R b442ab29e0d8d5bef6fe7f9423ce5596
 U stephan
-Z 7df3fe59906fdbadae6efee36992f3be
+Z 5511f58972906137802924f203cb8dde
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index aef69a98ac..50e61bf33a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ef0b7ef2d2e19b1f9437fdd7e24f040f662d9907d1fa17c6a3892fcf091b849e
\ No newline at end of file
+24d70fc458c6002d5ff3c9f8ce7c66bde299b32aca6417c2dd1236e1412b036d
\ No newline at end of file