mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
more high-level API & better memory management
This commit is contained in:
Krasimir Angelov
@@ -2,100 +2,374 @@
|
||||
* This module is the high-level JavaScript wrapper around the WASM-compiled version.
|
||||
*/
|
||||
|
||||
function mkAPI(Module) {
|
||||
async function mkAPI() {
|
||||
|
||||
var asm = null;
|
||||
|
||||
function createExportWrapper(name) {
|
||||
return function() {
|
||||
return asm[name].apply(null, arguments);
|
||||
};
|
||||
}
|
||||
|
||||
function setErrNo(value) {
|
||||
HEAP32[asm.__errno_location() >> 2] = value;
|
||||
return value;
|
||||
}
|
||||
|
||||
function abortOnCannotGrowMemory(requestedSize) {
|
||||
abort('Cannot enlarge memory arrays to size ' + requestedSize + ' bytes (OOM). Either (1) compile with -s INITIAL_MEMORY=X with X higher than the current value ' + HEAP8.length + ', (2) compile with -s ALLOW_MEMORY_GROWTH=1 which allows increasing the size at runtime, or (3) if you want malloc to return NULL (0) instead of this abort, compile with -s ABORTING_MALLOC=0 ');
|
||||
}
|
||||
|
||||
function _emscripten_resize_heap(requestedSize) {
|
||||
var oldSize = HEAPU8.length;
|
||||
requestedSize = requestedSize >>> 0;
|
||||
abortOnCannotGrowMemory(requestedSize);
|
||||
}
|
||||
|
||||
var tempRet0 = 0;
|
||||
var urlData = {};
|
||||
var fdData = {};
|
||||
var fdMax = 0;
|
||||
var asmLibraryArg = {
|
||||
"__syscall_fcntl64":
|
||||
function (fd, cmd, varargs) {
|
||||
setErrNo(134);
|
||||
return -1;
|
||||
},
|
||||
|
||||
"__syscall_ioctl":
|
||||
function (fd, op, varargs) {
|
||||
setErrNo(134);
|
||||
return -1;
|
||||
},
|
||||
|
||||
"__syscall_open":
|
||||
function (pathPtr, flags, varargs) {
|
||||
const path = UTF8ToString(pathPtr);
|
||||
const data = urlData[path];
|
||||
if (data == null) {
|
||||
setErrNo(129);
|
||||
return -1;
|
||||
}
|
||||
fdMax++;
|
||||
fdData[fdMax] = {data: data, pos: 0};
|
||||
delete urlData[path];
|
||||
return fdMax;
|
||||
},
|
||||
|
||||
"_munmap_js":
|
||||
function (addr, len, prot, flags, fd, offset) {
|
||||
setErrNo(134);
|
||||
return -1;
|
||||
},
|
||||
|
||||
"abort":
|
||||
function () {
|
||||
console.log('native code called abort()');
|
||||
},
|
||||
|
||||
"emscripten_memcpy_big":
|
||||
function (dest, src, num) {
|
||||
HEAPU8.copyWithin(dest, src, src + num);
|
||||
},
|
||||
|
||||
"emscripten_resize_heap":
|
||||
function _emscripten_resize_heap(requestedSize) {
|
||||
var oldSize = HEAPU8.length;
|
||||
requestedSize = requestedSize >>> 0;
|
||||
abortOnCannotGrowMemory(requestedSize);
|
||||
},
|
||||
|
||||
"fd_close":
|
||||
function (fd) {
|
||||
delete fdData[fd];
|
||||
return 0;
|
||||
},
|
||||
|
||||
"fd_read":
|
||||
function (fd, iov, iovcnt, pnum) {
|
||||
const info = fdData[fd];
|
||||
if (info == null) {
|
||||
setErrNo(121);
|
||||
return -1;
|
||||
}
|
||||
|
||||
let num = 0;
|
||||
for (let i = 0; i < iovcnt; i++) {
|
||||
const ptr = HEAP32[(((iov)+(i*8))>>2)];
|
||||
const len = HEAP32[(((iov)+(i*8 + 4))>>2)];
|
||||
|
||||
let cnt = 0;
|
||||
while (cnt < len && info.pos < info.data.length) {
|
||||
HEAP8[ptr+cnt] = info.data[info.pos];
|
||||
info.pos++
|
||||
cnt++;
|
||||
}
|
||||
|
||||
num += cnt;
|
||||
if (cnt < len) break; // nothing more to read
|
||||
}
|
||||
|
||||
HEAP32[((pnum)>>2)] = num;
|
||||
return 0;
|
||||
},
|
||||
|
||||
"fd_seek":
|
||||
function (fd, offset_low, offset_high, whence, newOffset) {
|
||||
setErrNo(134);
|
||||
return -1;
|
||||
},
|
||||
|
||||
"fd_write":
|
||||
function _fd_write(fd, iov, iovcnt, pnum) {
|
||||
setErrNo(134);
|
||||
return -1;
|
||||
},
|
||||
|
||||
"setTempRet0":
|
||||
function (value) {
|
||||
tempRet0 = value;
|
||||
}
|
||||
};
|
||||
|
||||
const response = await fetch("pgf.wasm", { credentials: 'same-origin' });
|
||||
|
||||
const info = {
|
||||
'env': asmLibraryArg,
|
||||
'wasi_snapshot_preview1': asmLibraryArg,
|
||||
};
|
||||
|
||||
// Suppress closure warning here since the upstream definition for
|
||||
// instantiateStreaming only allows Promise<Repsponse> rather than
|
||||
// an actual Response.
|
||||
// TODO(https://github.com/google/closure-compiler/pull/3913): Remove if/when upstream closure is fixed.
|
||||
/** @suppress {checkTypes} */
|
||||
const result = await WebAssembly.instantiateStreaming(response, info);
|
||||
|
||||
asm = result["instance"].exports;
|
||||
const buf = asm['memory'].buffer;
|
||||
const HEAP8 = new Int8Array(buf);
|
||||
const HEAP16 = new Int16Array(buf);
|
||||
const HEAP32 = new Int32Array(buf);
|
||||
const HEAPU8 = new Uint8Array(buf);
|
||||
const HEAPU16 = new Uint16Array(buf);
|
||||
const HEAPU32 = new Uint32Array(buf);
|
||||
const HEAPF32 = new Float32Array(buf);
|
||||
const HEAPF64 = new Float64Array(buf);
|
||||
|
||||
// Returns the number of bytes the given Javascript string takes if encoded as a UTF8 byte array, EXCLUDING the null terminator byte.
|
||||
function lengthBytesUTF8(str) {
|
||||
var len = 0;
|
||||
for (var i = 0; i < str.length; ++i) {
|
||||
// Gotcha: charCodeAt returns a 16-bit word that is a UTF-16 encoded code unit, not a Unicode code point of the character! So decode UTF16->UTF32->UTF8.
|
||||
// See http://unicode.org/faq/utf_bom.html#utf16-3
|
||||
var u = str.charCodeAt(i); // possibly a lead surrogate
|
||||
if (u >= 0xD800 && u <= 0xDFFF) u = 0x10000 + ((u & 0x3FF) << 10) | (str.charCodeAt(++i) & 0x3FF);
|
||||
if (u <= 0x7F) ++len;
|
||||
else if (u <= 0x7FF) len += 2;
|
||||
else if (u <= 0xFFFF) len += 3;
|
||||
else len += 4;
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
function stringToUTF8Array(str, heap, outIdx, maxBytesToWrite) {
|
||||
if (!(maxBytesToWrite > 0)) // Parameter maxBytesToWrite is not optional. Negative values, 0, null, undefined and false each don't write out any bytes.
|
||||
return 0;
|
||||
|
||||
var startIdx = outIdx;
|
||||
var endIdx = outIdx + maxBytesToWrite - 1; // -1 for string null terminator.
|
||||
for (var i = 0; i < str.length; ++i) {
|
||||
// Gotcha: charCodeAt returns a 16-bit word that is a UTF-16 encoded code unit, not a Unicode code point of the character! So decode UTF16->UTF32->UTF8.
|
||||
// See http://unicode.org/faq/utf_bom.html#utf16-3
|
||||
// For UTF8 byte structure, see http://en.wikipedia.org/wiki/UTF-8#Description and https://www.ietf.org/rfc/rfc2279.txt and https://tools.ietf.org/html/rfc3629
|
||||
var u = str.charCodeAt(i); // possibly a lead surrogate
|
||||
if (u >= 0xD800 && u <= 0xDFFF) {
|
||||
var u1 = str.charCodeAt(++i);
|
||||
u = 0x10000 + ((u & 0x3FF) << 10) | (u1 & 0x3FF);
|
||||
}
|
||||
if (u <= 0x7F) {
|
||||
if (outIdx >= endIdx) break;
|
||||
heap[outIdx++] = u;
|
||||
} else if (u <= 0x7FF) {
|
||||
if (outIdx + 1 >= endIdx) break;
|
||||
heap[outIdx++] = 0xC0 | (u >> 6);
|
||||
heap[outIdx++] = 0x80 | (u & 63);
|
||||
} else if (u <= 0xFFFF) {
|
||||
if (outIdx + 2 >= endIdx) break;
|
||||
heap[outIdx++] = 0xE0 | (u >> 12);
|
||||
heap[outIdx++] = 0x80 | ((u >> 6) & 63);
|
||||
heap[outIdx++] = 0x80 | (u & 63);
|
||||
} else {
|
||||
if (outIdx + 3 >= endIdx) break;
|
||||
if (u > 0x10FFFF) warnOnce('Invalid Unicode code point 0x' + u.toString(16) + ' encountered when serializing a JS string to a UTF-8 string in wasm memory! (Valid unicode code points should be in range 0-0x10FFFF).');
|
||||
heap[outIdx++] = 0xF0 | (u >> 18);
|
||||
heap[outIdx++] = 0x80 | ((u >> 12) & 63);
|
||||
heap[outIdx++] = 0x80 | ((u >> 6) & 63);
|
||||
heap[outIdx++] = 0x80 | (u & 63);
|
||||
}
|
||||
}
|
||||
|
||||
// Null-terminate the pointer to the buffer.
|
||||
heap[outIdx] = 0;
|
||||
return outIdx - startIdx;
|
||||
}
|
||||
|
||||
function allocateUTF8(pool,str) {
|
||||
var size = lengthBytesUTF8(str) + 1;
|
||||
var ptr = asm.gu_malloc(pool,size);
|
||||
if (ptr) stringToUTF8Array(str, HEAP8, ptr, size);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
const UTF8Decoder = typeof TextDecoder != 'undefined' ? new TextDecoder('utf8') : undefined;
|
||||
|
||||
/**
|
||||
* @param {number} idx
|
||||
* @param {number=} maxBytesToRead
|
||||
* @return {string}
|
||||
*/
|
||||
function UTF8ArrayToString(heap, idx, maxBytesToRead) {
|
||||
var endIdx = idx + maxBytesToRead;
|
||||
var endPtr = idx;
|
||||
// TextDecoder needs to know the byte length in advance, it doesn't stop on null terminator by itself.
|
||||
// Also, use the length info to avoid running tiny strings through TextDecoder, since .subarray() allocates garbage.
|
||||
// (As a tiny code save trick, compare endPtr against endIdx using a negation, so that undefined means Infinity)
|
||||
while (heap[endPtr] && !(endPtr >= endIdx)) ++endPtr;
|
||||
|
||||
if (endPtr - idx > 16 && heap.subarray && UTF8Decoder) {
|
||||
return UTF8Decoder.decode(heap.subarray(idx, endPtr));
|
||||
} else {
|
||||
var str = '';
|
||||
// If building with TextDecoder, we have already computed the string length above, so test loop end condition against that
|
||||
while (idx < endPtr) {
|
||||
// For UTF8 byte structure, see:
|
||||
// http://en.wikipedia.org/wiki/UTF-8#Description
|
||||
// https://www.ietf.org/rfc/rfc2279.txt
|
||||
// https://tools.ietf.org/html/rfc3629
|
||||
var u0 = heap[idx++];
|
||||
if (!(u0 & 0x80)) { str += String.fromCharCode(u0); continue; }
|
||||
var u1 = heap[idx++] & 63;
|
||||
if ((u0 & 0xE0) == 0xC0) { str += String.fromCharCode(((u0 & 31) << 6) | u1); continue; }
|
||||
var u2 = heap[idx++] & 63;
|
||||
if ((u0 & 0xF0) == 0xE0) {
|
||||
u0 = ((u0 & 15) << 12) | (u1 << 6) | u2;
|
||||
} else {
|
||||
if ((u0 & 0xF8) != 0xF0) warnOnce('Invalid UTF-8 leading byte 0x' + u0.toString(16) + ' encountered when deserializing a UTF-8 string in wasm memory to a JS string!');
|
||||
u0 = ((u0 & 7) << 18) | (u1 << 12) | (u2 << 6) | (heap[idx++] & 63);
|
||||
}
|
||||
|
||||
if (u0 < 0x10000) {
|
||||
str += String.fromCharCode(u0);
|
||||
} else {
|
||||
var ch = u0 - 0x10000;
|
||||
str += String.fromCharCode(0xD800 | (ch >> 10), 0xDC00 | (ch & 0x3FF));
|
||||
}
|
||||
}
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
function UTF8ToString(ptr, maxBytesToRead) {
|
||||
return ptr ? UTF8ArrayToString(HEAPU8, ptr, maxBytesToRead) : '';
|
||||
}
|
||||
|
||||
function checkError(err) {
|
||||
if (Module._gu_exn_is_raised(err)) {
|
||||
console.error('raised');
|
||||
|
||||
const isCaught = Module.ccall(
|
||||
'gu_exn_caught_',
|
||||
'boolean',
|
||||
['number', 'string'],
|
||||
[err, 'GuErrno']
|
||||
);
|
||||
if (asm.gu_exn_is_raised(err)) {
|
||||
const isCaught = asm.gu_exn_caught_(err, 'GuErrno');
|
||||
if (isCaught) {
|
||||
console.error('caught');
|
||||
|
||||
errDataPtr = Module._gu_exn_caught_data(err);
|
||||
errno = Module.getValue(errDataPtr, '*');
|
||||
console.error('errno', errno);
|
||||
errDataPtr = asm.gu_exn_caught_data(err);
|
||||
errno = HEAP32[errDataPtr >> 2];
|
||||
}
|
||||
|
||||
Module._gu_exn_clear(err);
|
||||
asm.gu_exn_clear(err);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function readPGF(pgfPath) {
|
||||
const pool = Module._gu_new_pool();
|
||||
const registry = new FinalizationRegistry((pool) => {
|
||||
asm.gu_pool_free(pool);
|
||||
});
|
||||
|
||||
const tmp_pool = Module._gu_new_pool();
|
||||
const err = Module._gu_new_exn(tmp_pool);
|
||||
|
||||
// const pgf = Module.ccall(
|
||||
// 'pgf_read',
|
||||
// 'number',
|
||||
// ['string', 'number', 'number'],
|
||||
// [pgfPath, pool, err]
|
||||
// );
|
||||
const strPtr = Module.allocateUTF8(pgfPath);
|
||||
const pgf = Module._pgf_read(strPtr, pool, err);
|
||||
|
||||
if (checkError(err)) {
|
||||
Module._free(tmp_pool);
|
||||
throw new Error('Cannot read PGF');
|
||||
}
|
||||
Module._free(tmp_pool);
|
||||
return pgf;
|
||||
function PGF(pgf,pool) {
|
||||
this.pgf = pgf;
|
||||
this.pool = pool;
|
||||
registry.register(this,pool);
|
||||
}
|
||||
PGF.prototype.abstractName = function() {
|
||||
const namePtr = asm.pgf_abstract_name(this.pgf);
|
||||
return UTF8ToString(namePtr);
|
||||
}
|
||||
|
||||
function abstractName(pgf) {
|
||||
const namePtr = Module._pgf_abstract_name(pgf);
|
||||
return Module.UTF8ToString(namePtr);
|
||||
async function readPGF(pgfURL) {
|
||||
const response = await fetch(pgfURL);
|
||||
urlData[pgfURL] = new Int8Array(await response.arrayBuffer());
|
||||
|
||||
const pool = asm.gu_new_pool();
|
||||
|
||||
const tmp_pool = asm.gu_new_pool();
|
||||
const err = asm.gu_new_exn(tmp_pool);
|
||||
const strPtr = allocateUTF8(tmp_pool,pgfURL);
|
||||
const pgf = asm.pgf_read(strPtr,pool,err);
|
||||
if (checkError(err)) {
|
||||
asm.gu_pool_free(tmp_pool);
|
||||
throw new Error('Cannot read PGF');
|
||||
}
|
||||
|
||||
asm.gu_pool_free(tmp_pool);
|
||||
return new PGF(pgf,pool);
|
||||
}
|
||||
|
||||
function Expr(expr,pool) {
|
||||
this.expr = expr;
|
||||
this.pool = pool;
|
||||
registry.register(this,pool);
|
||||
}
|
||||
Expr.prototype.toString = function() {
|
||||
const tmp_pool = asm.gu_new_pool();
|
||||
|
||||
const sb = asm.gu_new_string_buf(tmp_pool);
|
||||
const out = asm.gu_string_buf_out(sb);
|
||||
const err = asm.gu_new_exn(tmp_pool);
|
||||
asm.pgf_print_expr(this.expr, 0, 0, out, err);
|
||||
if (checkError(err)) {
|
||||
asm.gu_pool_free(tmp_pool);
|
||||
throw new Error('Cannot print expression');
|
||||
}
|
||||
|
||||
const strPtr = asm.gu_string_buf_data(sb);
|
||||
const len = asm.gu_string_buf_length(sb);
|
||||
const str = UTF8ToString(strPtr,len);
|
||||
asm.gu_pool_free(tmp_pool);
|
||||
|
||||
return str;
|
||||
};
|
||||
Expr.prototype.arity = function(expr) {
|
||||
return asm.pgf_expr_arity(this.expr);
|
||||
}
|
||||
|
||||
function readExpr(exprStr) {
|
||||
const tmp_pool = Module._gu_new_pool();
|
||||
const tmp_pool = asm.gu_new_pool();
|
||||
|
||||
const strPtr = allocateUTF8(tmp_pool,exprStr);
|
||||
const in_ = asm.gu_data_in(strPtr, exprStr.length, tmp_pool);
|
||||
const err = asm.gu_new_exn(tmp_pool);
|
||||
const pool = asm.gu_new_pool();
|
||||
const expr = asm.pgf_read_expr(in_, pool, tmp_pool, err);
|
||||
asm.gu_pool_free(tmp_pool);
|
||||
|
||||
const strPtr = Module.allocateUTF8(exprStr);
|
||||
const in_ = Module._gu_data_in(strPtr, exprStr.length, tmp_pool);
|
||||
const err = Module._gu_new_exn(tmp_pool);
|
||||
const pool = Module._gu_new_pool();
|
||||
const expr = Module._pgf_read_expr(in_, pool, tmp_pool, err);
|
||||
Module._free(strPtr);
|
||||
if (checkError(err)) {
|
||||
throw new Error();
|
||||
}
|
||||
if (expr == 0) {
|
||||
throw new Error('Expression cannot be parsed');
|
||||
}
|
||||
Module._free(tmp_pool);
|
||||
return expr;
|
||||
|
||||
return new Expr(expr,pool);
|
||||
}
|
||||
|
||||
function arity(expr) {
|
||||
return Module._pgf_expr_arity(expr);
|
||||
}
|
||||
|
||||
function showExpr(expr) {
|
||||
const tmp_pool = Module._gu_new_pool();
|
||||
|
||||
const sb = Module._gu_new_string_buf(tmp_pool);
|
||||
const out = Module._gu_string_buf_out(sb);
|
||||
const err = Module._gu_new_exn(tmp_pool);
|
||||
Module._pgf_print_expr(expr, 0, 0, out, err);
|
||||
if (checkError(err)) {
|
||||
Module._free(tmp_pool);
|
||||
throw new Error('Cannot print expression');
|
||||
}
|
||||
|
||||
const str = Module._gu_string_buf_data(sb);
|
||||
return Module.UTF8ToString(str);
|
||||
}
|
||||
|
||||
return { readPGF, abstractName, readExpr, arity, showExpr };
|
||||
return { readPGF, readExpr };
|
||||
}
|
||||
|
||||
// This allows us to use both from Node and in browser
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
</head>
|
||||
<body>
|
||||
<script type="text/javascript" src="pgf.js"></script>
|
||||
<script type="text/javascript" src="./jspgf.js"></script>
|
||||
<script type="text/javascript" src="./test-web.js"></script>
|
||||
</body>
|
||||
|
||||
@@ -1,26 +1,15 @@
|
||||
Module.onRuntimeInitialized = () => {
|
||||
const JSPGF = mkAPI(Module);
|
||||
|
||||
fetch('Foods.pgf')
|
||||
.then((response) => response.arrayBuffer())
|
||||
.then((data) => {
|
||||
const pgfPathFS = '/tmp/Foods.pgf';
|
||||
Module.FS.writeFile(pgfPathFS, new Uint8Array(data));
|
||||
|
||||
// Read PGF
|
||||
const pgf = JSPGF.readPGF(pgfPathFS);
|
||||
|
||||
// Print its name
|
||||
console.log(JSPGF.abstractName(pgf));
|
||||
})
|
||||
|
||||
mkAPI().then((pgf) => {
|
||||
// Parse expression
|
||||
const expr = JSPGF.readExpr("Pred (Another (x f))");
|
||||
const expr = pgf.readExpr("Pred (Another (x f))");
|
||||
|
||||
// Show it
|
||||
console.log(JSPGF.showExpr(expr));
|
||||
console.log(expr.toString());
|
||||
|
||||
// Print its arity
|
||||
console.log('arity', JSPGF.arity(expr));
|
||||
}
|
||||
console.log('arity', expr.arity());
|
||||
|
||||
pgf.readPGF("Foods.pgf").then((gr) => {
|
||||
// Print its name
|
||||
console.log(gr.abstractName());
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user