aboutsummaryrefslogtreecommitdiff
path: root/src/zilch/App/object-store.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/zilch/App/object-store.js')
-rw-r--r--src/zilch/App/object-store.js49
1 files changed, 5 insertions, 44 deletions
diff --git a/src/zilch/App/object-store.js b/src/zilch/App/object-store.js
index 096d085..d1fe42f 100644
--- a/src/zilch/App/object-store.js
+++ b/src/zilch/App/object-store.js
@@ -17,17 +17,8 @@ class ObjectStore {
"undefined": 6,
});
- static methods = Object.freeze({
- 0: 'free',
- 1: 'getProp',
- 2: 'setProp',
- 3: 'delProp',
- 4: 'callMethod',
- 5: 'call',
- 6: 'new',
- });
-
static store = { 0: null };
+ static methods = {};
static generateFreeId() {
let id = 0;
@@ -39,49 +30,19 @@ class ObjectStore {
return id;
}
- static free(target) {
- const id = target[ZsId];
- delete target[ZsId];
- delete ObjectStore.store[id];
- }
-
- static getProp(target, key) {
- return target[key];
- }
-
- static setProp(target, key, value) {
- target[key] = value;
- }
-
- static delProp(target, key) {
- delete target[key];
- }
-
- static callMethod(target, method, ...args) {
- return target[method](...args);
- }
-
- static call(target, args) {
- return target(args);
- }
-
- static new(target, ...args) {
- return new target(...args);
- }
-
static decodeString(base, len) {
const slice = new Uint8Array(wasm.memory.buffer, base, len);
return new TextDecoder().decode(slice);
}
static decodeCall(view, offset) {
- const kind = ObjectStore.methods[view.getUint8(offset, true)]
+ const kind = ObjectStore.methods[view.getUint32(offset, true)]
if (!kind) throw "unknown method, cannot decode";
return {
kind: kind,
- num_args: view.getUint8(offset + 1, true),
+ num_args: view.getUint8(offset + 4, true),
}
}
@@ -192,7 +153,7 @@ class ObjectStore {
for (let i = 0; i < length; ++i) {
const method = ObjectStore.decodeCall(calls_view, offset.call);
- offset.call += 2;
+ offset.call += 8;
let args = new Array(method.num_args).fill().map(_ => {
const value = ObjectStore.decodeValue(values_view, offset.value);
@@ -200,7 +161,7 @@ class ObjectStore {
return value;
});
- const result = ObjectStore[method.kind](...args);
+ const result = method.kind(...args);
const result_ptr = results_view.getUint32(offset.result, true);
offset.result += 4;