Merge pull request #140 from acheron2302/main

Adding heap management for allocation inside heap

Author: sha0coder

.github/workflows/ci.yaml

@@ -88,8 +88,8 @@ jobs:
       - name: Run coverage
         if: runner.os == 'Linux'
         run: |
-          cd crates/libmwemu
-          cargo tarpaulin --output-dir ../../ --out Xml --timeout 200
+          cargo tarpaulin --no-default-features --out Xml --timeout 200
+
 
       - name: Upload coverage reports to Codecov
         if: runner.os == 'Linux'

Cargo.lock

@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 members = [
- #   "crates/pymwemu",
+    "crates/pymwemu",
     "crates/libmwemu",
     "crates/mwemu",
 ]

Cargo.toml

@@ -35,6 +35,7 @@ bytemuck = "1.23.1"
 minidump = "0.26.0"
 serde_yaml = "0.9"
 fast_log = { version = "1.7" }
+nohash-hasher = "0.2.0"
 
 [dev-dependencies]
 env_logger = "0.11.8"

crates/libmwemu/Cargo.toml

@@ -20,6 +20,7 @@ use crate::{
 use crate::{get_bit, kuser_shared, set_bit, structures, winapi::winapi32, winapi::winapi64};
 
 use fast_log::appender::{Command, FastLogRecord, RecordFormat};
+use crate::maps::heap_allocation::O1Heap;
 
 pub struct CustomLogFormat;
 impl RecordFormat for CustomLogFormat {
@@ -94,6 +95,7 @@ impl Emu {
             definitions: HashMap::new(),
             stored_contexts: HashMap::new(),
             entropy: 0.0,
+            heap_management: None,
         }
     }
 
@@ -353,15 +355,18 @@ impl Emu {
         if dyn_link {
             //heap.set_base(0x555555579000);
         } else {
-            let heap_sz = 0x4d8000 - 0x4b5000;
+            // here we are allocating 4MB of heap memory
+            let heap_sz = 0x885900 - 0x4b5000;
             self.heap_addr = self.maps.alloc(heap_sz).expect("cannot allocate heap");
             let heap = self
                 .maps
-                .create_map("heap", self.heap_addr, heap_sz, Permission::READ_WRITE) //.create_map("heap", 0x4b5b00, 0x4d8000 - 0x4b5000)
+                .create_map(".heap", self.heap_addr, heap_sz, Permission::READ_WRITE) //.create_map("heap", 0x4b5b00, 0x4d8000 - 0x4b5000)
                 .expect("cannot create heap map");
             heap.load("heap.bin");
-        }
 
+            self.heap_management = Some(Box::new(O1Heap::new(self.heap_addr, heap_sz as u32).expect("Expect new heap_management but failed")));
+        }
+        
         self.regs_mut().rbp = 0;
 
         self.fs_mut().insert(0xffffffffffffffc8, 0); //0x4b6c50
@@ -521,5 +526,14 @@ impl Emu {
         let stack_size = 0x100000;
         teb.nt_tib.stack_limit = self.cfg.stack_addr + stack_size + 0x2000;
         teb.save(teb_map);
+
+        let heap_sz = 0x885900 - 0x4b5000;
+        self.heap_addr = self.maps.alloc(heap_sz).expect("cannot allocate heap");
+        let heap = self
+            .maps
+            .create_map(".heap", self.heap_addr, heap_sz, Permission::READ_WRITE)
+            .expect("cannot create heap map");
+
+        self.heap_management = Some(Box::new(O1Heap::new(self.heap_addr, heap_sz as u32).expect("Expect new heap_management but failed")));
     }
 }

crates/libmwemu/src/emu/initialization.rs

@@ -22,6 +22,7 @@ use crate::{
     structures::MemoryOperation,
     thread_context::ThreadContext,
 };
+use crate::maps::heap_allocation::O1Heap;
 
 mod banzai;
 mod call_stack;
@@ -101,4 +102,5 @@ pub struct Emu {
     pub definitions: HashMap<u64, Definition>,
     pub stored_contexts: HashMap<String, StoredContext>,
     pub entropy: f64,
+    pub heap_management: Option<Box<O1Heap>>,
 }

crates/libmwemu/src/emu/mod.rs

@@ -44,6 +44,7 @@ pub mod winapi;
 
 #[cfg(test)]
 mod tests;
+mod utils;
 
 use config::Config;
 use emu::Emu;