about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/doc/unstable-book/src/language-features/cmse-nonsecure-entry.md6
-rw-r--r--src/test/ui/cmse-nonsecure-entry/gate_test.rs11
-rw-r--r--src/test/ui/cmse-nonsecure-entry/gate_test.stderr19
-rw-r--r--src/test/ui/cmse-nonsecure-entry/params-on-registers.rs11
-rw-r--r--src/test/ui/cmse-nonsecure-entry/params-on-stack.rs3
-rw-r--r--src/test/ui/cmse-nonsecure-entry/trustzone-only.rs1
-rw-r--r--src/test/ui/cmse-nonsecure-entry/trustzone-only.stderr2
-rw-r--r--src/test/ui/cmse-nonsecure-entry/wrong-abi.rs10
-rw-r--r--src/test/ui/cmse-nonsecure-entry/wrong-abi.stderr9
9 files changed, 68 insertions, 4 deletions
diff --git a/src/doc/unstable-book/src/language-features/cmse-nonsecure-entry.md b/src/doc/unstable-book/src/language-features/cmse-nonsecure-entry.md
index 9d69be3e69b..338fbc4b2bf 100644
--- a/src/doc/unstable-book/src/language-features/cmse-nonsecure-entry.md
+++ b/src/doc/unstable-book/src/language-features/cmse-nonsecure-entry.md
@@ -26,6 +26,12 @@ With this attribute, the compiler will do the following:
   information
 * use the `BXNS` instruction to return
 
+Because the stack can not be used to pass parameters, there will be compilation
+errors if:
+* the total size of all parameters is too big (for example more than four 32
+  bits integers)
+* the entry function is not using a C ABI
+
 The special symbol `__acle_se_` will be used by the linker to generate a secure
 gateway veneer.
 
diff --git a/src/test/ui/cmse-nonsecure-entry/gate_test.rs b/src/test/ui/cmse-nonsecure-entry/gate_test.rs
new file mode 100644
index 00000000000..02d5f20febc
--- /dev/null
+++ b/src/test/ui/cmse-nonsecure-entry/gate_test.rs
@@ -0,0 +1,11 @@
+// gate-test-cmse_nonsecure_entry
+
+#[no_mangle]
+#[cmse_nonsecure_entry]
+//~^ ERROR [E0775]
+//~| ERROR [E0658]
+pub extern "C" fn entry_function(input: u32) -> u32 {
+    input + 6
+}
+
+fn main() {}
diff --git a/src/test/ui/cmse-nonsecure-entry/gate_test.stderr b/src/test/ui/cmse-nonsecure-entry/gate_test.stderr
new file mode 100644
index 00000000000..75a29b317df
--- /dev/null
+++ b/src/test/ui/cmse-nonsecure-entry/gate_test.stderr
@@ -0,0 +1,19 @@
+error[E0658]: the `#[cmse_nonsecure_entry]` attribute is an experimental feature
+  --> $DIR/gate_test.rs:4:1
+   |
+LL | #[cmse_nonsecure_entry]
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #75835 <https://github.com/rust-lang/rust/issues/75835> for more information
+   = help: add `#![feature(cmse_nonsecure_entry)]` to the crate attributes to enable
+
+error[E0775]: `#[cmse_nonsecure_entry]` is only valid for targets with the TrustZone-M extension
+  --> $DIR/gate_test.rs:4:1
+   |
+LL | #[cmse_nonsecure_entry]
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0658, E0775.
+For more information about an error, try `rustc --explain E0658`.
diff --git a/src/test/ui/cmse-nonsecure-entry/params-on-registers.rs b/src/test/ui/cmse-nonsecure-entry/params-on-registers.rs
new file mode 100644
index 00000000000..a723eb73473
--- /dev/null
+++ b/src/test/ui/cmse-nonsecure-entry/params-on-registers.rs
@@ -0,0 +1,11 @@
+// build-pass
+// compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
+// only-thumbv8m.main-none-eabi
+#![feature(cmse_nonsecure_entry)]
+#![no_std]
+
+#[no_mangle]
+#[cmse_nonsecure_entry]
+pub extern "C" fn entry_function(a: u32, b: u32, c: u32, d: u32) -> u32 {
+    a + b + c + d
+}
diff --git a/src/test/ui/cmse-nonsecure-entry/params-on-stack.rs b/src/test/ui/cmse-nonsecure-entry/params-on-stack.rs
index 14c334fd010..553d3a8cb0b 100644
--- a/src/test/ui/cmse-nonsecure-entry/params-on-stack.rs
+++ b/src/test/ui/cmse-nonsecure-entry/params-on-stack.rs
@@ -1,4 +1,3 @@
-// gate-test-cmse_nonsecure_entry
 // compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
 // only-thumbv8m.main-none-eabi
 #![feature(cmse_nonsecure_entry)]
