Check for CMSE ABI's as well

Author: defermelowie

src/bindgen/parser.rs

@@ -728,7 +728,7 @@ impl Parse {
             items.join("::")
         };
 
-        let is_extern_c = sig.abi.is_omitted() || sig.abi.is_c();
+        let is_extern_c = sig.abi.is_omitted() || sig.abi.is_c() || sig.abi.is_cmse();
         let exported_name = named_symbol.exported_name();
 
         match (is_extern_c, exported_name) {

src/bindgen/utilities.rs

@@ -384,24 +384,19 @@ impl_syn_item_helper!(syn::ItemTraitAlias);
 /// Helper function for accessing Abi information
 pub trait SynAbiHelpers {
     fn is_c(&self) -> bool;
+    fn is_cmse(&self) -> bool;
     fn is_omitted(&self) -> bool;
 }
 
 impl SynAbiHelpers for Option<syn::Abi> {
     fn is_c(&self) -> bool {
-        if let Some(ref abi) = *self {
-            if let Some(ref lit_string) = abi.name {
-                return matches!(lit_string.value().as_str(), "C" | "C-unwind");
-            }
-        }
-        false
+        self.as_ref().is_some_and(|abi| abi.is_c())
+    }
+    fn is_cmse(&self) -> bool {
+        self.as_ref().is_some_and(|abi| abi.is_cmse())
     }
     fn is_omitted(&self) -> bool {
-        if let Some(ref abi) = *self {
-            abi.name.is_none()
-        } else {
-            false
-        }
+        self.as_ref().is_some_and(|abi| abi.is_omitted())
     }
 }
 
@@ -413,6 +408,16 @@ impl SynAbiHelpers for syn::Abi {
             false
         }
     }
+    fn is_cmse(&self) -> bool {
+        if let Some(ref lit_string) = self.name {
+            matches!(
+                lit_string.value().as_str(),
+                "cmse-nonsecure-entry" | "cmse-nonsecure-call"
+            )
+        } else {
+            false
+        }
+    }
     fn is_omitted(&self) -> bool {
         self.name.is_none()
     }

tests/expectations-symbols/cmse.c.sym

@@ -0,0 +1,4 @@
+{
+foo;
+bar;
+};

tests/expectations/cmse.c

@@ -0,0 +1,8 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+void foo(void);
+
+void bar(void);

tests/expectations/cmse.compat.c

@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void foo(void);
+
+void bar(void);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus

tests/expectations/cmse.cpp

@@ -0,0 +1,13 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+extern "C" {
+
+void foo();
+
+void bar();
+
+}  // extern "C"

tests/expectations/cmse.pyx

@@ -0,0 +1,11 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  void foo();
+
+  void bar();

tests/rust/cmse.rs

@@ -0,0 +1,5 @@
+#[no_mangle]
+pub extern "cmse-nonsecure-entry" fn foo() {}
+
+#[no_mangle]
+pub extern "cmse-nonsecure-call" fn bar() {}