-
Notifications
You must be signed in to change notification settings - Fork 121
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
Add msl to ARMConstantTweak and recognise ldrsw to prevent delocator errors #2177
Open
jakemas
wants to merge
9
commits into
aws:main
Choose a base branch
from
jakemas:delocator-peg-msl
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,314
−1,246
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2177 +/- ##
=======================================
Coverage 79.01% 79.02%
=======================================
Files 612 612
Lines 106071 106072 +1
Branches 14994 14994
=======================================
+ Hits 83814 83821 +7
+ Misses 21604 21598 -6
Partials 653 653 ☔ View full report in Codecov by Sentry. |
torben-hansen
previously approved these changes
Feb 7, 2025
andrewhop
reviewed
Feb 7, 2025
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.
Please update the arm delocator tests to include msl and ldrsw.
andrewhop
previously approved these changes
Feb 8, 2025
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.
Issues:
Resolves CI failures around delocator in #2175
Description of changes:
The FIPS static builds for ARM are failing CI:
This was discussed back in #2096 but not merged due to the PR being closed.
The Arm instruction has a special argument
msl
(https://developer.arm.com/documentation/100069/0606/SIMD-Vector-Instructions/MOVI--vector-). The delocator is intepretingmsl
as a function (or global symbol). Since it’s not defined in the fipsmodule, it creates a jump functionbcm_redirector_msl
outside the fipsmodule that removes a potential relocation. The suffix ofbcm_redirector_msl
is the original token, which matchesmsl
.We fix by adding
msl
to the list ofARMConstantTweak
and regenerate thedelocate.peg.go
file.After testing this fix, I begin to see a second error in
amazonlinux2023_clang15x_aarch_fips
:It seems that
ldrsw
is not recognised asldr
. We already haveldrsw
in our code, so we extend the delocate.go to acceptldrsw
in addition toldr
.Call-outs:
Unblocks progress on work in the FIPS module, such as ED25519 and ML-DSA.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.