3 files changed, 68 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bc075550..032c47e75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,7 @@ TARGET_LINK_LIBRARIES(binaryen asmjs ${all_passes} support)
 
 SET(wasm-shell_SOURCES
   src/tools/wasm-shell.cpp
+  src/wasm-interpreter.cpp
   src/wasm.cpp
 )
 ADD_EXECUTABLE(wasm-shell
diff --git a/src/wasm-interpreter.cpp b/src/wasm-interpreter.cpp
new file mode 100644
index 000000000..e7df785ac
--- /dev/null
+++ b/src/wasm-interpreter.cpp
@@ -0,0 +1,24 @@
+#include "wasm-interpreter.h"
+
+namespace wasm {
+
+#ifdef WASM_INTERPRETER_DEBUG
+int Indenter::indentLevel = 0;
+
+Indenter::Indenter(const char* entry) : entryName(entry) {
+  ++indentLevel;
+}
+Indenter::~Indenter() {
+  print();
+  std::cout << "exit " << entryName << '\n';
+  --indentLevel;
+}
+void Indenter::print() {
+  std::cout << indentLevel << ':';
+  for (int i = 0; i <= indentLevel; ++i) {
+    std::cout << ' ';
+  }
+}
+#endif // WASM_INTERPRETER_DEBUG
+
+} // namespace wasm
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index 942ba1ab6..f2c75cbc1 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -28,6 +28,7 @@
 
 #include "support/bits.h"
 #include "wasm.h"
+#include "wasm-traversal.h"
 
 #ifdef WASM_INTERPRETER_DEBUG
 #include "wasm-printing.h"
@@ -75,11 +76,33 @@ typedef std::vector<Literal> LiteralList;
 
 // Debugging helpers
 #ifdef WASM_INTERPRETER_DEBUG
-#define NOTE_ENTER(x) { std::cout << "visit " << x << " : " << curr << "\n"; }
-#define NOTE_ENTER_(x) { std::cout << "visit " << x << "\n"; }
-#define NOTE_NAME(p0) { std::cout << "name " << '('  << Name(p0) << ")\n"; }
-#define NOTE_EVAL1(p0) { std::cout << "eval " << '('  << p0 << ")\n"; }
-#define NOTE_EVAL2(p0, p1) { std::cout << "eval " << '('  << p0 << ", " << p1 << ")\n"; }
+class Indenter {
+  static int indentLevel;
+
+  const char* entryName;
+
+public:
+  Indenter(const char* entry);
+  ~Indenter();
+
+  static void print();
+};
+
+#define NOTE_ENTER(x) Indenter _int_blah(x); { \
+    Indenter::print(); \
+    std::cout << "visit " << x << " : " << curr << "\n"; }
+#define NOTE_ENTER_(x) Indenter _int_blah(x); { \
+    Indenter::print(); \
+    std::cout << "visit " << x << "\n"; }
+#define NOTE_NAME(p0) { \
+    Indenter::print(); \
+    std::cout << "name " << '(' << Name(p0) << ")\n"; }
+#define NOTE_EVAL1(p0) { \
+    Indenter::print(); \
+    std::cout << "eval " #p0 " (" << p0 << ")\n"; }
+#define NOTE_EVAL2(p0, p1) { \
+    Indenter::print(); \
+    std::cout << "eval " #p0 " (" << p0 << "), " #p1 " (" << p1 << ")\n"; }
 #else // WASM_INTERPRETER_DEBUG
 #define NOTE_ENTER(x)
 #define NOTE_ENTER_(x)
@@ -725,7 +748,12 @@ public:
         NOTE_ENTER("Load");
         Flow flow = visit(curr->ptr);
         if (flow.breaking()) return flow;
-        return instance.externalInterface->load(curr, instance.getFinalAddress(curr, flow.value));
+        NOTE_EVAL1(flow);
+        auto addr = instance.getFinalAddress(curr, flow.value);
+        auto ret = instance.externalInterface->load(curr, addr);
+        NOTE_EVAL1(addr);
+        NOTE_EVAL1(ret);
+        return ret;
       }
       Flow visitStore(Store *curr) {
         NOTE_ENTER("Store");
@@ -733,7 +761,10 @@ public:
         if (ptr.breaking()) return ptr;
         Flow value = visit(curr->value);
         if (value.breaking()) return value;
-        instance.externalInterface->store(curr, instance.getFinalAddress(curr, ptr.value), value.value);
+        auto addr = instance.getFinalAddress(curr, ptr.value);
+        NOTE_EVAL1(addr);
+        NOTE_EVAL1(value);
+        instance.externalInterface->store(curr, addr, value.value);
         return Flow();
       }
 
@@ -781,7 +812,11 @@ public:
     FunctionScope scope(function, arguments);
 
 #ifdef WASM_INTERPRETER_DEBUG
-    std::cout << "entering " << function->name << '\n';
+    std::cout << "entering " << function->name
+              << "\n  with arguments:\n";
+    for (unsigned i = 0; i < arguments.size(); ++i) {
+      std::cout << "    $" << i << ": " << arguments[i] << '\n';
+    }
 #endif
 
     Flow flow = RuntimeExpressionRunner(*this, scope).visit(function->body);