Skip to content

Commit 1400e2d

Browse files
workingjubileeworkingjubilee
committed
tests: s/C-cmse/cmse/
1 parent 383d761 commit 1400e2d

File tree

18 files changed

+110
-112
lines changed

18 files changed

+110
-112
lines changed

‎tests/assembly/cmse.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//@ [hard] needs-llvm-components: arm
77
//@ [soft] needs-llvm-components: arm
88
#![crate_type = "lib"]
9-
#![feature(abi_c_cmse_nonsecure_call, cmse_nonsecure_entry, no_core, lang_items)]
9+
#![feature(abi_cmse_nonsecure_call, cmse_nonsecure_entry, no_core, lang_items)]
1010
#![no_core]
1111

1212
extern crate minicore;
@@ -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/ui/abi/unsupported.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
abi_gpu_kernel,
2626
abi_x86_interrupt,
2727
abi_riscv_interrupt,
28-
abi_c_cmse_nonsecure_call,
28+
abi_cmse_nonsecure_call,
2929
abi_vectorcall,
3030
cmse_nonsecure_entry
3131
)]
@@ -117,18 +117,18 @@ fn vectorcall_ptr(f: extern "vectorcall" fn()) {
117117
extern "vectorcall" {}
118118
//[arm,aarch64,riscv32,riscv64]~^ ERROR is not a supported ABI
119119

120-
fn cmse_call_ptr(f: extern "C-cmse-nonsecure-call" fn()) {
120+
fn cmse_call_ptr(f: extern "cmse-nonsecure-call" fn()) {
121121
//~^ ERROR is not a supported ABI
122122
f()
123123
}
124124

125-
extern "C-cmse-nonsecure-entry" fn cmse_entry() {}
125+
extern "cmse-nonsecure-entry" fn cmse_entry() {}
126126
//~^ ERROR is not a supported ABI
127-
fn cmse_entry_ptr(f: extern "C-cmse-nonsecure-entry" fn()) {
127+
fn cmse_entry_ptr(f: extern "cmse-nonsecure-entry" fn()) {
128128
//~^ ERROR is not a supported ABI
129129
f()
130130
}
131-
extern "C-cmse-nonsecure-entry" {}
131+
extern "cmse-nonsecure-entry" {}
132132
//~^ ERROR is not a supported ABI
133133

134134
#[cfg(windows)]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
//@ build-pass
33
//@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
44
//@ needs-llvm-components: arm
5-
#![feature(abi_c_cmse_nonsecure_call, cmse_nonsecure_entry, no_core, lang_items, intrinsics)]
5+
#![feature(abi_cmse_nonsecure_call, cmse_nonsecure_entry, no_core, lang_items, intrinsics)]
66
#![no_core]
77

88
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// gate-test-abi_c_cmse_nonsecure_call
1+
// gate-test-abi_cmse_nonsecure_call
22
fn main() {
33
let non_secure_function = unsafe {
4-
core::mem::transmute::<usize, extern "C-cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
4+
core::mem::transmute::<usize, extern "cmse-nonsecure-call" fn(i32, i32, i32, i32) -> i32>(
55
//~^ ERROR: is not a supported ABI for the current target [E0570]
66
//~| ERROR: ABI is experimental and subject to change [E0658]
77
0x10000004,

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ add-core-stubs
22
//@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
33
//@ needs-llvm-components: arm
4-
#![feature(abi_c_cmse_nonsecure_call, no_core, lang_items)]
4+
#![feature(abi_cmse_nonsecure_call, no_core, lang_items)]
55
#![no_core]
66

77
extern crate minicore;
@@ -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, ...);
41-
//~^ ERROR C-variadic functions with the "C-cmse-nonsecure-call" calling convention are not supported
40+
type WithVarArgs = extern "cmse-nonsecure-call" fn(u32, ...);
41+
//~^ ERROR C-variadic functions with the "cmse-nonsecure-call" calling convention are not supported

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ add-core-stubs
22
//@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
33
//@ needs-llvm-components: arm
4-
#![feature(abi_c_cmse_nonsecure_call, no_core, lang_items)]
4+
#![feature(abi_cmse_nonsecure_call, no_core, lang_items)]
55
#![no_core]
66

77
extern crate minicore;
@@ -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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//@ needs-llvm-components: arm
44
//@ add-core-stubs
55

6-
#![feature(abi_c_cmse_nonsecure_call, no_core, lang_items)]
6+
#![feature(abi_cmse_nonsecure_call, no_core, lang_items)]
77
#![no_core]
88

99
extern crate minicore;
@@ -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: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@ build-pass
33
//@ compile-flags: --target thumbv8m.main-none-eabi --crate-type lib
44
//@ needs-llvm-components: arm
5-
#![feature(abi_c_cmse_nonsecure_call, no_core, lang_items, intrinsics)]
5+
#![feature(abi_cmse_nonsecure_call, no_core, lang_items, intrinsics)]
66
#![no_core]
77

88
extern crate minicore;
@@ -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
}

0 commit comments

Comments
 (0)