diff options
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/decompiler-ast.inl | 14 | ||||
| -rw-r--r-- | src/decompiler.cc | 26 | ||||
| -rw-r--r-- | test/decompile/basic.txt | 76 | ||||
| -rw-r--r-- | test/find_exe.py | 6 | ||||
| -rwxr-xr-x | test/run-tests.py | 4 |
6 files changed, 113 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cca9006..6e4fea6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ option(USE_UBSAN "Use undefined behavior sanitizer" OFF) option(CODE_COVERAGE "Build with code coverage enabled" OFF) option(WITH_EXCEPTIONS "Build with exceptions enabled" OFF) option(WERROR "Build with warnings as errors" OFF) -option(WIP_TOOLS "Build Work-In-Progress functionality" OFF) if (CMAKE_C_COMPILER_ID MATCHES "Clang") set(COMPILER_IS_CLANG 1) @@ -432,14 +431,12 @@ if (NOT EMSCRIPTEN) INSTALL ) - if (WIP_TOOLS) - # wasm-decompile - wabt_executable( - NAME wasm-decompile - SOURCES src/tools/wasm-decompile.cc - INSTALL - ) - endif() + # wasm-decompile + wabt_executable( + NAME wasm-decompile + SOURCES src/tools/wasm-decompile.cc + INSTALL + ) endif () find_package(Threads) diff --git a/src/decompiler-ast.inl b/src/decompiler-ast.inl index b8a02bbc..d7a5284a 100644 --- a/src/decompiler-ast.inl +++ b/src/decompiler-ast.inl @@ -58,13 +58,14 @@ struct Node { // Node specific annotations. union { LabelType lt; // br/br_if target. + const Var* var; // Decl/DeclInit. }; Node() : ntype(NodeType::Expr), etype(ExprType::Nop), e(nullptr), - lt(LabelType::First) {} - Node(NodeType ntype, ExprType etype, const Expr* e) - : ntype(ntype), etype(etype), e(e), lt(LabelType::First) {} + var(nullptr) {} + Node(NodeType ntype, ExprType etype, const Expr* e, const Var* v) + : ntype(ntype), etype(etype), e(e), var(v) {} // This value should really never be copied, only moved. Node(Node&& rhs) = default; @@ -90,7 +91,7 @@ struct AST { void NewNode(NodeType ntype, ExprType etype, const Expr* e, Index nargs) { assert(stack.size() >= nargs); - Node n { ntype, etype, e }; + Node n { ntype, etype, e, nullptr }; n.children.reserve(nargs); std::move(stack.end() - nargs, stack.end(), std::back_inserter(n.children)); @@ -100,7 +101,7 @@ struct AST { template<ExprType T> void PreDecl(const VarExpr<T>& ve) { stack.emplace(stack.begin() + pre_decl_insertion_point++, - NodeType::Decl, ExprType::Nop, &ve); + NodeType::Decl, ExprType::Nop, nullptr, &ve.var); } template<ExprType T> void Get(const VarExpr<T>& ve, bool local) { @@ -116,7 +117,8 @@ struct AST { if (local && vars_defined.insert(ve.var.name()).second) { if (stack_depth == 1) { // Top level, declare it here. - NewNode(NodeType::DeclInit, ExprType::Nop, &ve, 1); + NewNode(NodeType::DeclInit, ExprType::Nop, nullptr, 1); + stack.back().var = &ve.var; return; } else { // Inside exp, better leave it as assignment exp and lift the decl out. diff --git a/src/decompiler.cc b/src/decompiler.cc index 76d9e873..33597df7 100644 --- a/src/decompiler.cc +++ b/src/decompiler.cc @@ -253,17 +253,13 @@ struct Decompiler { return WrapNAry(args, "return ", ""); } case NodeType::Decl: { - // FIXME: this is icky. - auto lg = reinterpret_cast<const VarExpr<ExprType::LocalGet> *>(n.e); - ss << "var " << lg->var.name() << ":" - << GetDecompTypeName(cur_func->GetLocalType(lg->var)); + ss << "var " << n.var->name() << ":" + << GetDecompTypeName(cur_func->GetLocalType(*n.var)); return PushSStream(); } case NodeType::DeclInit: { - // FIXME: this is icky. - auto lg = reinterpret_cast<const VarExpr<ExprType::LocalGet> *>(n.e); - return WrapChild(args[0], "var " + lg->var.name() + ":" - + GetDecompTypeName(cur_func->GetLocalType(lg->var)) + " = ", ""); + return WrapChild(args[0], "var " + n.var->name() + ":" + + GetDecompTypeName(cur_func->GetLocalType(*n.var)) + " = ", ""); } case NodeType::Expr: // We're going to fall thru to the second switch to deal with ExprType. @@ -279,12 +275,18 @@ struct Decompiler { case Type::I64: ss << static_cast<int64_t>(c.u64) << "L"; break; - case Type::F32: - ss << *reinterpret_cast<const float *>(&c.f32_bits) << "f"; + case Type::F32: { + float f; + memcpy(&f, &c.f32_bits, sizeof(float)); + ss << f << "f"; break; - case Type::F64: - ss << *reinterpret_cast<const double *>(&c.f64_bits) << "d"; + } + case Type::F64: { + double d; + memcpy(&d, &c.f64_bits, sizeof(double)); + ss << d << "d"; break; + } case Type::V128: ss << "V128"; // FIXME break; diff --git a/test/decompile/basic.txt b/test/decompile/basic.txt new file mode 100644 index 00000000..7e529fc0 --- /dev/null +++ b/test/decompile/basic.txt @@ -0,0 +1,76 @@ +;;; TOOL: run-wasm-decompile + +(module + (memory 1) + (func $f (param i32 i32) (result i32) (local i64 f32 f64) + i64.const 8 + set_local 2 + f32.const 6.0 + set_local 3 + f64.const 7.0 + tee_local 4 + f64.const 10.0 + f64.lt + if + i32.const 1 + i32.const 2 + i32.load offset=3 + i32.const 5 + i32.add + i32.store offset=4 + end + get_local 0 + get_local 1 + i32.add + i32.const 9 + call $f + drop + loop + block + i32.const 0 + if (result i32) + i32.const 1 + else + i32.const 2 + end + br_if 0 + br 1 + end + i32.const 1 + br_if 0 + end + call $mv + i32.eq + ) + (func $mv (param) (result i32 i32) + i32.const 1 + i32.const 2 + ) + (export "f" (func $f)) + (export "mv" (func $mv)) +) + +(;; STDOUT ;;; + +function f(a:int, b:int):int { + var c:long = 8L; + var d:float = 6f; + var e:double = 7d; + if (e < 10d) { 1[4]:int = (2[3]:int + 5) } + f(a + b, 9); + loop L_b { + block B_c { + if (if (0) { 1 } else { 2 }) break B_c; + continue L_b; + } + if (1) continue L_b; + } + push_all(mv()); + return pop() == pop(); +} + +function mv():(int, int) { + return 1, 2 +} + +;;; STDOUT ;;) diff --git a/test/find_exe.py b/test/find_exe.py index 80ea407d..d989879e 100644 --- a/test/find_exe.py +++ b/test/find_exe.py @@ -26,7 +26,7 @@ REPO_ROOT_DIR = os.path.dirname(SCRIPT_DIR) EXECUTABLES = [ 'wat2wasm', 'wast2json', 'wasm2wat', 'wasm-objdump', 'wasm-interp', 'wasm-opcodecnt', 'wat-desugar', 'spectest-interp', 'wasm-validate', - 'wasm2c', 'wasm-strip' + 'wasm2c', 'wasm-strip', 'wasm-decompile' ] GEN_WASM_PY = os.path.join(SCRIPT_DIR, 'gen-wasm.py') @@ -110,3 +110,7 @@ def GetWasm2CExecutable(override=None): def GetWasmStripExecutable(override=None): return FindExecutable('wasm-strip', override) + + +def GetWasmDecompileExecutable(override=None): + return FindExecutable('wasm-decompile', override) diff --git a/test/run-tests.py b/test/run-tests.py index 021391c1..5b0291fd 100755 --- a/test/run-tests.py +++ b/test/run-tests.py @@ -138,6 +138,10 @@ TOOLS = { '%(out_dir)s', ]), ('VERBOSE-ARGS', ['--print-cmd', '-v']), + ], + 'run-wasm-decompile': [ + ('RUN', '%(wat2wasm)s --enable-multi-value %(in_file)s -o %(temp_file)s.wasm'), + ('RUN', '%(wasm-decompile)s --enable-multi-value %(temp_file)s.wasm'), ] } |