add `extern "C-cmse-nonsecure-entry" fn` #127766

folkertdev · 2024-07-15T15:20:29Z

tracking issue #75835

in #75835 (comment) it was decided that using an abi, rather than an attribute, was the right way to go for this feature.

This PR adds that ABI and removes the #[cmse_nonsecure_entry] attribute. All relevant tests have been updated, some are now obsolete and have been removed.

Error 0775 is no longer generated. It contains the list of targets that support the CMSE feature, and maybe we want to still use this? right now a generic "this abi is not supported on this platform" error is returned when this abi is used on an unsupported platform. On the other hand, users of this abi are likely to be experienced rust users, so maybe the generic error is good enough.

rustbot · 2024-07-15T15:20:37Z

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-07-15T15:20:39Z

These commits modify compiler targets.
(See the Target Tier Policy.)

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

This PR changes Stable MIR

cc @oli-obk, @celinval, @ouz-a

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-registers.rs

lcnr · 2024-07-16T07:44:53Z

r? compiler

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

…rror-messages, r=oli-obk `C-cmse-nonsecure-call`: improved error messages tracking issue: rust-lang#81391 issue for the error messages (partially implemented by this PR): rust-lang#81347 related, in that it also deals with CMSE: rust-lang#127766 When using the `C-cmse-nonsecure-call` ABI, both the arguments and return value must be passed via registers. Previously, when violating this constraint, an ugly LLVM error would be shown. Now, the rust compiler itself will print a pretty message and link to more information.

Rollup merge of rust-lang#127814 - folkertdev:c-cmse-nonsecure-call-error-messages, r=oli-obk `C-cmse-nonsecure-call`: improved error messages tracking issue: rust-lang#81391 issue for the error messages (partially implemented by this PR): rust-lang#81347 related, in that it also deals with CMSE: rust-lang#127766 When using the `C-cmse-nonsecure-call` ABI, both the arguments and return value must be passed via registers. Previously, when violating this constraint, an ugly LLVM error would be shown. Now, the rust compiler itself will print a pretty message and link to more information.

…ages, r=oli-obk `C-cmse-nonsecure-call`: improved error messages tracking issue: #81391 issue for the error messages (partially implemented by this PR): #81347 related, in that it also deals with CMSE: rust-lang/rust#127766 When using the `C-cmse-nonsecure-call` ABI, both the arguments and return value must be passed via registers. Previously, when violating this constraint, an ugly LLVM error would be shown. Now, the rust compiler itself will print a pretty message and link to more information.

rustbot · 2024-07-22T08:57:51Z

HIR ty lowering was modified

cc @fmease

folkertdev · 2024-07-22T09:07:03Z

We've just added nicer error message in the same style as #127814. We believe that this resolves all steps from the tracking issue.

apiraino · 2024-07-30T13:41:24Z

r? compiler

fee1-dead · 2024-07-31T02:08:26Z

r? compiler

bors · 2024-08-07T06:32:01Z

