Skip to content

Commit 039f292

Browse files
committed
Polish comments: remove the 'RVC:' prefix
1 parent a385d3d commit 039f292

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

src/hotspot/cpu/riscv/assembler_riscv.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2045,7 +2045,7 @@ enum Nf {
20452045
void set_in_compressible_region(bool b) { _in_compressible_region = b; }
20462046
public:
20472047

2048-
// RVC: a compressible region
2048+
// a compressible region
20492049
class CompressibleRegion : public StackObj {
20502050
protected:
20512051
Assembler *_masm;
@@ -2061,7 +2061,7 @@ enum Nf {
20612061
}
20622062
};
20632063

2064-
// RVC: patch a 16-bit instruction.
2064+
// patch a 16-bit instruction.
20652065
static void c_patch(address a, unsigned msb, unsigned lsb, uint16_t val) {
20662066
assert_cond(a != NULL);
20672067
assert_cond(msb >= lsb && msb <= 15);
@@ -2080,22 +2080,22 @@ enum Nf {
20802080
c_patch(a, bit, bit, val);
20812081
}
20822082

2083-
// RVC: patch a 16-bit instruction with a general purpose register ranging [0, 31] (5 bits)
2083+
// patch a 16-bit instruction with a general purpose register ranging [0, 31] (5 bits)
20842084
static void c_patch_reg(address a, unsigned lsb, Register reg) {
20852085
c_patch(a, lsb + 4, lsb, reg->encoding_nocheck());
20862086
}
20872087

2088-
// RVC: patch a 16-bit instruction with a general purpose register ranging [8, 15] (3 bits)
2088+
// patch a 16-bit instruction with a general purpose register ranging [8, 15] (3 bits)
20892089
static void c_patch_compressed_reg(address a, unsigned lsb, Register reg) {
20902090
c_patch(a, lsb + 2, lsb, reg->compressed_encoding_nocheck());
20912091
}
20922092

2093-
// RVC: patch a 16-bit instruction with a float register ranging [0, 31] (5 bits)
2093+
// patch a 16-bit instruction with a float register ranging [0, 31] (5 bits)
20942094
static void c_patch_reg(address a, unsigned lsb, FloatRegister reg) {
20952095
c_patch(a, lsb + 4, lsb, reg->encoding_nocheck());
20962096
}
20972097

2098-
// RVC: patch a 16-bit instruction with a float register ranging [8, 15] (3 bits)
2098+
// patch a 16-bit instruction with a float register ranging [8, 15] (3 bits)
20992099
static void c_patch_compressed_reg(address a, unsigned lsb, FloatRegister reg) {
21002100
c_patch(a, lsb + 2, lsb, reg->compressed_encoding_nocheck());
21012101
}

src/hotspot/cpu/riscv/c1_LIRAssembler_riscv.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1323,7 +1323,7 @@ void LIR_Assembler::comp_fl2i(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Op
13231323
}
13241324

13251325
void LIR_Assembler::align_call(LIR_Code code) {
1326-
// RVC: With RVC a call may get 2-byte aligned.
1326+
// With RVC a call may get 2-byte aligned.
13271327
// the address of jal itself (which will be patched later) should not span the cache line.
13281328
// See CallStaticJavaDirectNode::compute_padding() for more info.
13291329
__ align(4);

src/hotspot/cpu/riscv/macroAssembler_riscv.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2934,7 +2934,7 @@ address MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
29342934

29352935
// make sure 4 byte aligned here, so that the destination address would be
29362936
// 8 byte aligned after 3 intructions
2937-
// RVC: when we reach here we may get a 2-byte alignment so need to align it
2937+
// when we reach here we may get a 2-byte alignment so need to align it
29382938
align(wordSize, NativeCallTrampolineStub::data_offset);
29392939

29402940
relocate(trampoline_stub_Relocation::spec(code()->insts()->start() +

src/hotspot/cpu/riscv/register_riscv.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class RegisterImpl: public AbstractRegisterImpl {
6060
number_of_byte_registers = 32,
6161
max_slots_per_register = 2,
6262

63-
// RVC: integer registers in the range of [x8~x15] correspond to RVC. Please see Table 16.2 in spec.
63+
// integer registers in the range of [x8~x15] correspond to RVC. Please see Table 16.2 in spec.
6464
compressed_register_base = 8,
6565
compressed_register_top = 15,
6666
};
@@ -140,7 +140,7 @@ class FloatRegisterImpl: public AbstractRegisterImpl {
140140
number_of_registers = 32,
141141
max_slots_per_register = 2,
142142

143-
// RVC: float registers in the range of [f8~f15] correspond to RVC. Please see Table 16.2 in spec.
143+
// float registers in the range of [f8~f15] correspond to RVC. Please see Table 16.2 in spec.
144144
compressed_register_base = 8,
145145
compressed_register_top = 15,
146146
};

src/hotspot/cpu/riscv/riscv.ad

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ int MachCallNativeNode::ret_addr_offset() {
11901190
return -1;
11911191
}
11921192

1193-
// RVC: With RVC a call may get 2-byte aligned.
1193+
// With RVC a call may get 2-byte aligned.
11941194
// The offset encoding in jal ranges bits [12, 31] could span the cache line.
11951195
// Patching this unaligned address will make the write operation not atomic.
11961196
// Other threads may be running the same piece of code at full speed, causing concurrency issues.
@@ -1201,7 +1201,7 @@ int CallStaticJavaDirectNode::compute_padding(int current_offset) const
12011201
return align_up(current_offset, alignment_required()) - current_offset;
12021202
}
12031203

1204-
// RVC: See CallStaticJavaDirectNode::compute_padding() for more info.
1204+
// Please see CallStaticJavaDirectNode::compute_padding() for more info.
12051205
int CallDynamicJavaDirectNode::compute_padding(int current_offset) const
12061206
{
12071207
// skip the movptr in MacroAssembler::ic_call():
@@ -1243,7 +1243,7 @@ uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
12431243

12441244
void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc*) const {
12451245
C2_MacroAssembler _masm(&cbuf);
1246-
Assembler::CompressibleRegion cr(&_masm); // RVC: nops shall be 2-byte under RVC for alignment purposes.
1246+
Assembler::CompressibleRegion cr(&_masm); // nops shall be 2-byte under RVC for alignment purposes.
12471247
for (int i = 0; i < _count; i++) {
12481248
__ nop();
12491249
}

0 commit comments

Comments
 (0)