Merge changes from CTSRD main up to 0817f2de77ad9f3813d14fa85323cef468349453 #268
Conversation
This file contains hidden or 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
Collaborator
resistor
commented
Nov 11, 2025
resistor
commented
- [llvm-objdump][llvm-readobj] Decode code caprelocs permissions
- [BinaryFormat][RISCV] Reserve R_RISCV_FUNC_RELATIVE
- [clang][CodeGen] Use index type for inline asm ptrtoint
- Revert "Utils: add missing dep for llvm/CodeGen/GenVT.inc"
- [CHERI-Generic] Pre-commit a new test showing missed immediate use
- [NFC][RISCV] Fix include order in RISCVTargetObjectFile.cpp
- [NFC][ELF][CHERI] Rename cheriCap(Call)Rel to symbolicCap(Call)Rel
- [NFC][ELF][CHERI] Make CaptablePermissions a bit less ugly
- [NFC][ELF][CHERI] Rename CaptablePermissions to CapRelocPermission
- [NFC][AsmPrinter] Reformat CHERI block address code
- [NFCI][CodeGen][MC][Mips][RISCV] Follow emitValue for EmitCheriCapability
For non-c18n runtimes this is the same as a plain function capreloc, but for c18n runtimes this marks capabilities that must not be wrapped in a trampoline as they must point directly to the code in question.
For non-c18n runtimes this is the same as R_RISCV_RELATIVE, but for c18n runtimes this marks addresses that must not be wrapped in a trampoline as they must point directly to the code in question.
When the return type of an inline asm instruction needs to be truncated to an integer type we need to use the index type and not the size of the pointer type so as to not crash.
This was needed due to a layering violation, and the dependency itself is also a layering violation. The underlying cause has now been fixed. This reverts commit 430ebd2.
This makes it clearer they're equivalent to symbolicRel.
Note that the clang-format directives are in anticipation of future additions, where we will still want to keep the equals signs, and thus bit numbers, aligned to make it easier to read.
…lity Rename the underlying function to emitCheriCapability, and have the symbol-only version be non-virtual and called emitSymbolCheriCapability like emitSymbolValue. Drop the addend overloads and let the callers create the adds. Not many callers exist, no equivalent exists for integers, and two of the three uses will be changed in a future commit anyway.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.