From ce6fe5d796ae77bb260240c0eb18b3d5cb5f6dfd Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Thu, 7 Oct 2021 15:29:43 -0700 Subject: [PATCH] [Memory64] Further POINTER_SIZE cleanup --- src/library_wasi.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/library_wasi.js b/src/library_wasi.js index 790e448d8170c..af3e2b2f4b160 100644 --- a/src/library_wasi.js +++ b/src/library_wasi.js @@ -115,7 +115,7 @@ var WasiLibrary = { var bufSize = 0; mainArgs.forEach(function(arg, i) { var ptr = argv_buf + bufSize; - {{{ makeSetValue('argv', `i*${Runtime.POINTER_SIZE}`, 'ptr', `${POINTER_TYPE}`) }}}; + {{{ makeSetValue('argv', `i*${Runtime.POINTER_SIZE}`, 'ptr', POINTER_TYPE) }}}; writeAsciiToMemory(arg, ptr); bufSize += arg.length + 1; }); @@ -203,15 +203,15 @@ var WasiLibrary = { // hack to support printf in SYSCALLS_REQUIRE_FILESYSTEM=0 var num = 0; for (var i = 0; i < iovcnt; i++) { - var ptr = {{{ makeGetValue('iov', `i*${Runtime.POINTER_SIZE}*2`, `${POINTER_TYPE}`) }}}; - var len = {{{ makeGetValue('iov', `i*${Runtime.POINTER_SIZE}*2 + ${Runtime.POINTER_SIZE}`, `${POINTER_TYPE}`) }}}; + var ptr = {{{ makeGetValue('iov', `i*${Runtime.POINTER_SIZE}*2`, POINTER_TYPE) }}}; + var len = {{{ makeGetValue('iov', `i*${Runtime.POINTER_SIZE}*2 + ${Runtime.POINTER_SIZE}`, POINTER_TYPE) }}}; for (var j = 0; j < len; j++) { SYSCALLS.printChar(fd, HEAPU8[ptr+j]); } num += len; } #endif // SYSCALLS_REQUIRE_FILESYSTEM - {{{ makeSetValue('pnum', 0, 'num', `${SIZE_TYPE}`) }}} + {{{ makeSetValue('pnum', 0, 'num', SIZE_TYPE) }}} return 0; },