alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 00:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

change to use c_char for arm compat

Browse source
This commit is contained in:
Corwin Kuiper 2021-08-01 17:50:06 +01:00
parent e372123ba1
commit b63bc2d25c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mgba-test-runner/src/runner.rs
View file

@ -1,6 +1,7 @@
use std::ffi::c_void; use std::ffi::c_void;
use std::ffi::CStr; use std::ffi::CStr;
use std::ffi::CString; use std::ffi::CString;
use std::os::raw::c_char;
#[allow( #[allow(
non_upper_case_globals, non_upper_case_globals,
@ -37,7 +38,7 @@ impl VideoBuffer {
impl MGBA { impl MGBA {
pub fn new(filename: &str) -> Result<Self, anyhow::Error> { pub fn new(filename: &str) -> Result<Self, anyhow::Error> {
let c_str = CString::new(filename).expect("should be able to make cstring from filename"); let c_str = CString::new(filename).expect("should be able to make cstring from filename");
let mgba = unsafe { bindings::new_runner(c_str.as_ptr() as *mut i8) }; let mgba = unsafe { bindings::new_runner(c_str.as_ptr() as *mut c_char) };
if mgba.is_null() { if mgba.is_null() {
Err(anyhow::anyhow!("could not create core")) Err(anyhow::anyhow!("could not create core"))
} else { } else {
@ -59,7 +60,7 @@ impl MGBA {
} }
pub fn set_logger(&mut self, mut logger: impl FnMut(&str)) { pub fn set_logger(&mut self, mut logger: impl FnMut(&str)) {
unsafe { unsafe {
let callback = generate_c_callback(move |message: *mut i8| { let callback = generate_c_callback(move |message: *mut c_char| {
logger( logger(
CStr::from_ptr(message) CStr::from_ptr(message)
.to_str() .to_str()
@ -73,7 +74,7 @@ impl MGBA {
unsafe fn generate_c_callback<F>(f: F) -> bindings::callback unsafe fn generate_c_callback<F>(f: F) -> bindings::callback
where where
F: FnMut(*mut i8), F: FnMut(*mut c_char),
{ {
let data = Box::into_raw(Box::new(f)); let data = Box::into_raw(Box::new(f));
@ -84,9 +85,9 @@ where
} }
} }
extern "C" fn call_closure<F>(data: *mut c_void, message: *mut i8) extern "C" fn call_closure<F>(data: *mut c_void, message: *mut c_char)
where where
F: FnMut(*mut i8), F: FnMut(*mut c_char),
{ {
let callback_ptr = data as *mut F; let callback_ptr = data as *mut F;
let callback = unsafe { &mut *callback_ptr }; let callback = unsafe { &mut *callback_ptr };