hacked together eir interperter on lumen runtime

Author: hansihe

Cargo.lock

@@ -14,6 +14,7 @@ members = [
   "liblumen_core",
   "liblumen_diagnostics",
   "liblumen_syntax",
+  "liblumen_eir_interpreter",
 ]
 
 [profile.release]

Cargo.toml

@@ -387,9 +387,10 @@ impl ProcessControlBlock {
         creator: Term,
         module_function_arity: Arc<ModuleFunctionArity>,
         code: Code,
+        env_hack: Vec<Term>,
     ) -> Result<Term, Alloc> {
         self.acquire_heap()
-            .closure(creator, module_function_arity, code)
+            .closure(creator, module_function_arity, code, env_hack)
     }
 
     /// Constructs a list of only the head and tail, and associated with the given process.

liblumen_alloc/src/erts/process.rs

@@ -158,8 +158,9 @@ pub trait HeapAlloc {
         creator: Term,
         module_function_arity: Arc<ModuleFunctionArity>,
         code: Code,
+        env_hack: Vec<Term>,
     ) -> Result<Term, Alloc> {
-        let closure = Closure::new(module_function_arity, code, creator);
+        let closure = Closure::new(module_function_arity, code, creator, env_hack);
 
         unsafe {
             let ptr = self.alloc_layout(Layout::new::<Closure>())?.as_ptr() as *mut Closure;

liblumen_alloc/src/erts/process/alloc/heap_alloc.rs

@@ -147,7 +147,7 @@ mod tuple_from_slice {
         };
 
         process
-            .closure(creator, module_function_arity, code)
+            .closure(creator, module_function_arity, code, vec![])
             .unwrap()
     }
 }

liblumen_alloc/src/erts/process/test.rs

@@ -21,12 +21,13 @@ pub struct Closure {
     module_function_arity: Arc<ModuleFunctionArity>,
     code: Code,     // pointer to function entry
     next: *mut u8,  // off heap header
+    pub env_hack: Vec<Term>,
     env_len: usize, // the number of free variables
     env: *mut Term, // pointer to first element of free variable array
 }
 
 impl Closure {
-    pub fn new(module_function_arity: Arc<ModuleFunctionArity>, code: Code, creator: Term) -> Self {
+    pub fn new(module_function_arity: Arc<ModuleFunctionArity>, code: Code, creator: Term, env_hack: Vec<Term>) -> Self {
         let env_len = 0;
 
         Self {
@@ -35,6 +36,7 @@ impl Closure {
             module_function_arity,
             code,
             next: ptr::null_mut(),
+            env_hack,
             env_len,
             env: ptr::null_mut(),
         }

liblumen_alloc/src/erts/term/closure.rs

@@ -1673,6 +1673,7 @@ pub enum BoolError {
 #[derive(Debug)]
 pub struct TypeError;
 
+#[derive(Debug)]
 pub enum TryIntoIntegerError {
     Type,
     OutOfRange,

liblumen_alloc/src/erts/term/term.rs

@@ -495,7 +495,7 @@ mod tests {
         };
 
         process
-            .closure(creator, module_function_arity, code)
+            .closure(creator, module_function_arity, code, vec![])
             .unwrap()
     }
 

liblumen_alloc/src/erts/term/tuple.rs

@@ -0,0 +1,25 @@
+[package]
+name = "liblumen_eir_interpreter"
+version = "0.1.0"
+authors = ["Hans Elias B. Josephsen <me@hansihe.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[[bin]]
+name = "run_file"
+path = "src/bin.rs"
+
+[dependencies]
+libeir_ir = { path = "../../core_erlang_3/libeir_ir" }
+libeir_syntax_erl = { path = "../../core_erlang_3/libeir_syntax_erl" }
+libeir_intern = { path = "../../core_erlang_3/libeir_intern" }
+libeir_diagnostics = { path = "../../core_erlang_3/libeir_diagnostics" }
+libeir_passes = { path = "../../core_erlang_3/libeir_passes" }
+cranelift-entity = "0.30.0"
+
+liblumen_alloc = { path = "../liblumen_alloc" }
+lumen_runtime = { path = "../lumen_runtime" }
+
+lazy_static = "1.3.0"
+clap = "2.33.0"

liblumen_eir_interpreter/Cargo.toml

@@ -0,0 +1 @@
+`cargo run -- --ident fib:run/0 fib.erl`