@@ -6,6 +5,6 @@
 
 #[no_mangle]
 #[cmse_nonsecure_entry]
-pub extern "C" fn entry_function(a: u32, b: u32, c: u32, d: u32, e: u32) -> u32 {
+pub extern "C" fn entry_function(a: u32, b: u32, c: u32, d: u32, e: u32) -> u32 { //~ ERROR
     a + b + c + d + e
 }
diff --git a/src/test/ui/cmse-nonsecure-entry/trustzone-only.rs b/src/test/ui/cmse-nonsecure-entry/trustzone-only.rs
index efb4eb09b68..3783e279402 100644
--- a/src/test/ui/cmse-nonsecure-entry/trustzone-only.rs
+++ b/src/test/ui/cmse-nonsecure-entry/trustzone-only.rs
@@ -1,4 +1,3 @@
-// gate-test-cmse_nonsecure_entry
 // ignore-thumbv8m.main-none-eabi
 #![feature(cmse_nonsecure_entry)]
 
diff --git a/src/test/ui/cmse-nonsecure-entry/trustzone-only.stderr b/src/test/ui/cmse-nonsecure-entry/trustzone-only.stderr
index d3e0c1e42eb..7e8862f9ab7 100644
--- a/src/test/ui/cmse-nonsecure-entry/trustzone-only.stderr
+++ b/src/test/ui/cmse-nonsecure-entry/trustzone-only.stderr
@@ -1,5 +1,5 @@
 error[E0775]: `#[cmse_nonsecure_entry]` is only valid for targets with the TrustZone-M extension
-  --> $DIR/trustzone-only.rs:6:1
+  --> $DIR/trustzone-only.rs:5:1
    |
 LL | #[cmse_nonsecure_entry]
    | ^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/cmse-nonsecure-entry/wrong-abi.rs b/src/test/ui/cmse-nonsecure-entry/wrong-abi.rs
new file mode 100644
index 00000000000..611c8643dcb
--- /dev/null
+++ b/src/test/ui/cmse-nonsecure-entry/wrong-abi.rs
@@ -0,0 +1,10 @@
+// compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
+// only-thumbv8m.main-none-eabi
+#![feature(cmse_nonsecure_entry)]
+#![no_std]
+
+#[no_mangle]
+#[cmse_nonsecure_entry]
+pub fn entry_function(a: u32, b: u32, c: u32, d: u32) -> u32 { //~ ERROR [E0776]
+    a + b + c + d
+}
diff --git a/src/test/ui/cmse-nonsecure-entry/wrong-abi.stderr b/src/test/ui/cmse-nonsecure-entry/wrong-abi.stderr
new file mode 100644
index 00000000000..d6967a11e6b
--- /dev/null
+++ b/src/test/ui/cmse-nonsecure-entry/wrong-abi.stderr
@@ -0,0 +1,9 @@
+error[E0776]: `#[cmse_nonsecure_entry]` functions require C ABI
+  --> $DIR/wrong-abi.rs:7:1
+   |
+LL | #[cmse_nonsecure_entry]
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0776`.