From d3fcb596b3b2d09b2e19b2a4ea5f94d0629251c1 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Sat, 11 Aug 2018 08:05:35 -0700
Subject: [PATCH] Support multiple memory spaces.

---
 lib/environ/src/environ.rs | 17 +++++++++--------
 lib/execute/src/execute.rs | 11 +++++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/environ/src/environ.rs b/lib/environ/src/environ.rs
index 8616468c8c..08583fb784 100644
--- a/lib/environ/src/environ.rs
+++ b/lib/environ/src/environ.rs
@@ -411,12 +411,12 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
         _heap: ir::Heap,
         val: ir::Value,
     ) -> WasmResult<ir::Value> {
-        debug_assert_eq!(index, 0, "non-default memories not supported yet");
         let grow_mem_func = self.grow_memory_extfunc.unwrap_or_else(|| {
             let sig_ref = pos.func.import_signature(Signature {
                 call_conv: self.isa.flags().call_conv(),
                 argument_bytes: None,
                 params: vec![
+                    AbiParam::new(I32),
                     AbiParam::new(I32),
                     AbiParam::special(self.pointer_type(), ArgumentPurpose::VMContext),
                 ],
@@ -433,8 +433,9 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
             })
         });
         self.grow_memory_extfunc = Some(grow_mem_func);
+        let memory_index = pos.ins().iconst(I32, index as i64);
         let vmctx = pos.func.special_param(ArgumentPurpose::VMContext).unwrap();
-        let call_inst = pos.ins().call(grow_mem_func, &[val, vmctx]);
+        let call_inst = pos.ins().call(grow_mem_func, &[val, memory_index, vmctx]);
         Ok(*pos.func.dfg.inst_results(call_inst).first().unwrap())
     }
 
@@ -444,15 +445,14 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
         index: MemoryIndex,
         _heap: ir::Heap,
     ) -> WasmResult<ir::Value> {
-        debug_assert_eq!(index, 0, "non-default memories not supported yet");
         let cur_mem_func = self.current_memory_extfunc.unwrap_or_else(|| {
             let sig_ref = pos.func.import_signature(Signature {
                 call_conv: self.isa.flags().call_conv(),
                 argument_bytes: None,
-                params: vec![AbiParam::special(
-                    self.pointer_type(),
-                    ArgumentPurpose::VMContext,
-                )],
+                params: vec![
+                    AbiParam::new(I32),
+                    AbiParam::special(self.pointer_type(), ArgumentPurpose::VMContext),
+                ],
                 returns: vec![AbiParam::new(I32)],
             });
             // We currently allocate all code segments independently, so nothing
@@ -466,8 +466,9 @@ impl<'module_environment> cranelift_wasm::FuncEnvironment for FuncEnvironment<'m
             })
         });
         self.current_memory_extfunc = Some(cur_mem_func);
+        let memory_index = pos.ins().iconst(I32, index as i64);
         let vmctx = pos.func.special_param(ArgumentPurpose::VMContext).unwrap();
-        let call_inst = pos.ins().call(cur_mem_func, &[vmctx]);
+        let call_inst = pos.ins().call(cur_mem_func, &[memory_index, vmctx]);
         Ok(*pos.func.dfg.inst_results(call_inst).first().unwrap())
     }
 }
diff --git a/lib/execute/src/execute.rs b/lib/execute/src/execute.rs
index 6abfdf3f69..dca7e8472c 100644
--- a/lib/execute/src/execute.rs
+++ b/lib/execute/src/execute.rs
@@ -1,5 +1,6 @@
 use cranelift_codegen::binemit::Reloc;
 use cranelift_codegen::isa::TargetIsa;
+use cranelift_wasm::MemoryIndex;
 use instance::Instance;
 use memory::LinearMemory;
 use region::protect;
@@ -64,20 +65,22 @@ fn relocate(compilation: &mut Compilation, relocations: &[Vec<Relocation>]) {
     }
 }
 
-extern "C" fn grow_memory(size: u32, vmctx: *mut *mut u8) -> u32 {
+extern "C" fn grow_memory(size: u32, memory_index: u32, vmctx: *mut *mut u8) -> u32 {
     unsafe {
         let instance = (*vmctx.offset(4)) as *mut Instance;
         (*instance)
-            .memory_mut(0)
+            .memory_mut(memory_index as MemoryIndex)
             .grow(size)
             .unwrap_or(u32::max_value())
     }
 }
 
-extern "C" fn current_memory(vmctx: *mut *mut u8) -> u32 {
+extern "C" fn current_memory(memory_index: u32, vmctx: *mut *mut u8) -> u32 {
     unsafe {
         let instance = (*vmctx.offset(4)) as *mut Instance;
-        (*instance).memory_mut(0).current_size()
+        (*instance)
+            .memory_mut(memory_index as MemoryIndex)
+            .current_size()
     }
 }