Merge pull request #1767 from PhilippTakacs/rustcallback

rust only add mmio callback funktion, if callback is requested
This commit is contained in:
2023-01-24 21:46:40 +01:00
committed by GitHub

View File

@@ -384,12 +384,18 @@ impl<'a, D> Unicorn<'a, D> {
self.get_handle(), self.get_handle(),
address, address,
size, size,
ffi::mmio_read_callback_proxy::<D, R> as _, match read_data {
Some(_) => ffi::mmio_read_callback_proxy::<D, R> as _,
None => ptr::null_mut(),
},
match read_data { match read_data {
Some(ref mut d) => d.as_mut() as *mut _ as _, Some(ref mut d) => d.as_mut() as *mut _ as _,
None => ptr::null_mut(), None => ptr::null_mut(),
}, },
ffi::mmio_write_callback_proxy::<D, W> as _, match write_data {
Some(_) => ffi::mmio_write_callback_proxy::<D, W> as _,
None => ptr::null_mut(),
},
match write_data { match write_data {
Some(ref mut d) => d.as_mut() as *mut _ as _, Some(ref mut d) => d.as_mut() as *mut _ as _,
None => ptr::null_mut(), None => ptr::null_mut(),