Skip to content

Reduce usage of POINTER_TYPE in JS library code #24586

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reduce usage of POINTER_TYPE in JS library code #24586

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/lib/libembind.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ var LibraryEmbind = {
// assumes POINTER_SIZE alignment
var base = _malloc({{{ POINTER_SIZE }}} + length + 1);
var ptr = base + {{{ POINTER_SIZE }}};
{{{ makeSetValue('base', '0', 'length', SIZE_TYPE) }}};
{{{ makeSetValue('base', '0', 'length', '*') }}};
if (valueIsOfTypeString) {
if (stdStringIsUTF8) {
stringToUTF8(value, ptr, length + 1);
Expand Down Expand Up @@ -543,7 +543,7 @@ var LibraryEmbind = {
// assumes POINTER_SIZE alignment
var length = lengthBytesUTF(value);
var ptr = _malloc({{{ POINTER_SIZE }}} + length + charSize);
{{{ makeSetValue('ptr', '0', 'length / charSize', SIZE_TYPE) }}};
{{{ makeSetValue('ptr', '0', 'length / charSize', '*') }}};

encodeString(value, ptr + {{{ POINTER_SIZE }}}, length + charSize);

Expand Down
8 changes: 4 additions & 4 deletions src/lib/libsyscall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ var SyscallsLibrary = {
writeStat(buf, stat) {
{{{ makeSetValue('buf', C_STRUCTS.stat.st_dev, 'stat.dev', 'i32') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_mode, 'stat.mode', 'i32') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_nlink, 'stat.nlink', SIZE_TYPE) }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_nlink, 'stat.nlink', '*') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_uid, 'stat.uid', 'i32') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_gid, 'stat.gid', 'i32') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_rdev, 'stat.rdev', 'i32') }}};
Expand All @@ -55,11 +55,11 @@ var SyscallsLibrary = {
var mtime = stat.mtime.getTime();
var ctime = stat.ctime.getTime();
{{{ makeSetValue('buf', C_STRUCTS.stat.st_atim.tv_sec, 'Math.floor(atime / 1000)', 'i64') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_atim.tv_nsec, '(atime % 1000) * 1000 * 1000', SIZE_TYPE) }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_atim.tv_nsec, '(atime % 1000) * 1000 * 1000', '*') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_mtim.tv_sec, 'Math.floor(mtime / 1000)', 'i64') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_mtim.tv_nsec, '(mtime % 1000) * 1000 * 1000', SIZE_TYPE) }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_mtim.tv_nsec, '(mtime % 1000) * 1000 * 1000', '*') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_ctim.tv_sec, 'Math.floor(ctime / 1000)', 'i64') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_ctim.tv_nsec, '(ctime % 1000) * 1000 * 1000', SIZE_TYPE) }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_ctim.tv_nsec, '(ctime % 1000) * 1000 * 1000', '*') }}};
{{{ makeSetValue('buf', C_STRUCTS.stat.st_ino, 'stat.ino', 'i64') }}};
return 0;
},
Expand Down
18 changes: 9 additions & 9 deletions src/lib/libwasi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ var WasiLibrary = {
environ_sizes_get__nothrow: true,
environ_sizes_get: (penviron_count, penviron_buf_size) => {
var strings = getEnvStrings();
{{{ makeSetValue('penviron_count', 0, 'strings.length', SIZE_TYPE) }}};
{{{ makeSetValue('penviron_count', 0, 'strings.length', '*') }}};
var bufSize = 0;
for (var string of strings) {
bufSize += lengthBytesUTF8(string) + 1;
}
{{{ makeSetValue('penviron_buf_size', 0, 'bufSize', SIZE_TYPE) }}};
{{{ makeSetValue('penviron_buf_size', 0, 'bufSize', '*') }}};
return 0;
},

Expand All @@ -117,12 +117,12 @@ var WasiLibrary = {
args_sizes_get__nothrow: true,
args_sizes_get: (pargc, pargv_buf_size) => {
#if MAIN_READS_PARAMS
{{{ makeSetValue('pargc', 0, 'mainArgs.length', SIZE_TYPE) }}};
{{{ makeSetValue('pargc', 0, 'mainArgs.length', '*') }}};
var bufSize = 0;
mainArgs.forEach((arg) => bufSize += arg.length + 1);
{{{ makeSetValue('pargv_buf_size', 0, 'bufSize', SIZE_TYPE) }}};
{{{ makeSetValue('pargv_buf_size', 0, 'bufSize', '*') }}};
#else
{{{ makeSetValue('pargc', 0, '0', SIZE_TYPE) }}};
{{{ makeSetValue('pargc', 0, '0', '*') }}};
#endif
return 0;
},
Expand Down Expand Up @@ -284,7 +284,7 @@ var WasiLibrary = {
num += len;
}
#endif // SYSCALLS_REQUIRE_FILESYSTEM
{{{ makeSetValue('pnum', 0, 'num', SIZE_TYPE) }}};
{{{ makeSetValue('pnum', 0, 'num', '*') }}};
return 0;
},

Expand All @@ -297,7 +297,7 @@ var WasiLibrary = {
if (isNaN(offset)) return {{{ cDefs.EOVERFLOW }}};
var stream = SYSCALLS.getStreamFromFD(fd)
var num = doWritev(stream, iov, iovcnt, offset);
{{{ makeSetValue('pnum', 0, 'num', SIZE_TYPE) }}};
{{{ makeSetValue('pnum', 0, 'num', '*') }}};
return 0;
#elif ASSERTIONS
abort('fd_pwrite called without SYSCALLS_REQUIRE_FILESYSTEM');
Expand Down Expand Up @@ -332,7 +332,7 @@ var WasiLibrary = {
#if SYSCALLS_REQUIRE_FILESYSTEM
var stream = SYSCALLS.getStreamFromFD(fd);
var num = doReadv(stream, iov, iovcnt);
{{{ makeSetValue('pnum', 0, 'num', SIZE_TYPE) }}};
{{{ makeSetValue('pnum', 0, 'num', '*') }}};
return 0;
#elif ASSERTIONS
abort('fd_read called without SYSCALLS_REQUIRE_FILESYSTEM');
Expand All @@ -350,7 +350,7 @@ var WasiLibrary = {
if (isNaN(offset)) return {{{ cDefs.EOVERFLOW }}};
var stream = SYSCALLS.getStreamFromFD(fd)
var num = doReadv(stream, iov, iovcnt, offset);
{{{ makeSetValue('pnum', 0, 'num', SIZE_TYPE) }}};
{{{ makeSetValue('pnum', 0, 'num', '*') }}};
return 0;
#elif ASSERTIONS
abort('fd_pread called without SYSCALLS_REQUIRE_FILESYSTEM');
Expand Down
4 changes: 2 additions & 2 deletions src/lib/libwasmfs_jsimpl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ addToLibrary({
assert(wasmFS$backends[backend]);
#endif
var result = await wasmFS$backends[backend].write(file, buffer, length, offset);
{{{ makeSetValue('result_p', 0, 'result', SIZE_TYPE) }}};
{{{ makeSetValue('result_p', 0, 'result', '*') }}};
_emscripten_proxy_finish(ctx);
},

Expand All @@ -102,7 +102,7 @@ addToLibrary({
assert(wasmFS$backends[backend]);
#endif
var result = await wasmFS$backends[backend].read(file, buffer, length, offset);
{{{ makeSetValue('result_p', 0, 'result', SIZE_TYPE) }}};
{{{ makeSetValue('result_p', 0, 'result', '*') }}};
_emscripten_proxy_finish(ctx);
},

Expand Down