diff options
| -rwxr-xr-x | check.py | 2 | ||||
| -rw-r--r-- | src/wasm-interpreter.h | 12 |
2 files changed, 11 insertions, 3 deletions
@@ -84,7 +84,7 @@ if len(requested) == 0: # 'address' : filed issue, test looks invalid # 'exports', 'int_literals' : has a "return" https://github.com/WebAssembly/spec/issues/164 # 'switch': todo once stable - spec_tests = [os.path.join('spec', t + '.wast') for t in ['conversions', 'endianness', 'f32_cmp', 'f32', 'f64_cmp', 'f64', 'float_exprs', 'forward', 'func_ptrs', 'functions', 'has_feature', 'i32', 'i64', 'imports', 'int_exprs', 'left-to-right', 'memory_redundancy', 'memory_trap', 'names']] + spec_tests = [os.path.join('spec', t + '.wast') for t in ['conversions', 'endianness', 'f32_cmp', 'f32', 'f64_cmp', 'f64', 'float_exprs', 'forward', 'func_ptrs', 'functions', 'has_feature', 'i32', 'i64', 'imports', 'int_exprs', 'left-to-right', 'memory_redundancy', 'memory_trap', 'names', 'resizing']] else: spec_tests = requested[:] diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h index e69e9c9aa..a935d2069 100644 --- a/src/wasm-interpreter.h +++ b/src/wasm-interpreter.h @@ -25,6 +25,10 @@ int32_t safe_ctz(int32_t v) { return __builtin_ctz(v); } +enum { + pageSize = 64*1024 +}; + // // An instance of a WebAssembly module, which can execute it via AST interpretation // @@ -643,12 +647,16 @@ private: Flow visitHost(Host *curr) override { NOTE_ENTER("Host"); switch (curr->op) { - case PageSize: return Literal(64*1024); + case PageSize: return Literal(pageSize); case MemorySize: return Literal(instance.memorySize); case GrowMemory: { Flow flow = visit(curr->operands[0]); if (flow.breaking()) return flow; - size_t newSize = instance.memorySize + flow.value.getInteger(); + uint32_t delta = flow.value.geti32(); + if (delta % pageSize != 0) trap(); + if (delta > uint32_t(-1) - pageSize) trap(); + if (instance.memorySize >= uint32_t(-1) - delta) trap(); + uint32_t newSize = instance.memorySize + delta; if (newSize > instance.wasm.memory.max) trap(); instance.externalInterface->growMemory(instance.memorySize, newSize); instance.memorySize = newSize; |