Skip to content

[CHERIoT] Add an ELF flag for RISCV_CHERIOT. #140

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 14, 2025
Merged

[CHERIoT] Add an ELF flag for RISCV_CHERIOT. #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lld/ELF/Arch/RISCV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ uint32_t RISCV::calcEFlags() const {
if ((eflags & EF_RISCV_CAP_MODE) != (target & EF_RISCV_CAP_MODE))
Err(ctx) << f
<< ": cannot link object files with different EF_RISCV_CAP_MODE";

if ((eflags & EF_RISCV_CHERIOT) != (target & EF_RISCV_CHERIOT))
Err(ctx) << f
<< ": cannot link object files with different EF_RISCV_CHERIOT";
}

return target;
Expand Down
1 change: 1 addition & 0 deletions llvm/include/llvm/BinaryFormat/ELF.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,7 @@ enum : unsigned {
// CHERI-specific flags
EF_RISCV_CHERIABI = 0x00010000,
EF_RISCV_CAP_MODE = 0x00020000,
EF_RISCV_CHERIOT = 0x00040000,
};

// ELF Relocation types for RISC-V
Expand Down
1 change: 1 addition & 0 deletions llvm/lib/ObjectYAML/ELFYAML.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,7 @@ void ScalarBitSetTraits<ELFYAML::ELF_EF>::bitset(IO &IO,
BCase(EF_RISCV_TSO);
BCase(EF_RISCV_CHERIABI);
BCase(EF_RISCV_CAP_MODE);
BCase(EF_RISCV_CHERIOT);
break;
case ELF::EM_SPARC32PLUS:
BCase(EF_SPARC_32PLUS);
Expand Down
8 changes: 6 additions & 2 deletions llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,14 @@ void RISCVTargetELFStreamer::finish() {
case RISCVABI::ABI_ILP32:
case RISCVABI::ABI_LP64:
break;
case RISCVABI::ABI_IL32PC64:
case RISCVABI::ABI_L64PC128:
case RISCVABI::ABI_CHERIOT:
case RISCVABI::ABI_CHERIOT_BAREMETAL:
EFlags |= ELF::EF_RISCV_RVE;
EFlags |= ELF::EF_RISCV_CHERIABI;
EFlags |= ELF::EF_RISCV_CHERIOT;
break;
case RISCVABI::ABI_IL32PC64:
case RISCVABI::ABI_L64PC128:
EFlags |= ELF::EF_RISCV_CHERIABI;
break;
case RISCVABI::ABI_ILP32F:
Expand Down
32 changes: 32 additions & 0 deletions llvm/test/CodeGen/RISCV/cheri/cheriot-elf-flags.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
; RUN: llc --filetype=obj --mcpu=cheriot --mtriple=riscv32-unknown-unknown -target-abi cheriot %s -mattr=+xcheri,+cap-mode -o - | llvm-readelf -a - | FileCheck %s

; CHECK-LABEL: ELF Header:
; CHECK: Flags: 0x70009, RVC, RVE, cheriabi, capability mode, cheriot

target datalayout = "e-m:e-pf200:64:64:64:32-p:32:32-i64:64-n32-S128-A200-P200-G200"
target triple = "riscv32cheriot-unknown-cheriotrtos"


define void @foo() addrspace(200) #0 {
entry:
ret void
}

attributes #0 = { minsize mustprogress nounwind optsize "frame-pointer"="none" "min-legal-vector-width"="0" "no-builtins" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cheriot" "target-features"="+relax,+xcheri,-64bit,-save-restore" }

!llvm.linker.options = !{}
!llvm.module.flags = !{!0, !1, !2}
!llvm.ident = !{!3}

!0 = !{i32 1, !"wchar_size", i32 2}
!1 = !{i32 1, !"target-abi", !"cheriot"}
!2 = !{i32 1, !"SmallDataLimit", i32 8}
!3 = !{!"clang version 13.0.0 (ssh://[email protected]/CHERIoT-Platform/llvm-project 42ccdb1bcc7eb0bf8cc8e493850359f828515495)"}
!4 = !{i64 0, i64 4, !5, i64 4, i64 4, !5, i64 8, i64 4, !5}
!5 = !{!6, !6, i64 0}
!6 = !{!"int", !7, i64 0}
!7 = !{!"omnipotent char", !8, i64 0}
!8 = !{!"Simple C++ TBAA"}
!9 = !{i64 0, i64 128, !10}
!10 = !{!7, !7, i64 0}

18 changes: 10 additions & 8 deletions llvm/tools/llvm-readobj/ELFDumper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,14 +1688,16 @@ const EnumEntry<unsigned> ElfHeaderNVPTXFlags[] = {
};

const EnumEntry<unsigned> ElfHeaderRISCVFlags[] = {
ENUM_ENT(EF_RISCV_RVC, "RVC"),
ENUM_ENT(EF_RISCV_FLOAT_ABI_SINGLE, "single-float ABI"),
ENUM_ENT(EF_RISCV_FLOAT_ABI_DOUBLE, "double-float ABI"),
ENUM_ENT(EF_RISCV_FLOAT_ABI_QUAD, "quad-float ABI"),
ENUM_ENT(EF_RISCV_RVE, "RVE"),
ENUM_ENT(EF_RISCV_TSO, "TSO"),
ENUM_ENT(EF_RISCV_CHERIABI, "cheriabi"),
ENUM_ENT(EF_RISCV_CAP_MODE, "capability mode"),
ENUM_ENT(EF_RISCV_RVC, "RVC"),
ENUM_ENT(EF_RISCV_FLOAT_ABI_SINGLE, "single-float ABI"),
ENUM_ENT(EF_RISCV_FLOAT_ABI_DOUBLE, "double-float ABI"),
ENUM_ENT(EF_RISCV_FLOAT_ABI_QUAD, "quad-float ABI"),
ENUM_ENT(EF_RISCV_RVE, "RVE"),
ENUM_ENT(EF_RISCV_TSO, "TSO"),
ENUM_ENT(EF_RISCV_CHERIABI, "cheriabi"),
ENUM_ENT(EF_RISCV_CAP_MODE, "capability mode"),
ENUM_ENT(EF_RISCV_CHERIOT, "cheriot"),

};

const EnumEntry<unsigned> ElfHeaderSPARCFlags[] = {
Expand Down