Merge pull request #19 from madsmtm/sys-crates

Add `objc_sys` crate

Author: madsmtm

Cargo.toml

@@ -7,6 +7,7 @@ members = [
     "objc_foundation",
     "objc_foundation_derive",
     "objc_id",
+    "objc_sys",
     "objc_test_utils",
 ]
 exclude = ["objc/tests-ios"]

objc/Cargo.toml

@@ -28,5 +28,6 @@ unstable_autoreleasesafe = []
 
 [dependencies]
 malloc_buf = "1.0"
+objc_sys = { path = "../objc_sys" }
 objc-encode = { path = "../objc_encode", version = "1.0" }
 objc_exception = { path = "../objc_exception", version = "0.1", optional = true }

objc/src/cache.rs

@@ -26,9 +26,9 @@ impl CachedSel {
         // It should be fine to use `Relaxed` ordering here because `sel_registerName` is
         // thread-safe.
         if ptr.is_null() {
-            let sel = runtime::sel_registerName(name.as_ptr() as *const _);
-            self.ptr.store(sel.as_ptr() as *mut _, Ordering::Relaxed);
-            sel
+            let ptr = runtime::sel_registerName(name.as_ptr() as *const _);
+            self.ptr.store(ptr as *mut _, Ordering::Relaxed);
+            Sel::from_ptr(ptr as *const _)
         } else {
             Sel::from_ptr(ptr)
         }
@@ -56,7 +56,7 @@ impl CachedClass {
         // `Relaxed` should be fine since `objc_getClass` is thread-safe.
         let ptr = self.ptr.load(Ordering::Relaxed);
         if ptr.is_null() {
-            let cls = runtime::objc_getClass(name.as_ptr() as *const _);
+            let cls = runtime::objc_getClass(name.as_ptr() as *const _) as *const Class;
             self.ptr.store(cls as *mut _, Ordering::Relaxed);
             cls.as_ref()
         } else {

objc/src/declare.rs

@@ -118,12 +118,12 @@ pub struct ClassDecl {
 impl ClassDecl {
     fn with_superclass(name: &str, superclass: Option<&Class>) -> Option<ClassDecl> {
         let name = CString::new(name).unwrap();
-        let super_ptr = superclass.map_or(ptr::null(), |c| c);
+        let super_ptr = superclass.map_or(ptr::null(), |c| c) as _;
         let cls = unsafe { runtime::objc_allocateClassPair(super_ptr, name.as_ptr(), 0) };
         if cls.is_null() {
             None
         } else {
-            Some(ClassDecl { cls })
+            Some(ClassDecl { cls: cls as _ })
         }
     }
 
@@ -182,7 +182,12 @@ impl ClassDecl {
         );
 
         let types = method_type_encoding(&F::Ret::ENCODING, encs);
-        let success = runtime::class_addMethod(self.cls, sel, func.imp(), types.as_ptr());
+        let success = runtime::class_addMethod(
+            self.cls as _,
+            sel.as_ptr() as _,
+            Some(func.imp()),
+            types.as_ptr(),
+        );
         assert!(success != NO, "Failed to add method {:?}", sel);
     }
 
@@ -212,7 +217,12 @@ impl ClassDecl {
 
         let types = method_type_encoding(&F::Ret::ENCODING, encs);
         let metaclass = (*self.cls).metaclass() as *const _ as *mut _;
-        let success = runtime::class_addMethod(metaclass, sel, func.imp(), types.as_ptr());
+        let success = runtime::class_addMethod(
+            metaclass,
+            sel.as_ptr() as _,
+            Some(func.imp()),
+            types.as_ptr(),
+        );
         assert!(success != NO, "Failed to add class method {:?}", sel);
     }
 
@@ -227,7 +237,13 @@ impl ClassDecl {
         let size = mem::size_of::<T>();
         let align = log2_align_of::<T>();
         let success = unsafe {
-            runtime::class_addIvar(self.cls, c_name.as_ptr(), size, align, encoding.as_ptr())
+            runtime::class_addIvar(
+                self.cls as _,
+                c_name.as_ptr(),
+                size,
+                align,
+                encoding.as_ptr(),
+            )
         };
         assert!(success != NO, "Failed to add ivar {}", name);
     }
@@ -238,7 +254,7 @@ impl ClassDecl {
     ///
     /// If the protocol wasn't successfully added.
     pub fn add_protocol(&mut self, proto: &Protocol) {
-        let success = unsafe { runtime::class_addProtocol(self.cls, proto) };
+        let success = unsafe { runtime::class_addProtocol(self.cls as _, proto.as_ptr()) };
         assert!(success != NO, "Failed to add protocol {:?}", proto);
     }
 
@@ -247,7 +263,7 @@ impl ClassDecl {
     pub fn register(self) -> &'static Class {
         unsafe {
             let cls = self.cls;
-            runtime::objc_registerClassPair(cls);
+            runtime::objc_registerClassPair(cls as _);
             // Forget self otherwise the class will be disposed in drop
             mem::forget(self);
             &*cls
@@ -258,7 +274,7 @@ impl ClassDecl {
 impl Drop for ClassDecl {
     fn drop(&mut self) {
         unsafe {
-            runtime::objc_disposeClassPair(self.cls);
+            runtime::objc_disposeClassPair(self.cls as _);
         }
     }
 }
@@ -275,7 +291,7 @@ impl ProtocolDecl {
     /// Returns [`None`] if the protocol couldn't be allocated.
     pub fn new(name: &str) -> Option<ProtocolDecl> {
         let c_name = CString::new(name).unwrap();
-        let proto = unsafe { runtime::objc_allocateProtocol(c_name.as_ptr()) };
+        let proto = unsafe { runtime::objc_allocateProtocol(c_name.as_ptr()) } as *mut Protocol;
         if proto.is_null() {
             None
         } else {
@@ -303,8 +319,8 @@ impl ProtocolDecl {
         let types = method_type_encoding(&Ret::ENCODING, encs);
         unsafe {
             runtime::protocol_addMethodDescription(
-                self.proto,
-                sel,
+                self.proto as _,
+                sel.as_ptr() as _,
                 types.as_ptr(),
                 is_required as BOOL,
                 is_instance_method as BOOL,
@@ -333,15 +349,15 @@ impl ProtocolDecl {
     /// Adds a requirement on another protocol.
     pub fn add_protocol(&mut self, proto: &Protocol) {
         unsafe {
-            runtime::protocol_addProtocol(self.proto, proto);
+            runtime::protocol_addProtocol(self.proto as _, proto.as_ptr());
         }
     }
 
     /// Registers the [`ProtocolDecl`], consuming it and returning a reference
     /// to the newly registered [`Protocol`].
     pub fn register(self) -> &'static Protocol {
         unsafe {
-            runtime::objc_registerProtocol(self.proto);
+            runtime::objc_registerProtocol(self.proto as _);
             &*self.proto
         }
     }

objc/src/message/apple/arm.rs

@@ -1,18 +1,10 @@
 use core::mem;
+use objc_sys::{objc_msgSend, objc_msgSendSuper, objc_msgSendSuper_stret, objc_msgSend_stret};
 
 use super::MsgSendFn;
 use crate::runtime::Imp;
 use crate::{Encode, Encoding};
 
-// TODO: C-unwind
-extern "C" {
-    fn objc_msgSend();
-    fn objc_msgSend_stret();
-
-    fn objc_msgSendSuper();
-    fn objc_msgSendSuper_stret();
-}
-
 /// Double-word sized fundamental data types don't use stret, but any
 /// composite type larger than 4 bytes does.
 ///

objc/src/message/apple/arm64.rs

@@ -1,14 +1,9 @@
+use objc_sys::{objc_msgSend, objc_msgSendSuper};
+
 use super::MsgSendFn;
 use crate::runtime::Imp;
 use crate::Encode;
 
-// TODO: C-unwind
-extern "C" {
-    fn objc_msgSend();
-
-    fn objc_msgSendSuper();
-}
-
 /// `objc_msgSend_stret` is not even available in arm64.
 ///
 /// <https://twitter.com/gparker/status/378079715824660480>

objc/src/message/apple/mod.rs

@@ -1,4 +1,6 @@
-use super::{Encode, Message, MessageArguments, MessageError, Super};
+use objc_sys::objc_super;
+
+use super::{Encode, Message, MessageArguments, MessageError};
 use crate::runtime::{Class, Imp, Object, Sel};
 
 #[cfg(target_arch = "x86")]
@@ -43,11 +45,11 @@ where
     A: MessageArguments,
     R: Encode,
 {
-    let sup = Super {
-        receiver: obj as *mut T as *mut Object,
-        superclass,
+    let sup = objc_super {
+        receiver: obj as *mut T as *mut Object as *mut _,
+        super_class: superclass as *const Class as *const _,
     };
-    let receiver = &sup as *const Super as *mut Object;
+    let receiver = &sup as *const objc_super as *mut Object;
     let msg_send_fn = R::MSG_SEND_SUPER;
     objc_try!({ A::invoke(msg_send_fn, receiver, sel, args) })
 }

objc/src/message/apple/x86.rs

@@ -1,19 +1,13 @@
 use core::mem;
+use objc_sys::{
+    objc_msgSend, objc_msgSendSuper, objc_msgSendSuper_stret, objc_msgSend_fpret,
+    objc_msgSend_stret,
+};
 
 use super::MsgSendFn;
 use crate::runtime::Imp;
 use crate::{Encode, Encoding};
 
-// TODO: C-unwind
-extern "C" {
-    fn objc_msgSend();
-    fn objc_msgSend_fpret();
-    fn objc_msgSend_stret();
-
-    fn objc_msgSendSuper();
-    fn objc_msgSendSuper_stret();
-}
-
 /// Structures 1 or 2 bytes in size are placed in EAX.
 /// Structures 4 or 8 bytes in size are placed in: EAX and EDX.
 /// Structures of other sizes are placed at the address supplied by the caller.

objc/src/message/apple/x86_64.rs

@@ -1,24 +1,17 @@
 use core::mem;
+use objc_sys::{objc_msgSend, objc_msgSendSuper, objc_msgSendSuper_stret, objc_msgSend_stret};
 
 use super::MsgSendFn;
 use crate::runtime::Imp;
 use crate::Encode;
 
-// TODO: C-unwind
-extern "C" {
-    fn objc_msgSend();
-    fn objc_msgSend_stret();
-
-    fn objc_msgSendSuper();
-    fn objc_msgSendSuper_stret();
-}
-
 /// If the size of an object is larger than two eightbytes, it has class
 /// MEMORY. If the type has class MEMORY, then the caller provides space for
 /// the return value and passes the address of this storage.
 ///
 /// <http://people.freebsd.org/~obrien/amd64-elf-abi.pdf>
 impl<T: Encode> MsgSendFn for T {
+    // TODO: Should we use objc_msgSend_fpret and objc_msgSend_fp2ret ?
     const MSG_SEND: Imp = {
         if mem::size_of::<T>() <= 16 {
             objc_msgSend

objc/src/message/gnustep.rs

@@ -1,12 +1,8 @@
 use core::mem;
+use objc_sys::{objc_msg_lookup, objc_msg_lookup_super, objc_super};
 
-use super::{Encode, Message, MessageArguments, MessageError, Super};
-use crate::runtime::{Class, Imp, Object, Sel};
-
-extern "C" {
-    fn objc_msg_lookup(receiver: *mut Object, op: Sel) -> Imp;
-    fn objc_msg_lookup_super(sup: *const Super, sel: Sel) -> Imp;
-}
+use super::{Encode, Message, MessageArguments, MessageError};
+use crate::runtime::{Class, Object, Sel};
 
 pub unsafe fn send_unverified<T, A, R>(obj: *const T, sel: Sel, args: A) -> Result<R, MessageError>
 where
@@ -19,8 +15,8 @@ where
     }
 
     let receiver = obj as *mut T as *mut Object;
-    let msg_send_fn = objc_msg_lookup(receiver, sel);
-    objc_try!({ A::invoke(msg_send_fn, receiver, sel, args) })
+    let msg_send_fn = objc_msg_lookup(receiver as *mut _, sel.as_ptr() as *const _);
+    objc_try!({ A::invoke(msg_send_fn.expect("Null IMP"), receiver, sel, args) })
 }
 
 pub unsafe fn send_super_unverified<T, A, R>(
@@ -35,10 +31,10 @@ where
     R: Encode,
 {
     let receiver = obj as *mut T as *mut Object;
-    let sup = Super {
-        receiver: receiver,
-        superclass: superclass,
+    let sup = objc_super {
+        receiver: receiver as *mut _,
+        super_class: superclass as *const Class as *const _,
     };
-    let msg_send_fn = objc_msg_lookup_super(&sup, sel);
-    objc_try!({ A::invoke(msg_send_fn, receiver, sel, args) })
+    let msg_send_fn = objc_msg_lookup_super(&sup, sel.as_ptr() as *const _);
+    objc_try!({ A::invoke(msg_send_fn.expect("Null IMP"), receiver, sel, args) })
 }