Support 4GB Memories (#1702)

This fixes asm2wasm parsing of the max to allow 4GB, and also changes the internal Memory::kMaxValue values to reflect that. We used to use kMaxValue to also represent "no limit", so I split that out into kUnlimitedValue.

2 files changed, 5 insertions, 5 deletions

diff --git a/src/tools/asm2wasm.cpp b/src/tools/asm2wasm.cpp
index 1cf7947ce..cc9464434 100644
--- a/src/tools/asm2wasm.cpp
+++ b/src/tools/asm2wasm.cpp
@@ -197,11 +197,11 @@ int main(int argc, const char *argv[]) {
   // Set the max memory size, if requested
   const auto &memMax = options.extra.find("mem max");
   if (memMax != options.extra.end()) {
-    int max = atoi(memMax->second.c_str());
-    if (max >= 0) {
+    uint64_t max = strtoull(memMax->second.c_str(), nullptr, 10);
+    if (max != uint64_t(-1)) {
       wasm.memory.max = max / Memory::kPageSize;
     } else {
-      wasm.memory.max = Memory::kMaxSize;
+      wasm.memory.max = Memory::kUnlimitedSize;
     }
   }
   // Set the table sizes, if requested
@@ -211,7 +211,7 @@ int main(int argc, const char *argv[]) {
     if (max >= 0) {
       wasm.table.max = max;
     } else {
-      wasm.table.max = Table::kMaxSize;
+      wasm.table.max = Table::kUnlimitedSize;
     }
   }
 
diff --git a/src/tools/fuzzing.h b/src/tools/fuzzing.h
index 062fc29a6..fe31290d6 100644
--- a/src/tools/fuzzing.h
+++ b/src/tools/fuzzing.h
@@ -268,7 +268,7 @@ private:
 
   void finalizeTable() {
     wasm.table.initial = wasm.table.segments[0].data.size();
-    wasm.table.max = oneIn(2) ? Address(Table::kMaxSize) : wasm.table.initial;
+    wasm.table.max = oneIn(2) ? Address(Table::kUnlimitedSize) : wasm.table.initial;
   }
 
   const Name HANG_LIMIT_GLOBAL = "hangLimit";