Merge asm implementations #262
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
S-waiting-on-review
adamgreig
previously approved these changes
Aug 29, 2020
There was a problem hiding this comment.
This looks great, nice work! I'll hold off on the merge to give everyone a chance to have a look over it. Once it's merged let's sort out the remaining fixmes/todos and I'd like to modify the methods that use explicit registers to instead use generic named registers that the compiler can allocate.
jonas-schievink
commented
Aug 29, 2020
jonas-schievink
dismissed stale reviews from therealprof and adamgreig
via
0e7707a
Rahix
reviewed
Aug 31, 2020
Comment on lines
-9
to
-24
| match () { | ||
| #[cfg(all(cortex_m, feature = "inline-asm"))] | ||
| () => unsafe { llvm_asm!("bkpt" :::: "volatile") }, | ||
|
|
||
| #[cfg(all(cortex_m, not(feature = "inline-asm")))] | ||
| () => unsafe { | ||
| extern "C" { | ||
| fn __bkpt(); | ||
| } | ||
|
|
||
| __bkpt(); | ||
| }, | ||
|
|
||
| #[cfg(not(cortex_m))] | ||
| () => unimplemented!(), | ||
| } |
There was a problem hiding this comment.
It still builds fine for me. Maybe not with inline-asm. I should be able to add this feature back though.
There was a problem hiding this comment.
Ah, I remember now, I removed this to avoid all the warnings this generates. These were the reason almost the entire crate used function arguments like _val. I think we should leave this as-is for now.
therealprof
approved these changes
Aug 31, 2020
therealprof
requested changes
Aug 31, 2020
|
Build succeeded: |
adamgreig
added a commit
that referenced
this pull request
Jan 12, 2022
262: Add testing linker=arm-none-eabi-gcc and MSRV to CI r=therealprof a=adamgreig Replacing #260. This PR extends our current tests with `linker=rust-lld` and `linker=arm-none-eabi-ld` to include `linker=arm-none-eabi-gcc`, since those options are all included in our example [`.cargo/config`](https://github.com/rust-embedded/cortex-m-rt/blob/master/.cargo/config). It looks like another linker only adds a handful of seconds to CI, since most time is spent building dependencies once. It also adds a test with Rust 1.32.0 to the CI as a candidate MSRV. Building with 1.31.0 fails because of the dev-dependency on cortex-m-semihosting 0.3.5: ``` error[E0658]: using the `?` macro Kleene operator for "at most one" repetition is unstable (see issue #48075) --> /home/adam/.cargo/registry/src/github.com-1ecc6299db9ec823/cortex-m-semihosting-0.3.5/src/macros.rs:111:25 | 111 | ($($val:expr),+ $(,)?) => { | ^ error: expected `*` or `+` ``` That's just a test error which end users wouldn't experience, so we could consider making 1.31.0 the MSRV and working around the c-m-semihosting issue. I don't know if there are other 1.31.0 issues. Finally the PR removes the travis check preventing builds on pushes to master. In principle we know that builds to master succeed because bors tests them before pushing, so adding the extra check mostly means we get a well-defined build status from Travis for flags etc. The build times for cortex-m-rt (around 3min overall) are a bit longer than r0 (where we did the same thing), so we could just run a minimal test here instead. I don't think it's a significant overhead given how infrequently we push to master, though. Co-authored-by: Adam Greig <adam@adamgreig.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This replaces the implementation of
inline-asmwith the file I wrote in #259 (and some fixes).All functions that call assembly now do so via a
call_asm!macro that either dispatches to a call to an#[inline(always)]function containing the inlineasm!, or to the FFI shim. This makes all functions that call into asm significantly shorter.The FFI shim is now also macro-generated, which makes it very small.