summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/binaryen-shell.cpp1
-rw-r--r--src/wasm-s-parser.h3
-rw-r--r--src/wasm.h9
3 files changed, 4 insertions, 9 deletions
diff --git a/src/binaryen-shell.cpp b/src/binaryen-shell.cpp
index 68d00d019..866ea2fa4 100644
--- a/src/binaryen-shell.cpp
+++ b/src/binaryen-shell.cpp
@@ -376,7 +376,6 @@ int main(int argc, const char* argv[]) {
if (options.debug) std::cerr << "parsing text to s-expressions...\n";
SExpressionParser parser(input.data());
Element& root = *parser.root;
- if (options.debug) std::cout << root << '\n';
// A .wast may have multiple modules, with some asserts after them
bool checked = false;
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index c6cf1b32d..458d908d9 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -317,6 +317,7 @@ private:
// unnamed, use an index
func->name = Name::fromInt(functionCounter);
}
+ if (debug) std::cerr << "parse function " << func->name << '\n';
functionCounter++;
func->body = nullptr;
localIndex = 0;
@@ -416,7 +417,7 @@ public:
#define abort_on(str) { std::cerr << "aborting on " << str << '\n'; onError(); }
Expression* parseExpression(Element& s) {
- if (debug) std::cerr << "parse expression " << s << '\n';
+ //if (debug) std::cerr << "parse expression " << s << '\n';
IString id = s[0]->str();
const char *str = id.str;
const char *dot = strchr(str, '.');
diff --git a/src/wasm.h b/src/wasm.h
index 6aff3f55e..4c8dca331 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -104,6 +104,7 @@ inline const char* printWasmType(WasmType type) {
case WasmType::i64: return "i64";
case WasmType::f32: return "f32";
case WasmType::f64: return "f64";
+ case WasmType::unreachable: return "unreachable";
default: WASM_UNREACHABLE();
}
}
@@ -687,12 +688,6 @@ enum HostOp {
PageSize, MemorySize, GrowMemory, HasFeature
};
-#define assert_node(condition, node) \
- if (!(condition)) { \
- std::cerr << "node: " << (node) << std::endl; \
- assert(0 && #condition); \
- }
-
//
// Expressions
//
@@ -981,7 +976,7 @@ public:
if (isRelational()) {
type = i32;
} else {
- assert_node(left->type != unreachable && right->type != unreachable ? left->type == right->type : true, this);
+ assert(left->type != unreachable && right->type != unreachable ? left->type == right->type : true);
type = getReachableWasmType(left->type, right->type);
}
}