Skip to content

[CHERIoT] Update __CHERI_CAP_PERMISSION_* macros to match CHERIoT permissions. #150

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 21, 2025
Merged

[CHERIoT] Update __CHERI_CAP_PERMISSION_* macros to match CHERIoT permissions. #150

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
73 changes: 58 additions & 15 deletions clang/lib/Basic/Targets/RISCV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,21 +245,64 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
}

// Macros for use with the set and get permissions builtins.
Builder.defineMacro("__CHERI_CAP_PERMISSION_GLOBAL__", Twine(1<<0));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_EXECUTE__",
Twine(1<<1));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_LOAD__", Twine(1<<2));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_STORE__", Twine(1<<3));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_LOAD_CAPABILITY__",
Twine(1<<4));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_STORE_CAPABILITY__",
Twine(1<<5));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_STORE_LOCAL__",
Twine(1<<6));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_SEAL__", Twine(1<<7));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_INVOKE__", Twine(1<<8));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_UNSEAL__", Twine(1<<9));
Builder.defineMacro("__CHERI_CAP_PERMISSION_ACCESS_SYSTEM_REGISTERS__", Twine(1<<10));
if (getTriple().getSubArch() == llvm::Triple::RISCV32SubArch_cheriot_v1) {
// Expose CHERI-compatible macros for permissions that overlap with other
// CHERI implementations.
Builder.defineMacro("__CHERI_CAP_PERMISSION_GLOBAL__", Twine(1 << 0));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_STORE__",
Twine(1 << 2));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_STORE_LOCAL__",
Twine(1 << 4));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_LOAD__",
Twine(1 << 5));
Builder.defineMacro("__CHERI_CAP_PERMISSION_ACCESS_SYSTEM_REGISTERS__",
Twine(1 << 7));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_EXECUTE__",
Twine(1 << 8));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_UNSEAL__",
Twine(1 << 9));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_SEAL__",
Twine(1 << 10));

// Expose the full set of permissions in the __CHERIOT prefix with
// concise names.
Builder.defineMacro("__CHERIOT_PERMISSION_GLOBAL__", Twine(1 << 0));
Builder.defineMacro("__CHERIOT_PERMISSION_LOAD_GLOBAL__", Twine(1 << 1));
Builder.defineMacro("__CHERIOT_PERMISSION_STORE__", Twine(1 << 2));
Builder.defineMacro("__CHERIOT_PERMISSION_LOAD_MUTABLE__", Twine(1 << 3));
Builder.defineMacro("__CHERIOT_PERMISSION_STORE_LOCAL__", Twine(1 << 4));
Builder.defineMacro("__CHERIOT_PERMISSION_LOAD__", Twine(1 << 5));
Builder.defineMacro("__CHERIOT_PERMISSION_LOAD_STORE_CAPABILITY__",
Twine(1 << 6));
Builder.defineMacro("__CHERIOT_PERMISSION_ACCESS_SYSTEM_REGISTERS__",
Twine(1 << 7));
Builder.defineMacro("__CHERIOT_PERMISSION_EXECUTE__", Twine(1 << 8));
Builder.defineMacro("__CHERIOT_PERMISSION_UNSEAL__", Twine(1 << 9));
Builder.defineMacro("__CHERIOT_PERMISSION_SEAL__", Twine(1 << 10));
Builder.defineMacro("__CHERIOT_PERMISSION_USER_PERM0", Twine(1 << 11));
} else {
Builder.defineMacro("__CHERI_CAP_PERMISSION_GLOBAL__", Twine(1 << 0));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_EXECUTE__",
Twine(1 << 1));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_LOAD__",
Twine(1 << 2));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_STORE__",
Twine(1 << 3));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_LOAD_CAPABILITY__",
Twine(1 << 4));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_STORE_CAPABILITY__",
Twine(1 << 5));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_STORE_LOCAL__",
Twine(1 << 6));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_SEAL__",
Twine(1 << 7));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_INVOKE__",
Twine(1 << 8));
Builder.defineMacro("__CHERI_CAP_PERMISSION_PERMIT_UNSEAL__",
Twine(1 << 9));
Builder.defineMacro("__CHERI_CAP_PERMISSION_ACCESS_SYSTEM_REGISTERS__",
Twine(1 << 10));
}

// Macros for CHERIoT in the default and bare-metal ABIs.
if (ABI == "cheriot" || ABI == "cheriot-baremetal")
Expand Down
30 changes: 30 additions & 0 deletions clang/test/Preprocessor/cheriot-feature-flags.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// RUN: %clang_cc1 -E -dM -ffreestanding -triple riscv32cheriot-unknown-cheriotrtos < /dev/null | FileCheck %s

// CHECK: #define __CHERIOT_PERMISSION_ACCESS_SYSTEM_REGISTERS__ 128
// CHECK: #define __CHERIOT_PERMISSION_EXECUTE__ 256
// CHECK: #define __CHERIOT_PERMISSION_GLOBAL__ 1
// CHECK: #define __CHERIOT_PERMISSION_LOAD_GLOBAL__ 2
// CHECK: #define __CHERIOT_PERMISSION_LOAD_MUTABLE__ 8
// CHECK: #define __CHERIOT_PERMISSION_LOAD_STORE_CAPABILITY__ 64
// CHECK: #define __CHERIOT_PERMISSION_LOAD__ 32
// CHECK: #define __CHERIOT_PERMISSION_SEAL__ 1024
// CHECK: #define __CHERIOT_PERMISSION_STORE_LOCAL__ 16
// CHECK: #define __CHERIOT_PERMISSION_STORE__ 4
// CHECK: #define __CHERIOT_PERMISSION_UNSEAL__ 512
// CHECK: #define __CHERIOT_PERMISSION_USER_PERM0 2048

// CHECK: #define __CHERI_ADDRESS_BITS__ 32
// CHECK: #define __CHERI_CAPABILITY_WIDTH__ 64

// CHECK: #define __CHERI_CAP_PERMISSION_ACCESS_SYSTEM_REGISTERS__ 128
// CHECK: #define __CHERI_CAP_PERMISSION_GLOBAL__ 1
// CHECK: #define __CHERI_CAP_PERMISSION_PERMIT_EXECUTE__ 256
// CHECK: #define __CHERI_CAP_PERMISSION_PERMIT_LOAD__ 32
// CHECK: #define __CHERI_CAP_PERMISSION_PERMIT_SEAL__ 1024
// CHECK: #define __CHERI_CAP_PERMISSION_PERMIT_STORE_LOCAL__ 16
// CHECK: #define __CHERI_CAP_PERMISSION_PERMIT_STORE__ 4
// CHECK: #define __CHERI_CAP_PERMISSION_PERMIT_UNSEAL__ 512

// CHECK: #define __CHERI__ 1
// CHECK: #define __SIZEOF_CHERI_CAPABILITY__ 8