2 files changed, 35 insertions, 3 deletions
diff --git a/src/wasm-shell.cpp b/src/wasm-shell.cpp
index 6edd34bed..1f242860d 100644
--- a/src/wasm-shell.cpp
+++ b/src/wasm-shell.cpp
@@ -5,6 +5,36 @@
 
 #include "wasm-sexpr-parser.h"
 
-int main() {
+using namespace cashew;
+using namespace wasm;
+
+int main(int argc, char **argv) {
+  int debug = getenv("WASM_SHELL_DEBUG") ? getenv("WASM_SHELL_DEBUG")[0] - '0' : 0;
+
+  char *infile = argv[1];
+
+  if (debug) std::cerr << "loading '" << infile << "'...\n";
+  FILE *f = fopen(argv[1], "r");
+  assert(f);
+  fseek(f, 0, SEEK_END);
+  int size = ftell(f);
+  char *input = new char[size+1];
+  rewind(f);
+  int num = fread(input, 1, size, f);
+  // On Windows, ftell() gives the byte position (\r\n counts as two bytes), but when
+  // reading, fread() returns the number of characters read (\r\n is read as one char \n, and counted as one),
+  // so return value of fread can be less than size reported by ftell, and that is normal.
+  assert((num > 0 || size == 0) && num <= size);
+  fclose(f);
+  input[num] = 0;
+
+  if (debug) std::cerr << "parsing...\n";
+  Module wasm;
+  SExpressionWasmBuilder builder(wasm, input);
+
+  if (debug) std::cerr << "printing...\n";
+  std::cout << wasm;
+
+  if (debug) std::cerr << "done.\n";
 }
 
diff --git a/src/wasm.h b/src/wasm.h
index 06a9403d6..0fae2c719 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -784,14 +784,16 @@ public:
   std::vector<Function*> functions;
   size_t memorySize;
 
-  Module() {}
+  Module() : memorySize(0) {}
 
   friend std::ostream& operator<<(std::ostream &o, Module module) {
     unsigned indent = 0;
     printOpening(o, "module", true);
     incIndent(o, indent);
     doIndent(o, indent);
-    printOpening(o, "memory") << " " << module.memorySize << " " << module.memorySize << ")\n";
+    if (module.memorySize) {
+      printOpening(o, "memory") << " " << module.memorySize << " " << module.memorySize << ")\n";
+    }
     for (auto& curr : module.functionTypes) {
       doIndent(o, indent);
       curr.second->print(o, indent, true);