forgot to commit idk where this belongs it's all getting squashed and im tired

Author: nia-e

src/alloc_addresses/mod.rs

@@ -483,7 +483,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
     fn apply_events(&mut self, events: crate::shims::trace::MemEvents) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
         //let accesses = events.accesses;
-        let handle = this.machine.alloc_addresses.borrow();
+        /*let handle = this.machine.alloc_addresses.borrow();
         for id in &handle.exposed {
             let &base_addr = handle.base_addr.get(id).unwrap();
             let info = this.get_alloc_info(*id);
@@ -497,13 +497,22 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     if info.mutbl.is_not() && acc_kind.did_write() {
                         throw_ub_format!(""); // TODO: fill this in lol
                     }
-                    
-                    if acc_kind.did_write() {
 
+                    if acc_kind.did_read() {
+                        let src = Pointer::from_addr_invalid(*acc_base);
+                        this.read_immediate_raw(&src);
+                        self.expose_provenance(provenance)
+                    }
+
+                    if acc_kind.did_write() {
+                        //let alloc = self.alloc_id_from_addr(addr, size, only_exposed_allocations)
                     }
                 }
             }
-        }
+        }*/
+        /*for (acc_base, acc_len, acc_kind) in &events.accesses {
+            let alloc_id = self.alloc_id_from_addr(addr, size, only_exposed_allocations)
+        }*/
 
         interp_ok(())
     }

src/shims/native_lib.rs

@@ -193,6 +193,10 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
 
         // Call the function and store output, depending on return type in the function signature.
         let ret = this.call_native_with_args(link_name, dest, code_ptr, libffi_args)?;
+        if let Some(events) = super::trace::Supervisor::get_events() {
+            eprintln!("accesses: {events:#018x?}");
+            this.apply_events(events)?;
+        }
         this.write_immediate(*ret, dest)?;
         interp_ok(true)
     }
@@ -208,8 +212,6 @@ unsafe fn do_native_call<T: libffi::high::CType>(ptr: CodePtr, args: &[ffi::Arg<
         Supervisor::end_ffi();
         ret
     };
-    let accesses = Supervisor::get_events().unwrap();
-    eprintln!("accesses: {accesses:#018x?}");
     ret
 }
 

src/shims/trace.rs

@@ -161,7 +161,17 @@ impl Supervisor {
     pub fn get_events() -> Option<MemEvents> {
         let mut sv_guard = SUPERVISOR.lock().unwrap();
         let sv = sv_guard.take()?;
-        let ret = sv.r_event.recv().ok();
+        // On the off-chance something really weird happens, don't block forever
+        let ret = sv.r_event.try_recv_timeout(std::time::Duration::from_secs(1)).map_err(|e| {
+            match e {
+                ipc::TryRecvError::IpcError(e) => ipc::TryRecvError::IpcError(e),
+                ipc::TryRecvError::Empty => {
+                    // timed out!
+                    eprintln!("Waiting for accesses from supervisor timed out!");
+                    ipc::TryRecvError::Empty
+                },
+            }
+        }).ok();
         *sv_guard = Some(sv);
         ret
     }