summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortzik <mail@tzik.jp>2016-03-30 12:53:33 +0900
committertzik <mail@tzik.jp>2016-03-30 13:53:11 +0900
commita3626f94e5e7ae2243beded3e3fa796352ca2033 (patch)
tree28717ab3d1fe55dfd632f58a530aef639f901bad
parent84aa340d56ca3bf8b3ae9a2ea3ba4990f975977e (diff)
downloadbinaryen-a3626f94e5e7ae2243beded3e3fa796352ca2033.tar.gz
binaryen-a3626f94e5e7ae2243beded3e3fa796352ca2033.tar.bz2
binaryen-a3626f94e5e7ae2243beded3e3fa796352ca2033.zip
Fix grow_memory translation on s2wasm
s2wasm used to mistranslate grow_memory operation in .s into memory_size in .wast, and this CL fixes it.
-rw-r--r--src/s2wasm.h4
-rw-r--r--test/llvm_autogenerated/memory-addr32.wast4
-rw-r--r--test/llvm_autogenerated/memory-addr64.wast4
3 files changed, 8 insertions, 4 deletions
diff --git a/src/s2wasm.h b/src/s2wasm.h
index 0520d5c3b..8db41a339 100644
--- a/src/s2wasm.h
+++ b/src/s2wasm.h
@@ -639,13 +639,13 @@ class S2WasmBuilder {
auto makeHost = [&](HostOp op) {
Name assign = getAssign();
auto curr = allocator.alloc<Host>();
- curr->op = MemorySize;
+ curr->op = op;
setOutput(curr, assign);
};
auto makeHost1 = [&](HostOp op) {
Name assign = getAssign();
auto curr = allocator.alloc<Host>();
- curr->op = MemorySize;
+ curr->op = op;
curr->operands.push_back(getInput());
setOutput(curr, assign);
};
diff --git a/test/llvm_autogenerated/memory-addr32.wast b/test/llvm_autogenerated/memory-addr32.wast
index 8d52c3633..f39f8d261 100644
--- a/test/llvm_autogenerated/memory-addr32.wast
+++ b/test/llvm_autogenerated/memory-addr32.wast
@@ -8,7 +8,9 @@
)
)
(func $grow_memory (param $$0 i32)
- (memory_size)
+ (grow_memory
+ (get_local $$0)
+ )
(return)
)
)
diff --git a/test/llvm_autogenerated/memory-addr64.wast b/test/llvm_autogenerated/memory-addr64.wast
index 88810be51..a321d3a3d 100644
--- a/test/llvm_autogenerated/memory-addr64.wast
+++ b/test/llvm_autogenerated/memory-addr64.wast
@@ -8,7 +8,9 @@
)
)
(func $grow_memory (param $$0 i64)
- (memory_size)
+ (grow_memory
+ (get_local $$0)
+ )
(return)
)
)