Skip to content

Commit 2a3103c

Browse files
workingjubileeworkingjubilee
committed
tests: s/C-cmse/cmse/
1 parent c358be5 commit 2a3103c

19 files changed

+100
-102
lines changed

‎tests/assembly/cmse.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ use minicore::*;
5353
// Branch back to non-secure side
5454
// CHECK: bxns lr
5555
#[no_mangle]
56-
pub extern "C-cmse-nonsecure-entry" fn entry_point() -> i64 {
56+
pub extern "cmse-nonsecure-entry" fn entry_point() -> i64 {
5757
0
5858
}
5959

@@ -95,8 +95,6 @@ pub extern "C-cmse-nonsecure-entry" fn entry_point() -> i64 {
9595
// Call to non-secure
9696
// CHECK: blxns r12
9797
#[no_mangle]
98-
pub fn call_nonsecure(
99-
f: unsafe extern "C-cmse-nonsecure-call" fn(u32, u32, u32, u32) -> u64,
100-
) -> u64 {
98+
pub fn call_nonsecure(f: unsafe extern "cmse-nonsecure-call" fn(u32, u32, u32, u32) -> u64) -> u64 {
10199
unsafe { f(0, 1, 2, 3) }
102100
}

‎tests/crashes/130104.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
fn main() {
44
let non_secure_function =
5-
core::mem::transmute::<fn() -> _, extern "C-cmse-nonsecure-call" fn() -> _>;
5+
core::mem::transmute::<fn() -> _, extern "cmse-nonsecure-call" fn() -> _>;
66
}

‎tests/crashes/132142.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
//@ known-bug: #132142
22

3-
async extern "C-cmse-nonsecure-entry" fn fun(...) {}
3+
async extern "cmse-nonsecure-entry" fn fun(...) {}

‎tests/crashes/132430.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
struct Test;
77

88
impl Test {
9-
pub async unsafe extern "C-cmse-nonsecure-entry" fn test(val: &str) {}
9+
pub async unsafe extern "cmse-nonsecure-entry" fn test(val: &str) {}
1010
}

‎tests/ui/abi/unsupported.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,18 @@ extern "stdcall" {}
184184
//[riscv32]~^^^^ ERROR is not a supported ABI
185185
//[riscv64]~^^^^^ ERROR is not a supported ABI
186186

187-
fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
187+
fn cmse_call_ptr(f: extern "cmse-nonsecure-call" fn()) {
188188
//~^ WARN unsupported_fn_ptr_calling_conventions
189189
//~^^ WARN this was previously accepted
190190
f()
191191
}
192192

193-
extern "C-cmse-nonsecure-entry" fn cmse_entry() {}
193+
extern "cmse-nonsecure-entry" fn cmse_entry() {}
194194
//~^ ERROR is not a supported ABI
195-
fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {
195+
fn cmse_entry_ptr(f: extern "cmse-nonsecure-entry" fn()) {
196196
//~^ WARN unsupported_fn_ptr_calling_conventions
197197
//~^^ WARN this was previously accepted
198198
f()
199199
}
200-
extern "C-cmse-nonsecure-entry" {}
200+
extern "cmse-nonsecure-entry" {}
201201
//~^ ERROR is not a supported ABI

‎tests/ui/cmse-nonsecure/cmse-nonsecure-call/callback-as-argument.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ extern crate minicore;
99
use minicore::*;
1010

1111
#[no_mangle]
12-
pub extern "C-cmse-nonsecure-entry" fn test(
13-
f: extern "C-cmse-nonsecure-call" fn(u32, u32, u32, u32) -> u32,
12+
pub extern "cmse-nonsecure-entry" fn test(
13+
f: extern "cmse-nonsecure-call" fn(u32, u32, u32, u32) -> u32,
1414
a: u32,
1515
b: u32,
1616
c: u32,

‎tests/ui/cmse-nonsecure/cmse-nonsecure-call/gate_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#[allow(unsupported_fn_ptr_calling_conventions)]
33
fn main() {
44
let non_secure_function = unsafe {
5-
core::mem::transmute::<usize, extern "C-cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
5+
core::mem::transmute::<usize, extern "cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
66
//~^ ERROR [E0658]
77
0x10000004,
88
)

‎tests/ui/cmse-nonsecure/cmse-nonsecure-call/generics.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@ use minicore::*;
1111
struct Wrapper<T>(T);
1212

1313
struct Test<T: Copy> {
14-
f1: extern "C-cmse-nonsecure-call" fn<U: Copy>(U, u32, u32, u32) -> u64,
14+
f1: extern "cmse-nonsecure-call" fn<U: Copy>(U, u32, u32, u32) -> u64,
1515
//~^ ERROR cannot find type `U` in this scope
1616
//~| ERROR function pointer types may not have generic parameters
17-
f2: extern "C-cmse-nonsecure-call" fn(impl Copy, u32, u32, u32) -> u64,
17+
f2: extern "cmse-nonsecure-call" fn(impl Copy, u32, u32, u32) -> u64,
1818
//~^ ERROR `impl Trait` is not allowed in `fn` pointer parameters
19-
f3: extern "C-cmse-nonsecure-call" fn(T, u32, u32, u32) -> u64, //~ ERROR [E0798]
20-
f4: extern "C-cmse-nonsecure-call" fn(Wrapper<T>, u32, u32, u32) -> u64, //~ ERROR [E0798]
19+
f3: extern "cmse-nonsecure-call" fn(T, u32, u32, u32) -> u64, //~ ERROR [E0798]
20+
f4: extern "cmse-nonsecure-call" fn(Wrapper<T>, u32, u32, u32) -> u64, //~ ERROR [E0798]
2121
}
2222

23-
type WithReference = extern "C-cmse-nonsecure-call" fn(&usize);
23+
type WithReference = extern "cmse-nonsecure-call" fn(&usize);
2424

2525
trait Trait {}
26-
type WithTraitObject = extern "C-cmse-nonsecure-call" fn(&dyn Trait) -> &dyn Trait;
27-
//~^ ERROR return value of `"C-cmse-nonsecure-call"` function too large to pass via registers [E0798]
26+
type WithTraitObject = extern "cmse-nonsecure-call" fn(&dyn Trait) -> &dyn Trait;
27+
//~^ ERROR return value of `"cmse-nonsecure-call"` function too large to pass via registers [E0798]
2828

2929
type WithStaticTraitObject =
30-
extern "C-cmse-nonsecure-call" fn(&'static dyn Trait) -> &'static dyn Trait;
31-
//~^ ERROR return value of `"C-cmse-nonsecure-call"` function too large to pass via registers [E0798]
30+
extern "cmse-nonsecure-call" fn(&'static dyn Trait) -> &'static dyn Trait;
31+
//~^ ERROR return value of `"cmse-nonsecure-call"` function too large to pass via registers [E0798]
3232

3333
#[repr(transparent)]
3434
struct WrapperTransparent<'a>(&'a dyn Trait);
3535

3636
type WithTransparentTraitObject =
37-
extern "C-cmse-nonsecure-call" fn(WrapperTransparent) -> WrapperTransparent;
38-
//~^ ERROR return value of `"C-cmse-nonsecure-call"` function too large to pass via registers [E0798]
37+
extern "cmse-nonsecure-call" fn(WrapperTransparent) -> WrapperTransparent;
38+
//~^ ERROR return value of `"cmse-nonsecure-call"` function too large to pass via registers [E0798]
3939

40-
type WithVarArgs = extern "C-cmse-nonsecure-call" fn(u32, ...);
40+
type WithVarArgs = extern "cmse-nonsecure-call" fn(u32, ...);
4141
//~^ ERROR C-variadic function must have a compatible calling convention, like `C`

‎tests/ui/cmse-nonsecure/cmse-nonsecure-call/params-via-stack.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ pub struct AlignRelevant(u32);
1313

1414
#[no_mangle]
1515
pub fn test(
16-
f1: extern "C-cmse-nonsecure-call" fn(u32, u32, u32, u32, x: u32, y: u32), //~ ERROR [E0798]
17-
f2: extern "C-cmse-nonsecure-call" fn(u32, u32, u32, u16, u16), //~ ERROR [E0798]
18-
f3: extern "C-cmse-nonsecure-call" fn(u32, u64, u32), //~ ERROR [E0798]
19-
f4: extern "C-cmse-nonsecure-call" fn(AlignRelevant, u32), //~ ERROR [E0798]
20-
f5: extern "C-cmse-nonsecure-call" fn([u32; 5]), //~ ERROR [E0798]
16+
f1: extern "cmse-nonsecure-call" fn(u32, u32, u32, u32, x: u32, y: u32), //~ ERROR [E0798]
17+
f2: extern "cmse-nonsecure-call" fn(u32, u32, u32, u16, u16), //~ ERROR [E0798]
18+
f3: extern "cmse-nonsecure-call" fn(u32, u64, u32), //~ ERROR [E0798]
19+
f4: extern "cmse-nonsecure-call" fn(AlignRelevant, u32), //~ ERROR [E0798]
20+
f5: extern "cmse-nonsecure-call" fn([u32; 5]), //~ ERROR [E0798]
2121
) {
2222
}

‎tests/ui/cmse-nonsecure/cmse-nonsecure-call/return-via-stack.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ pub struct ReprCAlign16(u16);
2323

2424
#[no_mangle]
2525
pub fn test(
26-
f1: extern "C-cmse-nonsecure-call" fn() -> ReprCU64, //~ ERROR [E0798]
27-
f2: extern "C-cmse-nonsecure-call" fn() -> ReprCBytes, //~ ERROR [E0798]
28-
f3: extern "C-cmse-nonsecure-call" fn() -> U64Compound, //~ ERROR [E0798]
29-
f4: extern "C-cmse-nonsecure-call" fn() -> ReprCAlign16, //~ ERROR [E0798]
30-
f5: extern "C-cmse-nonsecure-call" fn() -> [u8; 5], //~ ERROR [E0798]
26+
f1: extern "cmse-nonsecure-call" fn() -> ReprCU64, //~ ERROR [E0798]
27+
f2: extern "cmse-nonsecure-call" fn() -> ReprCBytes, //~ ERROR [E0798]
28+
f3: extern "cmse-nonsecure-call" fn() -> U64Compound, //~ ERROR [E0798]
29+
f4: extern "cmse-nonsecure-call" fn() -> ReprCAlign16, //~ ERROR [E0798]
30+
f5: extern "cmse-nonsecure-call" fn() -> [u8; 5], //~ ERROR [E0798]
3131
) {
3232
}
3333

3434
#[allow(improper_ctypes_definitions)]
3535
struct Test {
36-
u128: extern "C-cmse-nonsecure-call" fn() -> u128, //~ ERROR [E0798]
37-
i128: extern "C-cmse-nonsecure-call" fn() -> i128, //~ ERROR [E0798]
36+
u128: extern "cmse-nonsecure-call" fn() -> u128, //~ ERROR [E0798]
37+
i128: extern "cmse-nonsecure-call" fn() -> i128, //~ ERROR [E0798]
3838
}
3939

4040
#[repr(C)]
@@ -49,7 +49,7 @@ pub union ReprRustUnionU64 {
4949

5050
#[no_mangle]
5151
pub fn test_union(
52-
f1: extern "C-cmse-nonsecure-call" fn() -> ReprRustUnionU64, //~ ERROR [E0798]
53-
f2: extern "C-cmse-nonsecure-call" fn() -> ReprCUnionU64, //~ ERROR [E0798]
52+
f1: extern "cmse-nonsecure-call" fn() -> ReprRustUnionU64, //~ ERROR [E0798]
53+
f2: extern "cmse-nonsecure-call" fn() -> ReprCUnionU64, //~ ERROR [E0798]
5454
) {
5555
}

‎tests/ui/cmse-nonsecure/cmse-nonsecure-call/via-registers.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,26 @@ pub struct U32Compound(u16, u16);
2727
#[no_mangle]
2828
#[allow(improper_ctypes_definitions)]
2929
pub fn params(
30-
f1: extern "C-cmse-nonsecure-call" fn(),
31-
f2: extern "C-cmse-nonsecure-call" fn(u32, u32, u32, u32),
32-
f3: extern "C-cmse-nonsecure-call" fn(u64, u64),
33-
f4: extern "C-cmse-nonsecure-call" fn(u128),
34-
f5: extern "C-cmse-nonsecure-call" fn(f64, f32, f32),
35-
f6: extern "C-cmse-nonsecure-call" fn(ReprTransparentStruct<u64>, U32Compound),
36-
f7: extern "C-cmse-nonsecure-call" fn([u32; 4]),
30+
f1: extern "cmse-nonsecure-call" fn(),
31+
f2: extern "cmse-nonsecure-call" fn(u32, u32, u32, u32),
32+
f3: extern "cmse-nonsecure-call" fn(u64, u64),
33+
f4: extern "cmse-nonsecure-call" fn(u128),
34+
f5: extern "cmse-nonsecure-call" fn(f64, f32, f32),
35+
f6: extern "cmse-nonsecure-call" fn(ReprTransparentStruct<u64>, U32Compound),
36+
f7: extern "cmse-nonsecure-call" fn([u32; 4]),
3737
) {
3838
}
3939

4040
#[no_mangle]
4141
pub fn returns(
42-
f1: extern "C-cmse-nonsecure-call" fn() -> u32,
43-
f2: extern "C-cmse-nonsecure-call" fn() -> u64,
44-
f3: extern "C-cmse-nonsecure-call" fn() -> i64,
45-
f4: extern "C-cmse-nonsecure-call" fn() -> f64,
46-
f5: extern "C-cmse-nonsecure-call" fn() -> [u8; 4],
47-
f6: extern "C-cmse-nonsecure-call" fn() -> ReprTransparentStruct<u64>,
48-
f7: extern "C-cmse-nonsecure-call" fn() -> ReprTransparentStruct<ReprTransparentStruct<u64>>,
49-
f8: extern "C-cmse-nonsecure-call" fn() -> ReprTransparentEnumU64,
50-
f9: extern "C-cmse-nonsecure-call" fn() -> U32Compound,
42+
f1: extern "cmse-nonsecure-call" fn() -> u32,
43+
f2: extern "cmse-nonsecure-call" fn() -> u64,
44+
f3: extern "cmse-nonsecure-call" fn() -> i64,
45+
f4: extern "cmse-nonsecure-call" fn() -> f64,
46+
f5: extern "cmse-nonsecure-call" fn() -> [u8; 4],
47+
f6: extern "cmse-nonsecure-call" fn() -> ReprTransparentStruct<u64>,
48+
f7: extern "cmse-nonsecure-call" fn() -> ReprTransparentStruct<ReprTransparentStruct<u64>>,
49+
f8: extern "cmse-nonsecure-call" fn() -> ReprTransparentEnumU64,
50+
f9: extern "cmse-nonsecure-call" fn() -> U32Compound,
5151
) {
5252
}

‎tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
extern crate minicore;
88
use minicore::*;
99

10-
pub extern "C-cmse-nonsecure-call" fn test() {} //~ ERROR [E0781]
10+
pub extern "cmse-nonsecure-call" fn test() {} //~ ERROR [E0781]

‎tests/ui/cmse-nonsecure/cmse-nonsecure-call/wrong-abi-location-2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
extern crate minicore;
88
use minicore::*;
99

10-
extern "C-cmse-nonsecure-call" { //~ ERROR [E0781]
10+
extern "cmse-nonsecure-call" { //~ ERROR [E0781]
1111
fn test();
1212
}

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/gate_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// gate-test-cmse_nonsecure_entry
22

33
#[no_mangle]
4-
pub extern "C-cmse-nonsecure-entry" fn entry_function(input: u32) -> u32 {
4+
pub extern "cmse-nonsecure-entry" fn entry_function(input: u32) -> u32 {
55
//~^ ERROR [E0570]
66
//~| ERROR [E0658]
77
input + 6

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/generics.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ use minicore::*;
1111
struct Wrapper<T>(T);
1212

1313
impl<T: Copy> Wrapper<T> {
14-
extern "C-cmse-nonsecure-entry" fn ambient_generic(_: T, _: u32, _: u32, _: u32) -> u64 {
14+
extern "cmse-nonsecure-entry" fn ambient_generic(_: T, _: u32, _: u32, _: u32) -> u64 {
1515
//~^ ERROR [E0798]
1616
0
1717
}
1818

19-
extern "C-cmse-nonsecure-entry" fn ambient_generic_nested(
19+
extern "cmse-nonsecure-entry" fn ambient_generic_nested(
2020
//~^ ERROR [E0798]
2121
_: Wrapper<T>,
2222
_: u32,
@@ -27,7 +27,7 @@ impl<T: Copy> Wrapper<T> {
2727
}
2828
}
2929

30-
extern "C-cmse-nonsecure-entry" fn introduced_generic<U: Copy>(
30+
extern "cmse-nonsecure-entry" fn introduced_generic<U: Copy>(
3131
//~^ ERROR [E0798]
3232
_: U,
3333
_: u32,
@@ -37,40 +37,40 @@ extern "C-cmse-nonsecure-entry" fn introduced_generic<U: Copy>(
3737
0
3838
}
3939

40-
extern "C-cmse-nonsecure-entry" fn impl_trait(_: impl Copy, _: u32, _: u32, _: u32) -> u64 {
40+
extern "cmse-nonsecure-entry" fn impl_trait(_: impl Copy, _: u32, _: u32, _: u32) -> u64 {
4141
//~^ ERROR [E0798]
4242
0
4343
}
4444

45-
extern "C-cmse-nonsecure-entry" fn reference(x: &usize) -> usize {
45+
extern "cmse-nonsecure-entry" fn reference(x: &usize) -> usize {
4646
*x
4747
}
4848

4949
trait Trait {}
5050

51-
extern "C-cmse-nonsecure-entry" fn trait_object(x: &dyn Trait) -> &dyn Trait {
52-
//~^ ERROR return value of `"C-cmse-nonsecure-entry"` function too large to pass via registers [E0798]
51+
extern "cmse-nonsecure-entry" fn trait_object(x: &dyn Trait) -> &dyn Trait {
52+
//~^ ERROR return value of `"cmse-nonsecure-entry"` function too large to pass via registers [E0798]
5353
x
5454
}
5555

56-
extern "C-cmse-nonsecure-entry" fn static_trait_object(
56+
extern "cmse-nonsecure-entry" fn static_trait_object(
5757
x: &'static dyn Trait,
5858
) -> &'static dyn Trait {
59-
//~^ ERROR return value of `"C-cmse-nonsecure-entry"` function too large to pass via registers [E0798]
59+
//~^ ERROR return value of `"cmse-nonsecure-entry"` function too large to pass via registers [E0798]
6060
x
6161
}
6262

6363
#[repr(transparent)]
6464
struct WrapperTransparent<'a>(&'a dyn Trait);
6565

66-
extern "C-cmse-nonsecure-entry" fn wrapped_trait_object(
66+
extern "cmse-nonsecure-entry" fn wrapped_trait_object(
6767
x: WrapperTransparent,
6868
) -> WrapperTransparent {
69-
//~^ ERROR return value of `"C-cmse-nonsecure-entry"` function too large to pass via registers [E0798]
69+
//~^ ERROR return value of `"cmse-nonsecure-entry"` function too large to pass via registers [E0798]
7070
x
7171
}
7272

73-
extern "C-cmse-nonsecure-entry" fn c_variadic(_: u32, _: ...) {
73+
extern "cmse-nonsecure-entry" fn c_variadic(_: u32, _: ...) {
7474
//~^ ERROR only foreign, `unsafe extern "C"`, or `unsafe extern "C-unwind"` functions may have a C-variadic arg
7575
//~| ERROR requires `va_list` lang_item
7676
}

‎tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-via-stack.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ use minicore::*;
1212
pub struct AlignRelevant(u32);
1313

1414
#[no_mangle]
15-
pub extern "C-cmse-nonsecure-entry" fn f1(_: u32, _: u32, _: u32, _: u32, _: u32, _: u32) {} //~ ERROR [E0798]
15+
pub extern "cmse-nonsecure-entry" fn f1(_: u32, _: u32, _: u32, _: u32, _: u32, _: u32) {} //~ ERROR [E0798]
1616
#[no_mangle]
17-
pub extern "C-cmse-nonsecure-entry" fn f2(_: u32, _: u32, _: u32, _: u16, _: u16) {} //~ ERROR [E0798]
17+
pub extern "cmse-nonsecure-entry" fn f2(_: u32, _: u32, _: u32, _: u16, _: u16) {} //~ ERROR [E0798]
1818
#[no_mangle]
19-
pub extern "C-cmse-nonsecure-entry" fn f3(_: u32, _: u64, _: u32) {} //~ ERROR [E0798]
19+
pub extern "cmse-nonsecure-entry" fn f3(_: u32, _: u64, _: u32) {} //~ ERROR [E0798]
2020
#[no_mangle]
21-
pub extern "C-cmse-nonsecure-entry" fn f4(_: AlignRelevant, _: u32) {} //~ ERROR [E0798]
21+
pub extern "cmse-nonsecure-entry" fn f4(_: AlignRelevant, _: u32) {} //~ ERROR [E0798]
2222

2323
#[no_mangle]
2424
#[allow(improper_ctypes_definitions)]
25-
pub extern "C-cmse-nonsecure-entry" fn f5(_: [u32; 5]) {} //~ ERROR [E0798]
25+
pub extern "cmse-nonsecure-entry" fn f5(_: [u32; 5]) {} //~ ERROR [E0798]

0 commit comments

Comments
 (0)