fixup! properly track C memory management via ptrace

Author: nia-e

Cargo.toml

@@ -39,12 +39,12 @@ features = ['unprefixed_malloc_on_supported_platforms']
 libc = "0.2"
 libffi = "4.0.0"
 libloading = "0.8"
+nix = { version = "0.30.1", features = ["mman", "ptrace", "signal"] }
+ipc-channel = "0.19.0"
+serde = { version = "1.0.219", features = ["derive"] }
 
 [target.'cfg(all(unix, any(target_arch = "x86", target_arch = "x86_64")))'.dependencies]
-nix = { version = "0.30.1", features = ["mman", "ptrace", "signal"] }
 iced-x86 = "1.21.0"
-ipc-channel = "0.19.0"
-serde = "1.0.219"
 
 [target.'cfg(target_family = "windows")'.dependencies]
 windows-sys = { version = "0.59", features = [

src/discrete_alloc.rs

@@ -176,9 +176,8 @@ impl MachineAlloc {
                 self.dealloc_multi_page(ptr, layout);
             }
         } else {
-            let pinfo = std::iter::zip(&mut self.pages, &mut self.allocated).find(|(page, _)| {
-                page.addr() == page_addr
-            });
+            let pinfo = std::iter::zip(&mut self.pages, &mut self.allocated)
+                .find(|(page, _)| page.addr() == page_addr);
             let Some((_, pinfo)) = pinfo else {
                 panic!("Freeing in an unallocated page: {ptr:?}\nHolding pages {:?}", self.pages)
             };

src/shims/trace.rs

@@ -272,7 +272,9 @@ fn sv_loop(listener: ChildListener, t_event: ipc::IpcSender<MemEvents>) -> ! {
                                 );
                             }
                             _ => {
-                                eprintln!("Process unexpectedly stopped at {signal}; continuing...");
+                                eprintln!(
+                                    "Process unexpectedly stopped at {signal}; continuing..."
+                                );
                                 ptrace::syscall(pid, None).unwrap();
                             }
                         }
@@ -319,7 +321,9 @@ fn sv_loop(listener: ChildListener, t_event: ipc::IpcSender<MemEvents>) -> ! {
                                         let addr = regs.ax();
                                         mappings.push((addr, len as _));
                                     } else {
-                                        eprintln!("Process returned from mmap syscall without entering it? Attempting to continue...");
+                                        eprintln!(
+                                            "Process returned from mmap syscall without entering it? Attempting to continue..."
+                                        );
                                     }
                                 }
                             } else if syscall_nr as i64 == libc::SYS_munmap {