Skip to content

Commit

Permalink
Simplify from64 macro
Browse files Browse the repository at this point in the history
Also, add a variant that simply generates an expression, similar to how
the `to64` macro works.  This is needed for emscripten-core#22497
  • Loading branch information
sbc100 committed Sep 4, 2024
1 parent 7d78ad8 commit 2e84759
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
3 changes: 1 addition & 2 deletions src/library_ccall.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ addToLibrary({

function convertReturnValue(ret) {
if (returnType === 'string') {
{{{ from64('ret') }}}
return UTF8ToString(ret);
return UTF8ToString({{{ from64Expr('ret') }}});
}
#if MEMORY64
if (returnType === 'pointer') return Number(ret);
Expand Down
3 changes: 1 addition & 2 deletions src/library_dylink.js
Original file line number Diff line number Diff line change
Expand Up @@ -814,8 +814,7 @@ var LibraryDylink = {
for (var name in moduleExports) {
if (name.startsWith('__em_js__')) {
var start = moduleExports[name]
{{{ from64('start') }}}
var jsString = UTF8ToString(start);
var jsString = UTF8ToString({{{ from64Expr('start') }}});
// EM_JS strings are stored in the data section in the form
// SIG<::>BODY.
var parts = jsString.split('<::>');
Expand Down
20 changes: 10 additions & 10 deletions src/parseTools.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -949,20 +949,20 @@ function receiveI64ParamAsI53Unchecked(name) {
return `var ${name} = convertI32PairToI53(${name}_low, ${name}_high);`;
}

// Any function called from wasm64 may have bigint args, this function takes
// a list of variable names to convert to number.
// Convert a pointer value under wasm64 from BigInt (used at local level API
// level) to Number (used in JS library code). No-op under wasm32.
function from64(x) {
if (!MEMORY64) {
return '';
}
if (Array.isArray(x)) {
let ret = '';
for (e of x) ret += from64(e);
return ret;
}
if (!MEMORY64) return '';
return `${x} = Number(${x});`;
}

// Like from64 above but generate an expression instead of an assignment
// statement.
function from64Expr(x, assign = true) {
if (!MEMORY64) return x;
return `Number(${x})`;
}

function to64(x) {
if (!MEMORY64) return x;
return `BigInt(${x})`;
Expand Down

0 comments on commit 2e84759

Please sign in to comment.