Skip to content

Commit 86c8222

Browse files
committed
[CHERI] Rename chericcallcce to chericcallee
1 parent 72c47bc commit 86c8222

22 files changed

+181
-177
lines changed

clang/test/CodeGen/cheri/cheri-ccall-attrs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ __attribute__((cheri_method_class(cls)))
4545
__attribute__((cheri_method_suffix("_cap")))
4646
void fish(void)
4747
{
48-
// CHECK-LABEL: define dso_local chericcallcce void @fish()
48+
// CHECK-LABEL: define dso_local chericcallee void @fish()
4949
}
5050

5151
__attribute__((cheri_method_suffix("_cap")))
@@ -55,7 +55,7 @@ void flibble(void);
5555
// CHECK-LABEL: define dso_local void @call()
5656
void call(void)
5757
{
58-
// CHECK: call chericcallcce void @fish()
58+
// CHECK: call chericcallee void @fish()
5959
fish();
6060
// Check that we get a ccall to cheri_invoke with the correct method number
6161
// CHECK: load i64, ptr @__cheri_method.cls.fish, align 8, [[$INVARIANT_LOAD]]

clang/test/CodeGen/cheri/cheri-mcu-ccall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %clang_cc1 %s -o - "-triple" "riscv32cheriot-unknown-cheriotrtos" "-emit-llvm" "-mframe-pointer=none" "-mcmodel=small" "-target-abi" "cheriot" "-target-feature" "+xcheriot" "-Oz" "-Werror" "-cheri-compartment=example" | FileCheck %s
22

3-
// CHECK: define dso_local chericcallcce i32 @_Z5test2ii(i32 noundef %a0, i32 noundef %a1) local_unnamed_addr addrspace(200) #0
3+
// CHECK: define dso_local chericcallee i32 @_Z5test2ii(i32 noundef %a0, i32 noundef %a1) local_unnamed_addr addrspace(200) #0
44
__attribute__((cheriot_compartment("example"))) int test2(int a0, int a1) {
55
return a0 + a1;
66
}

clang/test/CodeGen/cheri/cheri-mcu-interrupts.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int inherit(void)
2424

2525
// The default for exported functions should be interrupts enabled
2626
//
27-
// CHECK: define dso_local chericcallcce noundef i32 @_Z21default_enable_calleev() local_unnamed_addr addrspace(200) #[[DEFEN:[0-9]]]
27+
// CHECK: define dso_local chericcallee noundef i32 @_Z21default_enable_calleev() local_unnamed_addr addrspace(200) #[[DEFEN:[0-9]]]
2828
__attribute__((cheri_compartment("example")))
2929
int default_enable_callee(void)
3030
{
@@ -46,7 +46,7 @@ void default_enable_callback2(void)
4646

4747
// Explicitly setting interrupt status should override the default
4848

49-
// CHECK: define dso_local chericcallcce noundef i32 @_Z23explicit_disable_calleev() local_unnamed_addr addrspace(200) #[[EXPDIS:[0-9]]]
49+
// CHECK: define dso_local chericcallee noundef i32 @_Z23explicit_disable_calleev() local_unnamed_addr addrspace(200) #[[EXPDIS:[0-9]]]
5050
__attribute__((cheriot_interrupt_state(disabled)))
5151
__attribute__((cheri_compartment("example")))
5252
int explicit_disable_callee(void)
@@ -84,7 +84,7 @@ int inherit1(void)
8484
return foo();
8585
}
8686

87-
// CHECK: define dso_local chericcallcce noundef i32 @_Z24explicit_disable_callee1v() local_unnamed_addr addrspace(200) #[[EXPDIS]]
87+
// CHECK: define dso_local chericcallee noundef i32 @_Z24explicit_disable_callee1v() local_unnamed_addr addrspace(200) #[[EXPDIS]]
8888
__attribute__((cheri_interrupt_state(disabled)))
8989
__attribute__((cheri_compartment("example")))
9090
int explicit_disable_callee1(void)

clang/test/CodeGen/cheri/cheriot-struct-ret.c

Lines changed: 85 additions & 85 deletions
Large diffs are not rendered by default.

llvm/include/llvm/AsmParser/LLToken.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ enum Kind {
159159
kw_spir_func,
160160
kw_chericcallcc,
161161
kw_cherilibcallcc,
162-
kw_chericcallcce,
162+
kw_chericcallee,
163163
kw_x86_64_sysvcc,
164164
kw_win64cc,
165165
kw_anyregcc,

llvm/lib/AsmParser/LLLexer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ lltok::Kind LLLexer::LexIdentifier() {
634634
KEYWORD(fastcc);
635635
KEYWORD(coldcc);
636636
KEYWORD(chericcallcc);
637-
KEYWORD(chericcallcce);
637+
KEYWORD(chericcallee);
638638
KEYWORD(cherilibcallcc);
639639
KEYWORD(cfguard_checkcc);
640640
KEYWORD(x86_stdcallcc);

llvm/lib/AsmParser/LLParser.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2211,7 +2211,9 @@ bool LLParser::parseOptionalCallingConv(unsigned &CC) {
22112211
case lltok::kw_fastcc: CC = CallingConv::Fast; break;
22122212
case lltok::kw_coldcc: CC = CallingConv::Cold; break;
22132213
case lltok::kw_chericcallcc: CC = CallingConv::CHERI_CCall; break;
2214-
case lltok::kw_chericcallcce: CC = CallingConv::CHERI_CCallee; break;
2214+
case lltok::kw_chericcallee:
2215+
CC = CallingConv::CHERI_CCallee;
2216+
break;
22152217
case lltok::kw_cherilibcallcc:
22162218
CC = CallingConv::CHERI_LibCall;
22172219
break;

llvm/lib/IR/AsmWriter.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,9 @@ static void PrintCallingConv(unsigned cc, raw_ostream &Out) {
382382
case CallingConv::SPIR_FUNC: Out << "spir_func"; break;
383383
case CallingConv::SPIR_KERNEL: Out << "spir_kernel"; break;
384384
case CallingConv::CHERI_CCall: Out << "chericcallcc"; break;
385-
case CallingConv::CHERI_CCallee: Out << "chericcallcce"; break;
385+
case CallingConv::CHERI_CCallee:
386+
Out << "chericcallee";
387+
break;
386388
case CallingConv::CHERI_LibCall:
387389
Out << "cherilibcallcc";
388390
break;

llvm/test/CodeGen/Mips/cheri/cheri-ccallee.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; RUN: %cheri_llc %s -O1 -o - | FileCheck %s
33

44
; Function Attrs: nounwind
5-
define chericcallcce void @fish() {
5+
define chericcallee void @fish() {
66
; CHECK-LABEL: fish:
77
; CHECK: # %bb.0: # %entry
88
; CHECK-NEXT: daddiu $2, $zero, 0

llvm/test/CodeGen/RISCV/cheri/cheri-local-libcall.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ entry:
99
ret void
1010
}
1111

12-
define dso_local chericcallcce void @_Z9say_hellov() local_unnamed_addr addrspace(200) #1 {
12+
define dso_local chericcallee void @_Z9say_hellov() local_unnamed_addr addrspace(200) #1 {
1313
entry:
1414
store ptr addrspace(200) @_Z11id_functionv, ptr addrspace(200) @f, align 8
1515
ret void

0 commit comments

Comments
 (0)