Skip to content

Commit 95cbd66

Browse files
committed
Fix remaining CEXT -> RVC
1 parent def138b commit 95cbd66

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/hotspot/cpu/riscv/assembler_riscv.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void Assembler::zext_w(Register Rd, Register Rs) {
8484
}
8585

8686
void Assembler::li(Register Rd, int64_t imm) {
87-
CHECK_CEXT_AND_COMPRESSIBLE(is_imm_in_range(imm, 6, 0) && Rd != x0) {
87+
CHECK_RVC_AND_COMPRESSIBLE(is_imm_in_range(imm, 6, 0) && Rd != x0) {
8888
c_li(Rd, imm);
8989
return;
9090
}

src/hotspot/cpu/riscv/assembler_riscv.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ class Assembler : public AbstractAssembler {
380380
}
381381

382382
void halt() {
383-
CHECK_CEXT() {
383+
CHECK_RVC() {
384384
emit_int16(0);
385385
} else {
386386
emit_int32(0);

src/hotspot/cpu/riscv/assembler_riscv_c.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -550,21 +550,21 @@
550550
#define EMIT_MAY_COMPRESS_false(NAME, ...)
551551

552552
#define IS_COMPRESSIBLE(...) if (__VA_ARGS__)
553-
#define CHECK_CEXT_AND_COMPRESSIBLE(...) IS_COMPRESSIBLE(UseRVC && in_compressible_region() && __VA_ARGS__)
554-
#define CHECK_CEXT() if (UseRVC && in_compressible_region())
553+
#define CHECK_RVC_AND_COMPRESSIBLE(...) IS_COMPRESSIBLE(UseRVC && in_compressible_region() && __VA_ARGS__)
554+
#define CHECK_RVC() if (UseRVC && in_compressible_region())
555555

556556
// RVC transformation macros
557557
#define EMIT_RVC_cond(PREFIX, COND, EMIT) { \
558558
PREFIX \
559-
CHECK_CEXT_AND_COMPRESSIBLE(COND) { \
559+
CHECK_RVC_AND_COMPRESSIBLE(COND) { \
560560
EMIT; \
561561
return; \
562562
} \
563563
}
564564

565565
#define EMIT_RVC_cond2(PREFIX, COND1, EMIT1, COND2, EMIT2) { \
566566
PREFIX \
567-
CHECK_CEXT() { \
567+
CHECK_RVC() { \
568568
IS_COMPRESSIBLE(COND1) { \
569569
EMIT1; \
570570
return; \
@@ -577,7 +577,7 @@
577577

578578
#define EMIT_RVC_cond4(PREFIX, COND1, EMIT1, COND2, EMIT2, COND3, EMIT3, COND4, EMIT4) { \
579579
PREFIX \
580-
CHECK_CEXT() { \
580+
CHECK_RVC() { \
581581
IS_COMPRESSIBLE(COND1) { \
582582
EMIT1; \
583583
return; \

0 commit comments

Comments
 (0)