Add a simple way to convert a CommandReturn into a Result #370
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
There are a few changes that this makes: - CommandReturn is #[must_use] - ErrorCode includes BadRVal - CommandReturn has a to_result method I experimented with a few methods of structuring to_result to have the smallest overhead per monomorphization. What you see here is the best I could do. I also tried: - Providing a `try_into_result` and using that (lots of overhead) - Preserving the error code of the failure variant on BADRVAL - Associated constant `FailureData::BADRVAL` - Associated fn `FailureData::from_wrong_variant(r1: ErrorCode) -> Self`
jrvanwhy
reviewed
Feb 1, 2022
jrvanwhy
approved these changes
Feb 1, 2022
alistair23
approved these changes
Feb 2, 2022
hudson-ayers
approved these changes
Feb 2, 2022
|
bors r+ |
hudson-ayers
pushed a commit
that referenced
this pull request
Feb 3, 2022
The only major change from upstream that this preserves is customized external assembly linkage. This should be mostly removed once libtock switches to using `global_asm!` - now that that will be stabilized. This CL is a squash merge of the following commits: 28ebb70 Merge #365 a0440ba Merge #370 abff51c Merge #359 85242dc Merge #364 f1bd0d4 Merge #361 b0f8593 Merge #355 4c7ecb6 Merge #358 6f8b512 Merge #356 73cbbde Merge #357 022984f Merge #353 b2e6471 Merge #352 9eb12c0 Merge #351 This was retrieved with the following command: ``` git log ti50-internal/upstream/master --not \ $(git merge-base --all ti50-internal/upstream/master m/main) \ --first-parent ``` BUG=None TEST=ti50/common make build SOURCE=UPSTREAM(28ebb70) Change-Id: I0aa1606f407a0b4bcf0c76b62261414903479092
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.
There are a few changes that this makes:
CommandReturnis#[must_use]ErrorCodeincludesBadRValCommandReturnhas ato_resultmethodI experimented with a few methods of structuring
to_resultto have thesmallest overhead per monomorphization. What you see here is the best I
could do. I also tried:
try_to_resultand using that (lots of overhead)BADRVALFailureData::BADRVALFailureData::from_wrong_variant(r1: ErrorCode) -> Selffn to_result_helper(self, success_variant: ReturnVariant, error_variant: ReturnVariant) -> (bool, u32, u32, u32)that would do the branches and replacingr1withBadRValand other registers with0in the case of the wrong variant. I thought this would reduce things further but it seemed to make it worse in my tests. Then again - I only had one instance of each monomorphization.