From 1a3c1a58cc7e97a846f612baf7f74a370980458f Mon Sep 17 00:00:00 2001 From: Heejin Ahn Date: Tue, 21 May 2019 13:25:14 -0700 Subject: Reflect instruction renaming in code (#2128) - Reflected new renamed instruction names in code and tests: - `get_local` -> `local.get` - `set_local` -> `local.set` - `tee_local` -> `local.tee` - `get_global` -> `global.get` - `set_global` -> `global.set` - `current_memory` -> `memory.size` - `grow_memory` -> `memory.grow` - Removed APIs related to old instruction names in Binaryen.js and added APIs with new names if they are missing. - Renamed `typedef SortedVector LocalSet` to `SetsOfLocals` to prevent name clashes. - Resolved several TODO renaming items in wasm-binary.h: - `TableSwitch` -> `BrTable` - `I32ConvertI64` -> `I32WrapI64` - `I64STruncI32` -> `I64SExtendI32` - `I64UTruncI32` -> `I64UExtendI32` - `F32ConvertF64` -> `F32DemoteI64` - `F64ConvertF32` -> `F64PromoteF32` - Renamed `BinaryenGetFeatures` and `BinaryenSetFeatures` to `BinaryenModuleGetFeatures` and `BinaryenModuleSetFeatures` for consistency. --- src/wasm-s-parser.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/wasm-s-parser.h') diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h index c37b1b27d..2e84b2245 100644 --- a/src/wasm-s-parser.h +++ b/src/wasm-s-parser.h @@ -175,11 +175,11 @@ private: Expression* makeDrop(Element& s); Expression* makeHost(Element& s, HostOp op); Index getLocalIndex(Element& s); - Expression* makeGetLocal(Element& s); - Expression* makeTeeLocal(Element& s); - Expression* makeSetLocal(Element& s); - Expression* makeGetGlobal(Element& s); - Expression* makeSetGlobal(Element& s); + Expression* makeLocalGet(Element& s); + Expression* makeLocalTee(Element& s); + Expression* makeLocalSet(Element& s); + Expression* makeGlobalGet(Element& s); + Expression* makeGlobalSet(Element& s); Expression* makeBlock(Element& s); Expression* makeThenOrElse(Element& s); Expression* makeConst(Element& s, Type type); -- cgit v1.2.3