memory

4 files changed, 34 insertions, 7 deletions

diff --git a/src/asm2wasm-main.cpp b/src/asm2wasm-main.cpp
index 1a338831c..7c4d93052 100644
--- a/src/asm2wasm-main.cpp
+++ b/src/asm2wasm-main.cpp
@@ -52,7 +52,7 @@ int main(int argc, char **argv) {
 
   if (debug) std::cerr << "wasming...\n";
   Module wasm;
-  wasm.memorySize = 16*1024*1024; // we would normally receive this from the compiler
+  wasm.memory.initial = wasm.memory.max = 16*1024*1024; // we would normally receive this from the compiler
   Asm2WasmBuilder asm2wasm(wasm);
   asm2wasm.processAsm(asmjs);
 
diff --git a/src/wasm-js.cpp b/src/wasm-js.cpp
index 7eda4d10a..6a3e05725 100644
--- a/src/wasm-js.cpp
+++ b/src/wasm-js.cpp
@@ -51,7 +51,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE load_asm(char *input) {
   Ref asmjs = builder.parseToplevel(input);
 
   module = new Module();
-  module->memorySize = 16*1024*1024; // TODO: receive this from emscripten
+  module->memory.initial = module->memory.max = 16*1024*1024; // TODO: receive this from emscripten
 
   if (debug) std::cerr << "wasming...\n";
   asm2wasm = new Asm2WasmBuilder(*module);
diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index fbcf9fcbc..415936c0b 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -20,6 +20,7 @@ IString MODULE("module"),
         PARAM("param"),
         RESULT("result"),
         MEMORY("memory"),
+        SEGMENT("segment"),
         EXPORT("export"),
         IMPORT("import"),
         TABLE("table"),
@@ -611,7 +612,18 @@ private:
   }
 
   void parseMemory(Element& s) {
-    wasm.memorySize = atoi(s[1]->c_str());
+    wasm.memory.initial = atoi(s[1]->c_str());
+    if (s.size() == 2) return;
+    size_t i = 2;
+    if (s[i]->isStr()) {
+      wasm.memory.max = atoi(s[i]->c_str());
+      i++;
+    }
+    while (i < s.size()) {
+      Element& curr = *s[i];
+      assert(curr[0]->str() == SEGMENT);
+      
+    }
   }
 
   void parseExport(Element& s) {
diff --git a/src/wasm.h b/src/wasm.h
index 6655a167e..8b2f9ad94 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -798,6 +798,19 @@ public:
   }
 };
 
+class Memory {
+public:
+  struct Segment {
+    size_t offset;
+    const char* data;
+  };
+
+  size_t initial, max;
+  std::vector<Segment> segments;
+
+  Memory() : initial(0), max(0) {}
+};
+
 class Module {
 public:
   // wasm contents
@@ -806,18 +819,20 @@ public:
   std::vector<Export> exports;
   Table table;
   std::vector<Function*> functions;
-  size_t memorySize;
+  Memory memory;
 
-  Module() : memorySize(0) {}
+  Module() {}
 
   friend std::ostream& operator<<(std::ostream &o, Module module) {
     unsigned indent = 0;
     printOpening(o, "module", true);
     incIndent(o, indent);
     doIndent(o, indent);
-    if (module.memorySize) {
-      printOpening(o, "memory") << " " << module.memorySize << " " << module.memorySize << ")\n";
+    printOpening(o, "memory") << " " << module.memory.initial << " " << module.memory.max;
+    for (auto segment : module.memory.segments) {
+      o << " (segment " << segment.offset << " \"" << segment.data << "\")";
     }
+    o << ")\n";
     for (auto& curr : module.functionTypes) {
       doIndent(o, indent);
       curr.second->print(o, indent, true);