From 63cb7a48354b09da6946496639067e1ac8d7cba3 Mon Sep 17 00:00:00 2001 From: Simon Gellis Date: Sun, 17 Nov 2024 14:00:08 -0500 Subject: [PATCH] Update core --- shrooms-vb-core | 2 +- src/emulator/shrooms_vb_core.rs | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/shrooms-vb-core b/shrooms-vb-core index 7e31fbd..bc86464 160000 --- a/shrooms-vb-core +++ b/shrooms-vb-core @@ -1 +1 @@ -Subproject commit 7e31fbd5824d612e26a176aa2946497cfb2aa02e +Subproject commit bc864644f791e17d0060a60ebf1eea938bcf80af diff --git a/src/emulator/shrooms_vb_core.rs b/src/emulator/shrooms_vb_core.rs index 0d7593b..a241772 100644 --- a/src/emulator/shrooms_vb_core.rs +++ b/src/emulator/shrooms_vb_core.rs @@ -64,8 +64,6 @@ extern "C" { fn vb_emulate_ex(sims: *mut *mut VB, count: c_uint, cycles: *mut u32) -> c_int; #[link_name = "vbGetCartROM"] fn vb_get_cart_rom(sim: *mut VB, size: *mut u32) -> *mut c_void; - #[link_name = "vbGetPeer"] - fn vb_get_peer(sim: *mut VB) -> *mut VB; #[link_name = "vbGetPixels"] fn vb_get_pixels( sim: *mut VB, @@ -205,11 +203,7 @@ impl Sim { } pub fn unlink(&mut self) { - let peer = unsafe { vb_get_peer(self.sim) }; - if !peer.is_null() { - unsafe { vb_set_peer(peer, ptr::null_mut()) }; - unsafe { vb_set_peer(self.sim, ptr::null_mut()) }; - } + unsafe { vb_set_peer(self.sim, ptr::null_mut()) }; } pub fn emulate(&mut self) { @@ -292,11 +286,8 @@ impl Drop for Sim { // SAFETY: we made this pointer ourselves, we can for sure free it unsafe { drop(Box::from_raw(ptr)) }; - // If we're linked to another sim, unlink them from ourselves. - let peer = unsafe { vb_get_peer(self.sim) }; - if !peer.is_null() { - unsafe { vb_set_peer(peer, ptr::null_mut()) }; - } + // If we're linked to another sim, unlink from them. + unsafe { vb_set_peer(self.sim, ptr::null_mut()) }; let len = unsafe { vb_size_of() }.div_ceil(4); // SAFETY: the sim's memory originally came from a Vec