☔ The latest upstream changes (presumably #128763) made this pull request unmergeable. Please resolve the merge conflicts.

folkertdev · 2024-08-15T14:27:12Z

r? @jackh726

you reviewed the structurally similar #111891, the most recent new ABI addition. Could you review this one too?

We've had some trouble finding a good reviewer here because this change, while simple in theory, touches a lot of different parts of the compiler.

Conceptually, all this does is add a new variant to the abi enum, and then follow the compiler error messages. In most files, the number of changes lines is minimal, and completely in line with surrounding code. Then, the cmse entry attribute is removed and the tests are updated. So, all changes follow naturally, but it's a lot.

bors · 2024-09-20T20:23:06Z

☔ The latest upstream changes (presumably #124895) made this pull request unmergeable. Please resolve the merge conflicts.

jackh726

Really sorry for the review delay here.

Overview seems quite straightforward. Given the comment from the lang team in the tracking issue calling for this change, I don't think they need to be involved here.

A couple small comments, but happy to land after a rebase.

jackh726 · 2024-09-21T02:12:00Z

compiler/rustc_error_codes/src/error_codes/E0775.md

@@ -3,11 +3,10 @@ extension.

 Erroneous code example:

-```compile_fail,E0775
+```ignore (no longer emitted)


Should this test also get the "Note: this error code is no longer emitted by the compiler." at the top?

yes, I added that now. We had some thoughts about re-using this error code, but if we end up doing that we can just remove that note.

jackh726 · 2024-09-21T02:13:37Z

compiler/rustc_middle/src/middle/codegen_fn_attrs.rs

-        /// #[cmse_nonsecure_entry]: with a TrustZone-M extension, declare a
-        /// function as an entry function from Non-Secure code.
-        const CMSE_NONSECURE_ENTRY      = 1 << 13;
+        // (Bit 13 was used for `#[cmse_nonsecure_entry]`, but is now unused.)


Not sure if this comment is needed. I guess bit 7 maybe also was used previously but no more? There's no comment there.

we are just following bit 14 here

// (Bit 13 was used for `#[cmse_nonsecure_entry]`, but is now unused.) // (Bit 14 was used for `#[coverage(off)]`, but is now unused.)

I'm not sure what happened to bit 7, but it seems useful to document what bits were used for (e.g. if we ever run out of bits in this 32-bit integer, and might want to re-use one of the unused ones).

verifies that the correct return instructions are emitted. Co-authored-by: Tamme Dittrich <tamme@tweedegolf.com>

folkertdev · 2024-09-21T14:51:36Z

Should be all good now

@rustbot ready

jackh726 · 2024-09-21T15:39:54Z

@bors r+

bors · 2024-09-21T15:39:56Z

📌 Commit ac9a49f has been approved by jackh726

It is now in the queue for this repository.

… r=jackh726 add `extern "C-cmse-nonsecure-entry" fn` tracking issue rust-lang#75835 in rust-lang#75835 (comment) it was decided that using an abi, rather than an attribute, was the right way to go for this feature. This PR adds that ABI and removes the `#[cmse_nonsecure_entry]` attribute. All relevant tests have been updated, some are now obsolete and have been removed. Error 0775 is no longer generated. It contains the list of targets that support the CMSE feature, and maybe we want to still use this? right now a generic "this abi is not supported on this platform" error is returned when this abi is used on an unsupported platform. On the other hand, users of this abi are likely to be experienced rust users, so maybe the generic error is good enough.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#127766 (add `extern "C-cmse-nonsecure-entry" fn` ) - rust-lang#129629 (Implement Return Type Notation (RTN)'s path form in where clauses) - rust-lang#130246 (rustc_expand: remember module `#[path]`s during expansion) - rust-lang#130408 (Avoid re-validating UTF-8 in `FromUtf8Error::into_utf8_lossy`) - rust-lang#130651 (Add --enable-profiler to armhf dist) - rust-lang#130653 (ABI compatibility: mention Result guarantee) - rust-lang#130665 (Prevent Deduplication of `LongRunningWarn`) - rust-lang#130666 (Assert that `explicit_super_predicates_of` and `explicit_item_super_predicates` truly only contains bounds for the type itself) - rust-lang#130667 (compiler: Accept "improper" ctypes in extern "rust-cold" fn) r? `@ghost` `@rustbot` modify labels: rollup

… r=jackh726 add `extern "C-cmse-nonsecure-entry" fn` tracking issue rust-lang#75835 in rust-lang#75835 (comment) it was decided that using an abi, rather than an attribute, was the right way to go for this feature. This PR adds that ABI and removes the `#[cmse_nonsecure_entry]` attribute. All relevant tests have been updated, some are now obsolete and have been removed. Error 0775 is no longer generated. It contains the list of targets that support the CMSE feature, and maybe we want to still use this? right now a generic "this abi is not supported on this platform" error is returned when this abi is used on an unsupported platform. On the other hand, users of this abi are likely to be experienced rust users, so maybe the generic error is good enough.

rustbot assigned lcnr Jul 15, 2024

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 15, 2024

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 15, 2024

This comment has been minimized.

Sign in to view

folkertdev force-pushed the c-cmse-nonsecure-entry branch from 06fe23a to 9d04d69 Compare July 15, 2024 15:34

This comment has been minimized.

Sign in to view

folkertdev force-pushed the c-cmse-nonsecure-entry branch from 9d04d69 to 8da0efe Compare July 15, 2024 16:10

This comment has been minimized.

Sign in to view

folkertdev commented Jul 15, 2024

View reviewed changes

tests/ui/cmse-nonsecure/cmse-nonsecure-entry/params-on-registers.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

rustbot assigned fmease and unassigned lcnr Jul 16, 2024

tdittr reviewed Jul 16, 2024

View reviewed changes

tests/ui/cmse-nonsecure/cmse-nonsecure-call/callback-as-argument.rs Show resolved Hide resolved

folkertdev mentioned this pull request Jul 16, 2024

C-cmse-nonsecure-call: improved error messages #127814

Merged

folkertdev force-pushed the c-cmse-nonsecure-entry branch from af4c41b to 87224ba Compare July 22, 2024 08:57

rustbot assigned fee1-dead and unassigned fmease Jul 30, 2024

rustbot assigned wesleywiser Jul 31, 2024

folkertdev force-pushed the c-cmse-nonsecure-entry branch from 2fc72c6 to 9be420a Compare August 5, 2024 08:43

folkertdev force-pushed the c-cmse-nonsecure-entry branch from 9be420a to da55a39 Compare August 7, 2024 09:12

folkertdev force-pushed the c-cmse-nonsecure-entry branch from da55a39 to a756451 Compare August 15, 2024 08:00

rustbot assigned jackh726 and unassigned wesleywiser Aug 15, 2024

jackh726 approved these changes Sep 21, 2024

View reviewed changes

jackh726 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 21, 2024

folkertdev and others added 6 commits September 21, 2024 13:04

add C-cmse-nonsecure-entry ABI

1ddd67a

remove #[cmse_nonsecure_entry]

5722a80

add test that accepts a C-cmse-nonsecure-call function pointer

a33dcb3

Add assembly test for the cmse unstable features

a41c209

verifies that the correct return instructions are emitted. Co-authored-by: Tamme Dittrich <tamme@tweedegolf.com>

disallow cmse ABIs on unsupported platforms

4d75a4f

mark E0775 as no longer emitte by the compiler

ac9a49f

folkertdev force-pushed the c-cmse-nonsecure-entry branch from a756451 to ac9a49f Compare September 21, 2024 11:12

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 21, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 21, 2024

matthiaskrgr mentioned this pull request Sep 21, 2024

Rollup of 9 pull requests #130671

Closed

compiler-errors mentioned this pull request Sep 21, 2024

Rollup of 8 pull requests #130674

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add `extern "C-cmse-nonsecure-entry" fn` #127766

add `extern "C-cmse-nonsecure-entry" fn` #127766

folkertdev commented Jul 15, 2024

rustbot commented Jul 15, 2024

rustbot commented Jul 15, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

lcnr commented Jul 16, 2024

rustbot commented Jul 22, 2024

folkertdev commented Jul 22, 2024

apiraino commented Jul 30, 2024

fee1-dead commented Jul 31, 2024

bors commented Aug 7, 2024

folkertdev commented Aug 15, 2024

bors commented Sep 20, 2024

jackh726 left a comment

jackh726 Sep 21, 2024

folkertdev Sep 21, 2024

jackh726 Sep 21, 2024

folkertdev Sep 21, 2024

folkertdev commented Sep 21, 2024

jackh726 commented Sep 21, 2024

bors commented Sep 21, 2024

add extern "C-cmse-nonsecure-entry" fn #127766

Are you sure you want to change the base?

add extern "C-cmse-nonsecure-entry" fn #127766

Conversation

folkertdev commented Jul 15, 2024

rustbot commented Jul 15, 2024

rustbot commented Jul 15, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

lcnr commented Jul 16, 2024

rustbot commented Jul 22, 2024

folkertdev commented Jul 22, 2024

apiraino commented Jul 30, 2024

fee1-dead commented Jul 31, 2024

bors commented Aug 7, 2024

folkertdev commented Aug 15, 2024

bors commented Sep 20, 2024

jackh726 left a comment

Choose a reason for hiding this comment

jackh726 Sep 21, 2024

Choose a reason for hiding this comment

folkertdev Sep 21, 2024

Choose a reason for hiding this comment

jackh726 Sep 21, 2024

Choose a reason for hiding this comment

folkertdev Sep 21, 2024

Choose a reason for hiding this comment

folkertdev commented Sep 21, 2024

jackh726 commented Sep 21, 2024

bors commented Sep 21, 2024

add `extern "C-cmse-nonsecure-entry" fn` #127766

add `extern "C-cmse-nonsecure-entry" fn` #127766