various cleanups and improvements

there are no longer any `unwrap`s in the code, instead `expect` is used. there are no longer any `unsafe` constructs in the `RetroCore` trait. the `retrocore` macro now generates a hidden module.
libretro-rs · Nov 12, 2022 · 9b4c3f0 · 9b4c3f0
1 parent 90b72a8
commit 9b4c3f0
Show file tree

Hide file tree

Showing 3 changed files with 298 additions and 242 deletions.
diff --git a/example/src/lib.rs b/example/src/lib.rs
@@ -17,8 +17,8 @@ impl RetroCore for Emulator {
     RetroSystemInfo::new("emulator", env!("CARGO_PKG_VERSION"))
   }
 
-  fn set_controller_port_device(&mut self, _: &RetroEnvironment, port: u32, device: RetroDevice) {
-    println!("[libretro_rs] set_controller_port_device({}, {:?})", port, device);
+  fn set_controller_port_device(&mut self, _: &RetroEnvironment, port: RetroDevicePort, device: RetroDevice) {
+    println!("[libretro_rs] set_controller_port_device({:?}, {:?})", port, device);
   }
 
   fn reset(&mut self, _: &RetroEnvironment) {

diff --git a/libretro-rs/src/core_macro.rs b/libretro-rs/src/core_macro.rs
@@ -1,155 +1,159 @@
 #[macro_export]
 macro_rules! libretro_core {
   ($core:ty) => {
-    use libretro_rs::sys::*;
-    use libretro_rs::*;
-
-    static mut RETRO_INSTANCE: RetroInstance<$core> = RetroInstance {
-      environment: None,
-      audio_sample: None,
-      audio_sample_batch: None,
-      input_poll: None,
-      input_state: None,
-      video_refresh: None,
-      system: None,
-      system_info: None,
-      system_av_info: None,
-      system_region: None,
-    };
-
-    #[no_mangle]
-    extern "C" fn retro_api_version() -> libc::c_uint {
-      RETRO_API_VERSION
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_get_system_info(info: &mut retro_system_info) {
-      instance_mut(|instance| instance.on_get_system_info(info))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_get_system_av_info(info: &mut retro_system_av_info) {
-      instance_ref(|instance| instance.on_get_system_av_info(info))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_init() {
-      instance_mut(|instance| instance.on_init())
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_deinit() {
-      instance_mut(|instance| instance.on_deinit())
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_set_environment(cb: retro_environment_t) {
-      instance_mut(|instance| instance.on_set_environment(cb))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_set_audio_sample(cb: retro_audio_sample_t) {
-      instance_mut(|instance| instance.on_set_audio_sample(cb))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_set_audio_sample_batch(cb: retro_audio_sample_batch_t) {
-      instance_mut(|instance| instance.on_set_audio_sample_batch(cb))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_set_input_poll(cb: retro_input_poll_t) {
-      instance_mut(|instance| instance.on_set_input_poll(cb))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_set_input_state(cb: retro_input_state_t) {
-      instance_mut(|instance| instance.on_set_input_state(cb))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_set_video_refresh(cb: retro_video_refresh_t) {
-      instance_mut(|instance| instance.on_set_video_refresh(cb))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_set_controller_port_device(port: libc::c_uint, device: libc::c_uint) {
-      instance_mut(|instance| instance.on_set_controller_port_device(port, device))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_reset() {
-      instance_mut(|instance| instance.on_reset())
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_run() {
-      instance_mut(|instance| instance.on_run())
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_serialize_size() -> libc::size_t {
-      instance_ref(|instance| instance.on_serialize_size())
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_serialize(data: *mut (), size: libc::size_t) -> bool {
-      instance_ref(|instance| instance.on_serialize(data, size))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_unserialize(data: *const (), size: libc::size_t) -> bool {
-      instance_mut(|instance| instance.on_unserialize(data, size))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_cheat_reset() {
-      instance_mut(|instance| instance.on_cheat_reset())
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_cheat_set(index: libc::c_uint, enabled: bool, code: *const libc::c_char) {
-      instance_mut(|instance| instance.on_cheat_set(index, enabled, code))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_load_game(game: &retro_game_info) -> bool {
-      instance_mut(|instance| instance.on_load_game(game))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_load_game_special(game_type: libc::c_uint, info: &retro_game_info, num_info: libc::size_t) -> bool {
-      instance_mut(|instance| instance.on_load_game_special(game_type, info, num_info))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_unload_game() {
-      instance_mut(|instance| instance.on_unload_game())
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_get_region() -> libc::c_uint {
-      instance_ref(|instance| instance.on_get_region())
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_get_memory_data(id: libc::c_uint) -> *mut () {
-      instance_mut(|instance| instance.on_get_memory_data(id))
-    }
-
-    #[no_mangle]
-    extern "C" fn retro_get_memory_size(id: libc::c_uint) -> libc::size_t {
-      instance_mut(|instance| instance.on_get_memory_size(id))
-    }
-
-    #[inline]
-    fn instance_ref<T>(f: impl FnOnce(&RetroInstance<$core>) -> T) -> T {
-      unsafe { f(&RETRO_INSTANCE) }
-    }
-
-    #[inline]
-    fn instance_mut<T>(f: impl FnOnce(&mut RetroInstance<$core>) -> T) -> T {
-      unsafe { f(&mut RETRO_INSTANCE) }
+    #[doc(hidden)]
+    mod __libretro_rs_gen {
+      use super::*;
+      use libretro_rs::sys::*;
+      use libretro_rs::*;
+
+      static mut RETRO_INSTANCE: RetroInstance<$core> = RetroInstance {
+        environment: None,
+        audio_sample: None,
+        audio_sample_batch: None,
+        input_poll: None,
+        input_state: None,
+        video_refresh: None,
+        system: None,
+        system_info: None,
+        system_av_info: None,
+        system_region: None,
+      };
+
+      #[no_mangle]
+      extern "C" fn retro_api_version() -> libc::c_uint {
+        RETRO_API_VERSION
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_get_system_info(info: &mut retro_system_info) {
+        instance_mut(|instance| instance.on_get_system_info(info))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_get_system_av_info(info: &mut retro_system_av_info) {
+        instance_ref(|instance| instance.on_get_system_av_info(info))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_init() {
+        instance_mut(|instance| instance.on_init())
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_deinit() {
+        instance_mut(|instance| instance.on_deinit())
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_set_environment(cb: retro_environment_t) {
+        instance_mut(|instance| instance.on_set_environment(cb))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_set_audio_sample(cb: retro_audio_sample_t) {
+        instance_mut(|instance| instance.on_set_audio_sample(cb))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_set_audio_sample_batch(cb: retro_audio_sample_batch_t) {
+        instance_mut(|instance| instance.on_set_audio_sample_batch(cb))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_set_input_poll(cb: retro_input_poll_t) {
+        instance_mut(|instance| instance.on_set_input_poll(cb))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_set_input_state(cb: retro_input_state_t) {
+        instance_mut(|instance| instance.on_set_input_state(cb))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_set_video_refresh(cb: retro_video_refresh_t) {
+        instance_mut(|instance| instance.on_set_video_refresh(cb))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_set_controller_port_device(port: libc::c_uint, device: libc::c_uint) {
+        instance_mut(|instance| instance.on_set_controller_port_device(port, device))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_reset() {
+        instance_mut(|instance| instance.on_reset())
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_run() {
+        instance_mut(|instance| instance.on_run())
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_serialize_size() -> libc::size_t {
+        instance_ref(|instance| instance.on_serialize_size())
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_serialize(data: *mut (), size: libc::size_t) -> bool {
+        instance_ref(|instance| instance.on_serialize(data, size))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_unserialize(data: *const (), size: libc::size_t) -> bool {
+        instance_mut(|instance| instance.on_unserialize(data, size))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_cheat_reset() {
+        instance_mut(|instance| instance.on_cheat_reset())
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_cheat_set(index: libc::c_uint, enabled: bool, code: *const libc::c_char) {
+        instance_mut(|instance| instance.on_cheat_set(index, enabled, code))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_load_game(game: &retro_game_info) -> bool {
+        instance_mut(|instance| instance.on_load_game(game))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_load_game_special(game_type: libc::c_uint, info: &retro_game_info, num_info: libc::size_t) -> bool {
+        instance_mut(|instance| instance.on_load_game_special(game_type, info, num_info))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_unload_game() {
+        instance_mut(|instance| instance.on_unload_game())
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_get_region() -> libc::c_uint {
+        instance_ref(|instance| instance.on_get_region())
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_get_memory_data(id: libc::c_uint) -> *mut () {
+        instance_mut(|instance| instance.on_get_memory_data(id))
+      }
+
+      #[no_mangle]
+      extern "C" fn retro_get_memory_size(id: libc::c_uint) -> libc::size_t {
+        instance_mut(|instance| instance.on_get_memory_size(id))
+      }
+
+      #[inline]
+      fn instance_ref<T>(f: impl FnOnce(&RetroInstance<$core>) -> T) -> T {
+        unsafe { f(&RETRO_INSTANCE) }
+      }
+
+      #[inline]
+      fn instance_mut<T>(f: impl FnOnce(&mut RetroInstance<$core>) -> T) -> T {
+        unsafe { f(&mut RETRO_INSTANCE) }
+      }
     }
   };
 }