Support/avr platform #12
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "arch": "avr", | ||
| "atomic-cas": false, | ||
| "cpu": "atmega328p", | ||
| "data-layout": "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8", | ||
| "eh-frame-header": false, | ||
| "exe-suffix": ".elf", | ||
| "executables": true, | ||
| "late-link-args": { | ||
| "gcc": [ | ||
| "-lgcc" | ||
| ] | ||
| }, | ||
| "linker": "avr-gcc", | ||
| "linker-is-gnu": true, | ||
| "llvm-target": "avr-unknown-unknown", | ||
| "max-atomic-width": 8, | ||
| "no-default-libraries": false, | ||
| "pre-link-args": { | ||
| "gcc": [ | ||
| "-mmcu=atmega328p", | ||
| "-Wl,--as-needed" | ||
| ] | ||
| }, | ||
| "target-c-int-width": "16", | ||
| "target-pointer-width": "16" | ||
| } |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| #![cfg_attr(docsrs, feature(doc_cfg))] | ||
| #![no_std] | ||
| #![cfg_attr(target_arch = "avr", feature(llvm_asm))] | ||
| #![cfg_attr(target_arch = "avr", feature(extended_key_value_attributes))] | ||
| #![doc = include_str!("../README.md")] | ||
|
|
||
| pub use bare_metal::CriticalSection; | ||
|
|
@@ -118,6 +120,25 @@ cfg_if::cfg_if! { | |
| cortex_m::interrupt::enable() | ||
| } | ||
| } | ||
| } else if #[cfg(target_arch = "avr")] { | ||
| #[no_mangle] | ||
| unsafe fn _critical_section_acquire() -> u8 { | ||
| let mut sreg: u8; | ||
| llvm_asm!( | ||
|
There was a problem hiding this comment. Is it possible to use the newer There was a problem hiding this comment. Last I checked
Also, the last time I dealt with assembly language was 1987 on an 8086. There was a problem hiding this comment. Okay, just wanted to confirm!
😂 |
||
| "in $0, 0x3F | ||
| cli" | ||
| : "=r"(sreg) | ||
| ::: "volatile" | ||
| ); | ||
| sreg | ||
| } | ||
|
|
||
| #[no_mangle] | ||
| unsafe fn _critical_section_release(token: u8) { | ||
| if token & 0x80 == 0x80 { | ||
| llvm_asm!("sei" :::: "volatile"); | ||
| } | ||
| } | ||
| } else if #[cfg(target_arch = "riscv32")] { | ||
| #[no_mangle] | ||
| unsafe fn _critical_section_acquire() -> u8 { | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a reason to use such an old nightly?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. Attempting to use a modern version of rust fails with
error: ran out of registers during register allocationIt may be covered by rust-lang/rust#88252 , but Rust on AVR has been waiting for a fix for a long time and has to muddle along with old tools.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh, I see. No problem then, was just curious :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if it is possible to just
rustup install nightly-2021-01-07in theci.sh, but I don't know how to test it without pushing another commit.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See my comment in the main thread. also feel free to push as many commits as you need! you can squash/amend later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found a way to make
ci.shwork. I just did arustup toolchain install nightly-2021-01-07 --component rust-srcbefore I compile for AVR. There might be a more elegant way to do it, but I do not know what it would be.