Changing Vec<String> of call_stack in thread_context to Vec<(u64, u64)> to run without allocation.

Author: acheron2302

crates/libmwemu/src/emu/call_stack.rs

@@ -1,11 +1,11 @@
 use crate::emu::Emu;
 
 impl Emu {
-    pub fn call_stack(&self) -> &Vec<String> {
+    pub fn call_stack(&self) -> &Vec<(u64, u64)> {
         &self.threads[self.current_thread_id].call_stack
     }
 
-    pub fn call_stack_mut(&mut self) -> &mut Vec<String> {
+    pub fn call_stack_mut(&mut self) -> &mut Vec<(u64, u64)> {
         &mut self.threads[self.current_thread_id].call_stack
     }
 }

crates/libmwemu/src/emu/disassemble.rs …ates/libmwemu/src/emu/disassemble/mod.rscrates/libmwemu/src/emu/disassemble.rs renamed to crates/libmwemu/src/emu/disassemble/mod.rs crates/libmwemu/src/emu/disassemble.rs renamed to crates/libmwemu/src/emu/disassemble/mod.rs

@@ -4,14 +4,14 @@ use serde::{Deserialize, Serialize};
 
 // about 10 mb should be on l3 cache
 // 8192 cache lines,
-// 32 instructions for each one,
+// 64 instructions for each one,
 // 40 for the struct (I think we can make it smaller)
-const INSTRUCTION_ARRAY_SIZE: usize = 8192 * 32;
+const INSTRUCTION_ARRAY_SIZE: usize = 8192 * 64;
 
-// we want the cache size to be store in L1 cache which is lower than 40kb
-const CACHE_SIZE: usize = 2048 * 16;
+// we want the cache size to be store in L1 cache or L2 cache which is lower than 40kb
+const CACHE_SIZE: usize = 2048 * MAX_CACHE_PER_LINE;
 const CACHE_MASK: usize = CACHE_SIZE - 1; // Assumes power of 2
-const MAX_CACHE_PER_LINE: usize = 16;
+const MAX_CACHE_PER_LINE: usize = 32;
 
 // we need INVALID_KEY and INVALID_LEN to be the same as INVALID_LPF_ADDR to optimize for memset
 pub const INVALID_LPF_ADDR: u64 = 0xffffffffffffffff;
@@ -146,6 +146,7 @@ impl InstructionCache {
             self.flush_cache();
         }
 
+        // we just need to decode until the  call or jump instruction but not the entire one
         while decoder.can_decode() && decoder.position() + addition <= max_position {
             decoder.decode_out(&mut self.instructions[slot + count]);
             let temp = self.instructions[slot + count];

crates/libmwemu/src/emu_context.rs

@@ -127,7 +127,7 @@ pub fn log_emu_state(emu: &mut Emu) {
             emu.call_stack().len().min(10)
         );
         for (i, entry) in emu.call_stack().iter().rev().take(10).enumerate() {
-            log::error!("  {}: {}", i, entry);
+            log::error!("  {}: {:x}:call:{:x}", i, entry.0, entry.1);
         }
     }
 

crates/libmwemu/src/engine/instructions/call.rs

@@ -35,10 +35,9 @@ pub fn execute(emu: &mut Emu, ins: &Instruction, instruction_sz: usize, _rep_ste
           emu.stack_lvl.push(0);
           emu.stack_lvl_idx += 1;
       }*/
-
-    let call_stack_label = format!("{:x}:call:{:x}", emu.regs().rip, addr);
-
-    emu.call_stack_mut().push(call_stack_label);
+    
+    let rip = emu.regs().rip;
+    emu.call_stack_mut().push((rip, addr));
 
     if emu.cfg.is_64bits {
         if !emu.stack_push64(emu.regs().rip + instruction_sz as u64) {

crates/libmwemu/src/serialization/emu.rs

@@ -82,7 +82,7 @@ pub struct SerializableEmu {
     pub rep: Option<u64>,
     pub tick: usize,
     pub base: u64,
-    pub call_stack: Vec<String>,
+    pub call_stack: Vec<(u64, u64)>,
     pub heap_addr: u64,
     pub threads: Vec<SerializableThreadContext>,
     pub current_thread_id: usize,

crates/libmwemu/src/serialization/thread_context.rs

@@ -29,7 +29,7 @@ pub struct SerializableThreadContext {
     pub tls64: Vec<u64>,
     pub fls: Vec<u32>,
     pub fs: BTreeMap<u64, u64>,
-    pub call_stack: Vec<String>,
+    pub call_stack: Vec<(u64, u64)>, // the first address is the source of the call location and the second address is the destination of the call
 }
 
 impl From<&ThreadContext> for SerializableThreadContext {

crates/libmwemu/src/thread_context.rs

@@ -24,7 +24,7 @@ pub struct ThreadContext {
     pub tls64: Vec<u64>,
     pub fls: Vec<u32>,
     pub fs: BTreeMap<u64, u64>,
-    pub call_stack: Vec<String>,
+    pub call_stack: Vec<(u64, u64)>,
 }
 
 impl ThreadContext {
@@ -50,7 +50,7 @@ impl ThreadContext {
             tls64: Vec::new(),
             fls: Vec::new(),
             fs: BTreeMap::new(),
-            call_stack: Vec::new(),
+            call_stack: Vec::with_capacity(10000),
         }
     }
 }