Skip to content

gh-128627: Emscripten: Fix address calculation for wasm-gc trampoline #128782

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

Merged
merged 3 commits into from
Jan 23, 2025
Merged

gh-128627: Emscripten: Fix address calculation for wasm-gc trampoline #128782

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5676192
gh-128627: Emscripten: Fix address calculation for wasm-gc trampoline
hoodmane Jan 13, 2025
55260c3
Add comment about branch of wabt that supports ref.test
hoodmane Jan 13, 2025
932f896
Add _PyRuntime and _PyEM_EMSCRIPTEN_COUNT_ARGS_OFFSET to exports
hoodmane Jan 13, 2025
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
8 changes: 4 additions & 4 deletions Python/emscripten_trampoline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,15 @@ addOnPreRun(() => {
let ptr = 0;
try {
const mod = new WebAssembly.Module(code);
const inst = new WebAssembly.Instance(mod, {e: {t: wasmTable}});
const inst = new WebAssembly.Instance(mod, { e: { t: wasmTable } });
ptr = addFunction(inst.exports.f);
} catch(e) {
} catch (e) {
// If something goes wrong, we'll null out _PyEM_CountFuncParams and fall
// back to the JS trampoline.
}
Module._PyEM_CountArgsPtr = ptr;
const offset = HEAP32[__PyEM_EMSCRIPTEN_COUNT_ARGS_OFFSET/4];
HEAP32[__PyRuntime/4 + offset] = ptr;
const offset = HEAP32[__PyEM_EMSCRIPTEN_COUNT_ARGS_OFFSET / 4];
HEAP32[(__PyRuntime + offset) / 4] = ptr;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This line is the only change: base/4 + offset ==> (base + offset)/4.

});
);

Expand Down
Loading