Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Register derived from (resolve merge conflicts) #301

Merged

Conversation

burrbull
Copy link
Member

@burrbull burrbull commented Jun 1, 2019

No description provided.

Emilgardis and others added 30 commits May 16, 2018 19:02
Also added `--list` to show what test cases would have been run using
the current filters
Also implements an alternate way to choose toolchain
The enums are just values so this should do no harm, and it helps
building interfaces around the peripherals that do validation or
otherwise pass those values around.

Closes: rust-embedded#135
It only makes sense to export interrupt if the interrupt! macro is
exported as well, since it's the only thing using it.
261: Only export Interrupt as interrupt when 'rt' is enabled r=japaric a=rnestler

It only makes sense to export interrupt if the interrupt! macro is
exported as well, since it's the only thing using it.
Fixes rust-embedded#260 

Co-authored-by: Raphael Nestler <raphael.nestler@gmail.com>
Escape brackets on all description doc strings
265: Consistent svd2rust output r=japaric a=jamesmunns

NOTE: I believe there is still documentation that will need to be updated to represent this. I wanted to make sure my CI changes still work without the other changes (like Cargo.toml) after pulling these changes

Co-authored-by: James Munns <james.munns@ferrous-systems.com>
this commit:

- fixes cortex-m version in documentation (v0.5.x is the latest available
version)

- updates docs to note that svd2rust writes generated code to lib.rs for all
targets

- updates the CHANGELOG
japaric and others added 16 commits May 21, 2019 20:49
this removes the Linux GNU targets used to produce binaries but we still have
the MUSL builds which will work everywhere because they statically linked
binaries
297: CI: use Cargo instead of Cross r=therealprof a=japaric

this removes the Linux GNU targets used to produce binaries but we still have
the MUSL builds which will work everywhere because they statically linked
binaries

Co-authored-by: Jorge Aparicio <jorge@japaric.io>
293: Fix rustc warnings. r=therealprof a=bjc

This just removes two rustc warnings about an unused `mut` and redundant `use`.

Co-authored-by: Brian Cully <bjc@kublai.com>
221: Improve ci r=therealprof a=Emilgardis

This pr includes

- Support for the changes done in v0.13
- `--toolchain foo` to specify what toolchain to build the chips with (makes building locally easier, no need to rebuild `svd2rust-regress`)
- Add support for `--chip XXX YYY`
- Added validators to chip, manufacturer and architecture
- `-vv` will now output all stderr logs
- Added `--list` to quickly troubleshoot what test cases will be run
- A patched ATSAMD21G18A svd, thanks to @wez 

## Open "issues"
- Should we ignore case when filtering?
- Should a `--chip XXX` always run even if it is set to only run on `--long-test` (and possibly `--bad-test`)
- Add a `--` command to pass arguments to `svd2rust` and possibly also a way to pass arguments to `cargo check`
- Colorize output
- Add regress:beta test to gitlab-runner
- Move test cases to a or multiple config file(s) (e.g json/toml/yaml)

cc @jamesmunns 

Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>
Co-authored-by: Vadim Kaushan <admin@disasm.info>
If svd2rust fails its always useful to get some information about the where and why
Co-Authored-By: Daniel Egger <daniel@eggers-club.de>
295: Add support for 64-bit registers r=therealprof a=Disasm

Some registers on K210 chip are 64-bit, so it's better to declare them as u64 in SVD for the reasons mentioned here: riscv-rust/k210-pac#1 (comment)
At the moment, svd2rust forbids 64-bit register declarations. This PR fixes this.

This change can cause silent bugs on platforms without 64-bit memory access operations due to the need for proper access sequence to 64-bit registers with two 32-bit accesses.

Closes rust-embedded#289

Co-authored-by: Vadim Kaushan <admin@disasm.info>
281: Edition-2018-ify svd2rust r=ryankurte a=therealprof

Signed-off-by: Daniel Egger <daniel@eggers-club.de>

Co-authored-by: Daniel Egger <daniel@eggers-club.de>
298: Added RUST_BACKTRACE=1 to enable backtraces r=ryankurte a=therealprof

If svd2rust fails its always useful to get some information about the where and why

Co-authored-by: Daniel Egger <daniel@eggers-club.de>
238: Remove debug assert from Peripherals::steal r=therealprof a=thenewwazoo

Very simple PR! :)

This permits actually-unsafe use of the steal method, and avoids divergent behavior between debug and release modes.

Co-authored-by: Brandon Matthews <bmatthews@zipcar.com>
@burrbull burrbull requested a review from a team as a code owner June 1, 2019 10:41
@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Emilgardis (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive
Copy link

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against register-derived-from. Please double check that you specified the right target!

@rust-highfive rust-highfive added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-tools labels Jun 1, 2019
@Emilgardis
Copy link
Member

Emilgardis commented Jun 1, 2019

bors try

EDIT:: oh yeah, no ci setup for that branch ofc.

this looks good to me, I don't particularly like merge commits however

Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, minor nit about merge commit, but unsure if that's even unavoidable with prs

@burrbull
Copy link
Member Author

burrbull commented Jun 1, 2019

изображение

@burrbull
Copy link
Member Author

burrbull commented Jun 1, 2019

Compare with master:
изображение

@Emilgardis
Copy link
Member

thank you, merging 👍

@Emilgardis Emilgardis merged commit e76f2c2 into rust-embedded:register-derived-from Jun 1, 2019
@bors
Copy link
Contributor

bors bot commented Jun 8, 2019

try

Merge conflict

@burrbull burrbull deleted the register-derived-from branch July 12, 2019 17:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-tools
Projects
None yet
Development

Successfully merging this pull request may close these issues.