conitue with wasmer

Cargo.toml

@@ -12,9 +12,9 @@ getrandom = {version = "0.2", features = ["js"]}
 wasm-bindgen = "0.2"
 wasm-bindgen-test = "0.3.30"
 # wasmer = {git = "https://github.com/Multi-V-VM/wasmer"}
-wasmer-compiler-cranelift = {path = "../wasmer/lib/compiler-cranelift"}
+wasmer = "4.2.5"
 zero = "0.1.2"
-
+wasmer-compiler-cranelift = "4.2.5"
 [lib]
 crate-type = ["cdylib", "rlib"]
 

examples/doublejit-runner.rs

@@ -8,5 +8,5 @@ fn main(){
     )))
     .unwrap();
     // middle end, invoke native and have lock to prevent execution
-
+    // let mut middleend = MiddleEnd::new();
 }

src/codegen/optimizer.rs

@@ -1 +1 @@
-
+// passes

src/frontend/binary.rs

@@ -135,9 +135,9 @@ impl<'a> Binary<'a> {
         );
         section_iter.next();
         for sh in section_iter {
-            dbg!(" {}", sh.get_data(&elf));
+            dbg!(" {},", sh.get_data(&elf));
         }
-
+        
         Ok(Self { pages })
     }
 }

src/frontend/cache.rs

@@ -17,5 +17,5 @@ impl CodeCache {
     }
     pub fn set(&mut self, addr: u64, instruction: Instruction) {
         self.cache.insert(addr, instruction);
-    }
+    } // cache for function and cache for instruction
 }

src/frontend/elf.rs

@@ -1221,7 +1221,7 @@ impl ProgramHeader32 {
         }
     }
     pub fn get_data<'a>(&self, elf: &ElfFile<'a>) -> ParseResult<SegmentData<'a>> {
-        self.get_type().map(|typ| match typ {
+        let _ = self.get_type().map(|typ| match typ {
             ProgramHeaderType::Null => SegmentData::Empty,
             ProgramHeaderType::Dynamic => {
                 let data = self.raw_data(elf);
@@ -1273,7 +1273,7 @@ impl ProgramHeader64 {
         }
     }
     pub fn get_data<'a>(&self, elf: &ElfFile<'a>) -> ParseResult<SegmentData<'a>> {
-        self.get_type().map(|typ| match typ {
+        let _ = self.get_type().map(|typ| match typ {
             ProgramHeaderType::Null => SegmentData::Empty,
             ProgramHeaderType::Dynamic => {
                 let data = self.raw_data(elf);

src/frontend/instruction.rs

@@ -2253,10 +2253,10 @@ impl Instruction {
                     0b01 => Some(r4!(rv32_no_e, RV32D, FNMSUB_D, bit_u32, fp)),
                     _ => None,
                 },
-                0b0000111 => {
-                    #[rustfmt::skip]
-                    match bit_u32 {
-                        x if x & 0b11111111111100000111000001111111 == 0b00000010101100000000000000000111 => Some(r4!(rv32_v, RV32V, VLM_V, bit_u32, fp)),
+                // 0b0000111 => {
+                //     #[rustfmt::skip]
+                //     match bit_u32 {
+                //         x if x & 0b11111111111100000111000001111111 == 0b00000010101100000000000000000111 => Some(r4!(rv32_v, RV32V, VLM_V, bit_u32, fp)),
                         // x if x & 0b00011101111100000111000001111111 == 0b00000000000000000000000000000111 => Some(VLE8_V),
                         // x if x & 0b00011101111100000111000001111111 == 0b00000000000000000101000000000111 => Some(VLE16_V),
                         // x if x & 0b00011101111100000111000001111111 == 0b00000000000000000110000000000111 => Some(VLE32_V),
@@ -2305,9 +2305,9 @@ impl Instruction {
                         // x if x & 0b11111111111100000111000001111111 == 0b_11100010100000000101000000000111 => Some(VL8RE16_V),
                         // x if x & 0b11111111111100000111000001111111 == 0b_11100010100000000110000000000111 => Some(VL8RE32_V),
                         // x if x & 0b11111111111100000111000001111111 == 0b_11100010100000000111000000000111 => Some(VL8RE64_V),
-                        _ => None,
-                    }
-                },
+                //         _ => None,
+                //     }
+                // },
                 // 0b0100111 => {
                 //             #[rustfmt::skip]
                 //             match bit_u32 {

src/frontend/v.rs

@@ -1,4 +1,5 @@
 use crate::frontend::VLEN;
+use crate::frontend::ELEN;
 
 pub struct V {
     vstart: u64,

src/lib.rs

@@ -6,7 +6,6 @@ extern crate alloc;
 #[cfg(any(test, feature = "std"))]
 extern crate std;
 
-mod cache;
 mod codegen;
 mod frontend;
 mod middleend;

src/middleend/mod.rs

@@ -1 +1,2 @@
-mod address_map;
+mod address_map;
+mod wasm_module;

src/wasm/wasm_builder.rs

@@ -1 +1,3 @@
-use wasmer_compiler_cranelift::CraneliftCompiler;
+use wasmer::{Memory, MemoryType, Pages, Store, Type, Value, WASM_MAX_PAGES};
+use wasmer::Engine;
+use wasmer_compiler_cranelift::Cranelift;