diff options
author | Heejin Ahn <aheejin@gmail.com> | 2019-05-21 13:25:14 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-21 13:25:14 -0700 |
commit | 1a3c1a58cc7e97a846f612baf7f74a370980458f (patch) | |
tree | cbe62ea58b2c0dd6d98225265419fea0b829aeab /src/passes/Print.cpp | |
parent | d78be9ac6c02910bbf8ac71118e68adff4fdc570 (diff) | |
download | binaryen-1a3c1a58cc7e97a846f612baf7f74a370980458f.tar.gz binaryen-1a3c1a58cc7e97a846f612baf7f74a370980458f.tar.bz2 binaryen-1a3c1a58cc7e97a846f612baf7f74a370980458f.zip |
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.
Diffstat (limited to 'src/passes/Print.cpp')
-rw-r--r-- | src/passes/Print.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp index 73d91b9ce..fb85023f0 100644 --- a/src/passes/Print.cpp +++ b/src/passes/Print.cpp @@ -111,10 +111,10 @@ struct PrintExpressionContents : public Visitor<PrintExpressionContents> { void visitCallIndirect(CallIndirect* curr) { printMedium(o, "call_indirect (type ") << curr->fullType << ')'; } - void visitGetLocal(GetLocal* curr) { + void visitLocalGet(LocalGet* curr) { printMedium(o, "local.get ") << printableLocal(curr->index, currFunction); } - void visitSetLocal(SetLocal* curr) { + void visitLocalSet(LocalSet* curr) { if (curr->isTee()) { printMedium(o, "local.tee "); } else { @@ -122,11 +122,11 @@ struct PrintExpressionContents : public Visitor<PrintExpressionContents> { } o << printableLocal(curr->index, currFunction); } - void visitGetGlobal(GetGlobal* curr) { + void visitGlobalGet(GlobalGet* curr) { printMedium(o, "global.get "); printName(curr->name, o); } - void visitSetGlobal(SetGlobal* curr) { + void visitGlobalSet(GlobalSet* curr) { printMedium(o, "global.set "); printName(curr->name, o); } @@ -1140,11 +1140,11 @@ struct PrintExpressionContents : public Visitor<PrintExpressionContents> { void visitReturn(Return* curr) { printMedium(o, "return"); } void visitHost(Host* curr) { switch (curr->op) { - case CurrentMemory: - printMedium(o, "current_memory"); + case MemorySize: + printMedium(o, "memory.size"); break; - case GrowMemory: - printMedium(o, "grow_memory"); + case MemoryGrow: + printMedium(o, "memory.grow"); break; } } @@ -1402,24 +1402,24 @@ struct PrintSExpression : public Visitor<PrintSExpression> { printFullLine(curr->target); decIndent(); } - void visitGetLocal(GetLocal* curr) { + void visitLocalGet(LocalGet* curr) { o << '('; PrintExpressionContents(currFunction, o).visit(curr); o << ')'; } - void visitSetLocal(SetLocal* curr) { + void visitLocalSet(LocalSet* curr) { o << '('; PrintExpressionContents(currFunction, o).visit(curr); incIndent(); printFullLine(curr->value); decIndent(); } - void visitGetGlobal(GetGlobal* curr) { + void visitGlobalGet(GlobalGet* curr) { o << '('; PrintExpressionContents(currFunction, o).visit(curr); o << ')'; } - void visitSetGlobal(SetGlobal* curr) { + void visitGlobalSet(GlobalSet* curr) { o << '('; PrintExpressionContents(currFunction, o).visit(curr); incIndent(); @@ -1600,13 +1600,13 @@ struct PrintSExpression : public Visitor<PrintSExpression> { o << '('; PrintExpressionContents(currFunction, o).visit(curr); switch (curr->op) { - case GrowMemory: { + case MemoryGrow: { incIndent(); printFullLine(curr->operands[0]); decIndent(); break; } - case CurrentMemory: { + case MemorySize: { o << ')'; } } |