Skip to content

NFC Factor out common code between updateGOT and reportUndefinedSymbols #22124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hoodmane wants to merge 2 commits into
base: main
Choose a base branch
from
Open

NFC Factor out common code between updateGOT and reportUndefinedSymbols #22124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e816e8c
NFC Factor out common code between updateGOT and reportUndefinedSymbols
hoodmane Jun 21, 2024
04ab50f
Merge branch 'main' into set-got-entry
kripken Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 24 additions & 32 deletions src/library_dylink.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,30 @@ var LibraryDylink = {
#endif
;
},
$setGOTEntry__deps: ['$addFunction', '$getFunctionAddress'],
$setGOTEntry: (symName, value) => {
const entry = GOT[symName];
Copy link
Collaborator

@sbc100 sbc100 Jul 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like both calls sites already have looked up the entry so perhaps we can pass the entry here too to avoid this extra lookup?

#if DYLINK_DEBUG == 2
dbg(`setGOTEntry: before: ${symName} : ${entry.value}`);
#endif
if (typeof value == 'function') {
entry.value = {{{ to64('addFunction(value, value.sig)') }}};
} else if (typeof value == 'number') {
entry.value = {{{ to64('value') }}};
#if MEMORY64
} else if (typeof value == 'bigint') {
entry.value = value;
#endif
} else {
throw new Error(`bad export type for '${symName}': ${typeof value}`);
}
#if DYLINK_DEBUG == 2
dbg(`setGOTEntry: after: ${symName} ${typeof value}: ${entry.value} (${value})`);
#endif
},

$updateGOT__internal: true,
$updateGOT__deps: ['$GOT', '$isInternalSym', '$addFunction', '$getFunctionAddress'],
$updateGOT__deps: ['$GOT', '$isInternalSym', '$setGOTEntry'],
$updateGOT: (exports, replace) => {
#if DYLINK_DEBUG
dbg("updateGOT: adding " + Object.keys(exports).length + " symbols");
Expand All @@ -223,22 +244,7 @@ var LibraryDylink = {

GOT[symName] ||= new WebAssembly.Global({'value': '{{{ POINTER_WASM_TYPE }}}', 'mutable': true});
if (replace || GOT[symName].value == 0) {
#if DYLINK_DEBUG == 2
dbg(`updateGOT: before: ${symName} : ${GOT[symName].value}`);
#endif
if (typeof value == 'function') {
GOT[symName].value = {{{ to64('addFunction(value)') }}};
#if DYLINK_DEBUG == 2
dbg(`updateGOT: FUNC: ${symName} : ${GOT[symName].value}`);
#endif
} else if (typeof value == {{{ POINTER_JS_TYPE }}}) {
GOT[symName].value = value;
} else {
err(`unhandled export type for '${symName}': ${typeof value}`);
}
#if DYLINK_DEBUG == 2
dbg(`updateGOT: after: ${symName} : ${GOT[symName].value} (${value})`);
#endif
setGOTEntry(symName, value);
}
#if DYLINK_DEBUG
else if (GOT[symName].value != value) {
Expand Down Expand Up @@ -303,21 +309,7 @@ var LibraryDylink = {
#if DYLINK_DEBUG == 2
dbg(`assigning dynamic symbol from main module: ${symName} -> ${prettyPrint(value)}`);
#endif
if (typeof value == 'function') {
/** @suppress {checkTypes} */
entry.value = {{{ to64('addFunction(value, value.sig)') }}};
#if DYLINK_DEBUG == 2
dbg(`assigning table entry for : ${symName} -> ${entry.value}`);
#endif
} else if (typeof value == 'number') {
entry.value = {{{ to64('value') }}};
#if MEMORY64
} else if (typeof value == 'bigint') {
entry.value = value;
#endif
} else {
throw new Error(`bad export type for '${symName}': ${typeof value}`);
}
setGOTEntry(symName, value);
}
}
#if DYLINK_DEBUG
Expand Down