Skip to content

Wasm: Fix file opening for 64-bit version #4125

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
oitel merged 1 commit into from
Feb 17, 2025
Merged

Wasm: Fix file opening for 64-bit version #4125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions wasm/io_files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
var pointerSize = 0;

var getPointerSize = function () {
if (!pointerSize) {
pointerSize = Module.ccall('emsGetPointerSize', 'number', [], []);
}
return pointerSize;
}

var toPointer = function (value) {
return getPointerSize() == 8 ? BigInt(value) : value;
}

var freeFSCallback = function () {
Module.ccall('emsFreeFSCallback', 'void', [], []);
}
Expand Down Expand Up @@ -146,7 +159,7 @@ var open_files = function (e) {
return;
}
e.preventDefault();
var filenames = _malloc(e.target.files.length * 4);
var filenames = _malloc(e.target.files.length * getPointerSize());
var filenamesArray = [];
var count = e.target.files.length;
var written = 0;
Expand All @@ -164,7 +177,7 @@ var open_files = function (e) {
var data = e.target.result;
FS.writeFile(path, new Uint8Array(data));
if (++written === count) {
Module.ccall('emsOpenFiles', 'number', ['number', 'Int8Array'], [count, filenames]);
Module.ccall('emsOpenFiles', 'number', ['number', 'Int8Array'], [count, toPointer(filenames)]);
for (var i = 0; i < filenamesArray.length; ++i) {
_free(filenamesArray[i]);
}
Expand All @@ -177,7 +190,9 @@ var open_files = function (e) {
reader.readAsArrayBuffer(file);
var filename = stringToNewUTF8(path);
filenamesArray.push(filename);
if (typeof GROWABLE_HEAP_U32 !== 'undefined')
if (getPointerSize() == 8)
HEAPU64[(filenames + i * 8) / 8] = BigInt(filename);
else if (typeof GROWABLE_HEAP_U32 !== 'undefined')
GROWABLE_HEAP_U32()[filenames + i * 4 >> 2] = filename;
else
HEAP32[filenames + i * 4 >> 2] = filename;
Expand Down
Loading