Update to the latest icicle version

Author: mrexodia

.github/workflows/CI.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [x86_64, x86, aarch64, armv7, s390x, ppc64le]
+        target: [x86_64, aarch64]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -48,7 +48,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        target: [x64, x86]
+        target: [x64]
     steps:
       - uses: actions/checkout@v3
         with:

Cargo.lock

@@ -1,7 +1,7 @@
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [package]
-name = "icicle-unicorn"
+name = "icicle-python"
 version = "0.1.0"
 edition = "2021"
 

Cargo.toml

@@ -1,6 +1,6 @@
-# icicle-unicorn
+# icicle-python
 
-This project is an attempt to replace unicorn with a wrapper around [icicle-emu](https://github.com/icicle-emu/icicle-emu).
+This project is an easy to use Python wrapper around [icicle-emu](https://github.com/icicle-emu/icicle-emu).
 
 ## Requirements
 
@@ -9,6 +9,10 @@ This project is an attempt to replace unicorn with a wrapper around [icicle-emu]
 
 ## Building
 
+TODO: talk about the submodule
+
+TODO: clone ghidra and set `GHIDRA_SRC` environment variable
+
 Set up a virtual environment:
 
 ```shell

README.md

@@ -98,8 +98,12 @@ class Icicle:
 
     icount_limit: int
 
+    # TODO: API to get memory information?
+
     def mem_map(self, address: int, size: int, protection: MemoryProtection): ...
 
+    def mem_unmap(self, address: int, size: int): ...
+
     def mem_protect(self, address: int, size: int, protection: MemoryProtection): ...
 
     def mem_read(self, address: int, size: int) -> bytes: ...

icicle-emu

@@ -122,6 +122,7 @@ enum ExceptionCodePy {
 
     ExecViolation = 0x0401,
     SelfModifyingCode = 0x0402,
+    ExecUnaligned = 0x0404,
     OutOfMemory = 0x0501,
     AddressOverflow = 0x0502,
 
@@ -166,6 +167,7 @@ impl From<ExceptionCode> for ExceptionCodePy {
             ExceptionCode::WriteUnaligned => ExceptionCodePy::WriteUnaligned,
             ExceptionCode::ExecViolation => ExceptionCodePy::ExecViolation,
             ExceptionCode::SelfModifyingCode => ExceptionCodePy::SelfModifyingCode,
+            ExceptionCode::ExecUnaligned => ExceptionCodePy::ExecUnaligned,
             ExceptionCode::OutOfMemory => ExceptionCodePy::OutOfMemory,
             ExceptionCode::AddressOverflow => ExceptionCodePy::AddressOverflow,
             ExceptionCode::InvalidInstruction => ExceptionCodePy::InvalidInstruction,
@@ -290,11 +292,13 @@ impl Icicle {
             );
         }
 
+        // TODO: support instantiating this multiple times
         if tracing {
-            tracing_subscriber::fmt()
+            if tracing_subscriber::fmt()
                 .with_max_level(tracing::Level::DEBUG)
                 .with_target(false)
-                .init();
+                .try_init().is_err() {
+            }
         }
 
         // Setup the CPU state for the target triple
@@ -362,6 +366,19 @@ impl Icicle {
         }
     }
 
+    fn mem_unmap(&mut self, address: u64, size: u64) -> PyResult<()> {
+        if self.vm.cpu.mem.unmap_memory_len(address, size) {
+            Ok(())
+        } else {
+            Err(
+                raise_MemoryError(
+                    format!("Failed to unmap memory {address:X}[{size:X}]"),
+                    MemError::Unknown,
+                )
+            )
+        }
+    }
+
     fn mem_protect(&mut self, address: u64, size: usize, protection: MemoryProtection) -> PyResult<()> {
         self.vm.cpu.mem.update_perm(address, size as u64, convert_protection(protection))
             .map_err(|e| {