Merge branch 'main' of github.com:sha0coder/mwemu

Author: sha0coder

.gitignore

@@ -7,3 +7,4 @@ x
 *.swp
 *.idb
 test/
+.venv/

Cargo.lock

@@ -131,6 +131,7 @@ impl Console {
         log::info!("ll ..................... linked list walk");
         log::info!("d ...................... dissasemble");
         log::info!("dt ..................... dump structure");
+        log::info!("pos .................... print current position");
         log::info!("enter .................. step into");
         log::info!("tr ..................... trace reg");
         log::info!("trc .................... trace regs clear");

libmwemu/src/emu/console.rs

@@ -2771,6 +2771,9 @@ impl Emu {
                     self.cfg.trace_reg = false;
                     self.cfg.reg_names.clear();
                 }
+                "pos" => {
+                    log::info!("pos = 0x{:x}", self.pos);
+                }
                 "c" => {
                     self.is_running.store(1, atomic::Ordering::Relaxed);
                     return;
@@ -4851,7 +4854,7 @@ impl Emu {
                         if self.cfg.console_enabled {
                             self.spawn_console();
                         } else {
-                            return Err(MwemuError::new("emulation error"));
+                            return Err(MwemuError::new(&format!("emulation error at pos = {} rip = 0x{:x}", self.pos, self.regs.rip)));
                         }
                     }
 

libmwemu/src/emu/mod.rs

@@ -377,6 +377,9 @@ impl Script {
                     emu.cfg.trace_reg = false;
                     emu.cfg.reg_names.clear();
                 }
+                "pos" => {
+                    log::info!("pos = 0x{:x}", emu.pos);
+                }
                 "c" => {
                     emu.is_running
                         .store(1, std::sync::atomic::Ordering::Relaxed);

libmwemu/src/emu/script.rs

@@ -12,5 +12,5 @@ crate-type = ["cdylib"]
 [dependencies]
 pyo3 = "0.18.1"
 env_logger = "0.11.6"
-#libmwemu = { path = "../libmwemu" }
-libmwemu = "0.19.5"
+libmwemu = { path = "../libmwemu" }
+log = "0.4.22"

pymwemu/Cargo.toml

@@ -851,6 +851,7 @@ fn pymwemu(_py: Python, m: &PyModule) -> PyResult<()> {
     env_logger::Builder::from_env(Env::default().default_filter_or("info"))
         .format(|buf, record| writeln!(buf, "{}", record.args()))
         .init();
+    log::info!("Initialized logging");
     m.add_function(wrap_pyfunction!(init32, m)?)?;
     m.add_function(wrap_pyfunction!(init64, m)?)?;
     Ok(())

pymwemu/src/lib.rs

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+
+# run python3 installer from python.org
+# copy python.exe to python3.exe in C:\Users\Brandon\AppData\Local\Programs\Python\Python313\
+# python3 -m venv .venv
+# source .venv/Scripts/activate
+# pip install maturin
+# python3 -m maturin build --release -m ./pymwemu/Cargo.toml
+# python3 -m pip --force-reinstall /c/Users/Brandon/.cargo/.target/wheels/pymwemu-0.9.5-cp313-cp313-win_amd64.whl   
+# ./scripts/enigma-protector.py
+
+import pymwemu
+import os
+
+emu = pymwemu.init64()
+emu.load_maps('./maps64/')
+emu.load_binary(os.path.join(os.path.expanduser('~'), 'Desktop', 'enigma', 'surprise.dll'))
+
+emu.set_verbose(0)
+emu.set_reg('rdx', 1)
+#emu.spawn_console_at_pos(227871000)
+try:
+    emu.run()
+except Exception as e:
+    print(f"Error during emulation: {e}")
+finally:
+    emu.spawn_console()