diff --git a/ext/wasm/api/sqlite3-api-prologue.js b/ext/wasm/api/sqlite3-api-prologue.js index 9bac704483..ff528feef5 100644 --- a/ext/wasm/api/sqlite3-api-prologue.js +++ b/ext/wasm/api/sqlite3-api-prologue.js @@ -1021,7 +1021,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap( memory must eventually be released using restore(). If n is a string, it must be a WASM "IR" value in the set - accepted by wasm.irSizeof(), which is mapped to the size of + accepted by wasm.sizeofIR(), which is mapped to the size of that data type. If passed a string not in that set, it throws a WasmAllocError. @@ -1031,7 +1031,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap( heap. Similarly, the returned address is always 8-byte aligned. */ alloc: function(n){ - if('string'===typeof n && !(n = wasm.irSizeof(n))){ + if('string'===typeof n && !(n = wasm.sizeofIR(n))){ WasmAllocError.toss("Invalid value for pstack.alloc(",arguments[0],")"); } return wasm.exports.sqlite3_wasm_pstack_alloc(n) @@ -1043,7 +1043,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap( returns the addresses as an array of n element, each holding the address of one chunk. - sz may optionally be an IR string accepted by wasm.irSizeof(). + sz may optionally be an IR string accepted by wasm.sizeofIR(). Throws a WasmAllocError if allocation fails. @@ -1054,7 +1054,7 @@ self.sqlite3ApiBootstrap = function sqlite3ApiBootstrap( ``` */ allocChunks: function(n,sz){ - if('string'===typeof sz && !(sz = wasm.irSizeof(sz))){ + if('string'===typeof sz && !(sz = wasm.sizeofIR(sz))){ WasmAllocError.toss("Invalid size value for allocChunks(",arguments[1],")"); } const mem = wasm.pstack.alloc(n * sz); diff --git a/ext/wasm/common/whwasmutil.js b/ext/wasm/common/whwasmutil.js index bfe66dfb15..9f634d7744 100644 --- a/ext/wasm/common/whwasmutil.js +++ b/ext/wasm/common/whwasmutil.js @@ -253,7 +253,7 @@ self.WhWasmUtilInstaller = function(target){ (target.ptrSizeof in the latter case). For any other value, it returns the undefined value. */ - target.irSizeof = (n)=>{ + target.sizeofIR = (n)=>{ switch(n){ case 'i8': return 1; case 'i16': return 2; diff --git a/manifest b/manifest index 7ec9eca484..11356ed11a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Minor\sinternal\sAPI\sdoc\scorrection\sand\sextend\sa\stest\sfor\soo1.DB.selectValues(). -D 2022-12-25T22:49:55.364 +C Rename\sthe\snew\swasm.irSizeof()\sto\ssizeofIR()\sbecause\sthat\sseems\sclearer. +D 2022-12-25T22:55:45.073 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -505,7 +505,7 @@ F ext/wasm/api/pre-js.c-pp.js b88499dc303c21fc3f55f2c364a0f814f587b60a9578430388 F ext/wasm/api/sqlite3-api-cleanup.js 680d5ccfff54459db136a49b2199d9f879c8405d9c99af1dda0cc5e7c29056f4 F ext/wasm/api/sqlite3-api-glue.js 594741f7cbff68f0b4a0c1a066bce335146de1124366377292e27d30f9a5f751 F ext/wasm/api/sqlite3-api-oo1.js 959be9a922d1f012b4a25e7b763c112220bb0efb989f56b82a776ab1ccebe72d -F ext/wasm/api/sqlite3-api-prologue.js 9dfbb41ebc0aadfac9c41ae8d050187af39819fff4e4f22ac6a8a4f3008f722b +F ext/wasm/api/sqlite3-api-prologue.js 3792a703ea15be8d4393a99992862c285d62732d760cec95226dc5ec2781d920 F ext/wasm/api/sqlite3-api-worker1.js e94ba98e44afccfa482874cd9acb325883ade50ed1f9f9526beb9de1711f182f F ext/wasm/api/sqlite3-license-version-header.js a661182fc93fc2cf212dfd0b987f8e138a3ac98f850b1112e29b5fbdaecc87c3 F ext/wasm/api/sqlite3-opfs-async-proxy.js 7795b84b66a7a8dedc791340709b310bb497c3c72a80bef364fa2a58e2ddae3f @@ -521,7 +521,7 @@ F ext/wasm/c-pp.c 92285f7bce67ed7b7020b40fde8ed0982c442b63dc33df9dfd4b658d4a6c07 F ext/wasm/common/SqliteTestUtil.js d8bf97ecb0705a2299765c8fc9e11b1a5ac7f10988bbf375a6558b7ca287067b F ext/wasm/common/emscripten.css 11bd104b6c0d597c67d40cc8ecc0a60dae2b965151e3b6a37fa5708bac3acd15 F ext/wasm/common/testing.css 0ff15602a3ab2bad8aef2c3bd120c7ee3fd1c2054ad2ace7e214187ae68d926f -F ext/wasm/common/whwasmutil.js 77aedbe53b05bfe08f4ca52e96d520eb14d792df09e107df6e3d1300de37e02f +F ext/wasm/common/whwasmutil.js 961f190a955b419a795d1ce2136032bf8c0b14f2bda69c2b3263bab5a48f01a9 F ext/wasm/demo-123-worker.html a0b58d9caef098a626a1a1db567076fca4245e8d60ba94557ede8684350a81ed F ext/wasm/demo-123.html 8c70a412ce386bd3796534257935eb1e3ea5c581e5d5aea0490b8232e570a508 F ext/wasm/demo-123.js ebae30756585bca655b4ab2553ec9236a87c23ad24fc8652115dcedb06d28df6 @@ -2067,8 +2067,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 6adc8a10146190037d55d3328d2f78aa5233559f88d4aa70fbbf9e10145b9b6c -R ab9bc9eeed21f370b3c130570f9e653a +P b7295b1ca700945ae4e89be69f954dce9960e8975664e620898392b2cc78d452 +R f20b23dc49016616e4537ae3fbf889f2 U stephan -Z c1bfc6c7f86e8bde4952cf14d3251cf0 +Z 2cf153cf91d4387022d8e0a87cff2eb5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7593c2c512..3bc48826d7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b7295b1ca700945ae4e89be69f954dce9960e8975664e620898392b2cc78d452 \ No newline at end of file +49a83ca3ba46d3ae8021fbdd72b48ce9181eea6845fa7bb7aa83b16fad1728be \ No newline at end of file