Skip to content

Conversation

hudson-ayers
Copy link
Contributor

@hudson-ayers hudson-ayers commented Dec 31, 2020

Pull Request Overview

This pull request converts several more uses of llvm_asm --> asm, for a few risc-v platforms. I specifically chose the instances contained within #[naked] functions, which are disallowed in newer versions of rustc.

Testing Strategy

This pull request was tested by compiling only!

TODO or Help Wanted

testing plz

Documentation Updated

  • Updated the relevant files in /docs, or no updates are required.

Formatting

  • Ran make prepush.

@hudson-ayers hudson-ayers added the WG-OpenTitan In the purview of the OpenTitan working group. label Jan 1, 2021
:
:
: "volatile");
unreachable_unchecked()
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you intend to remove this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes. Applying the noreturn option should have the same effect -- it tells the compiler that we can never fall out of the asm block.

bradjc
bradjc previously approved these changes Jan 5, 2021
Copy link
Contributor

@bradjc bradjc left a comment

Choose a reason for hiding this comment

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

This all looks fine. Pretty minor changes.

alistair23
alistair23 previously approved these changes Jan 5, 2021
@hudson-ayers
Copy link
Contributor Author

whoops, I thought that import was unused bc I missed the gap in the diff. I put it back to how it was before.

bradjc
bradjc previously approved these changes Jan 5, 2021
@bradjc
Copy link
Contributor

bradjc commented Jan 8, 2021

bors r+

@bors
Copy link
Contributor

bors bot commented Jan 8, 2021

Merge conflict.

@bradjc
Copy link
Contributor

bradjc commented Jan 8, 2021

bors r+

bradjc
bradjc previously approved these changes Jan 8, 2021
@bors
Copy link
Contributor

bors bot commented Jan 8, 2021

Canceled.

@hudson-ayers
Copy link
Contributor Author

rebased to fix merge conflict

@bradjc
Copy link
Contributor

bradjc commented Jan 8, 2021

bors r+

@bors
Copy link
Contributor

bors bot commented Jan 8, 2021

Build failed:

  • ci-tests (macos-latest)

@hudson-ayers
Copy link
Contributor Author

the bors macos build was cancelled bc the mac github actions are finicky but everything else passed so I am going to manually merge.

@hudson-ayers hudson-ayers merged commit 24b1138 into tock:master Jan 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WG-OpenTitan In the purview of the OpenTitan working group.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants