Skip to content

Commit fe108ca

Browse files
hzongarohzongaro
authored
Merge pull request #8250 from janvrany/pr/riscv-use-shorter-names
RISC-V: use shorter names
2 parents d137962 + 2961d47 commit fe108ca

19 files changed

Lines changed: 655 additions & 461 deletions

‎compiler/riscv/codegen/BinaryEvaluator.cpp‎

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

‎compiler/riscv/codegen/ControlFlowEvaluator.cpp‎

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

‎compiler/riscv/codegen/FPTreeEvaluator.cpp‎

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

‎compiler/riscv/codegen/GenerateInstructions.cpp‎

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,111 +37,118 @@ class RegisterDependencyConditions;
3737
class SymbolReference;
3838
} // namespace TR
3939

40-
TR::Instruction *generateInstruction(TR::CodeGenerator *cg, TR::InstOpCode::Mnemonic op, TR::Node *node,
41-
TR::Instruction *preced)
40+
TR::Instruction *Inst(TR::InstOpCode::Mnemonic op, TR::Node *node, TR::CodeGenerator *cg, TR::Instruction *preced)
4241
{
4342
if (preced)
4443
return new (cg->trHeapMemory()) TR::Instruction(op, node, preced, cg);
4544
return new (cg->trHeapMemory()) TR::Instruction(op, node, cg);
4645
}
4746

48-
TR::Instruction *generateLABEL(TR::CodeGenerator *cg, TR::InstOpCode::Mnemonic op, TR::Node *node, TR::LabelSymbol *sym,
47+
TR::Instruction *Inst_LABEL(TR::InstOpCode::Mnemonic op, TR::Node *node, TR::LabelSymbol *sym, TR::CodeGenerator *cg,
4948
TR::Instruction *preced)
5049
{
5150
if (preced)
5251
return new (cg->trHeapMemory()) TR::LabelInstruction(op, node, sym, preced, cg);
5352
return new (cg->trHeapMemory()) TR::LabelInstruction(op, node, sym, cg);
5453
}
5554

56-
TR::Instruction *generateLABEL(TR::CodeGenerator *cg, TR::InstOpCode::Mnemonic op, TR::Node *node, TR::LabelSymbol *sym,
57-
TR::RegisterDependencyConditions *cond, TR::Instruction *preced)
55+
TR::Instruction *Inst_LABEL(TR::InstOpCode::Mnemonic op, TR::Node *node, TR::LabelSymbol *sym,
56+
TR::RegisterDependencyConditions *cond, TR::CodeGenerator *cg, TR::Instruction *preced)
5857
{
5958
if (preced)
6059
return new (cg->trHeapMemory()) TR::LabelInstruction(op, node, sym, cond, preced, cg);
6160
return new (cg->trHeapMemory()) TR::LabelInstruction(op, node, sym, cond, cg);
6261
}
6362

64-
TR::Instruction *generateADMIN(TR::CodeGenerator *cg, TR::InstOpCode::Mnemonic op, TR::Node *node, TR::Node *fenceNode,
63+
TR::Instruction *Inst_ADMIN(TR::InstOpCode::Mnemonic op, TR::Node *node, TR::CodeGenerator *cg, TR::Node *fenceNode,
6564
TR::Instruction *preced)
6665
{
6766
if (preced)
6867
return new (cg->trHeapMemory()) TR::AdminInstruction(op, node, fenceNode, preced, cg);
6968
return new (cg->trHeapMemory()) TR::AdminInstruction(op, node, fenceNode, cg);
7069
}
7170

72-
TR::Instruction *generateADMIN(TR::CodeGenerator *cg, TR::InstOpCode::Mnemonic op, TR::Node *node,
73-
TR::RegisterDependencyConditions *cond, TR::Node *fenceNode, TR::Instruction *preced)
71+
TR::Instruction *Inst_ADMIN(TR::InstOpCode::Mnemonic op, TR::Node *node, TR::RegisterDependencyConditions *cond,
72+
TR::CodeGenerator *cg, TR::Node *fenceNode, TR::Instruction *preced)
7473
{
7574
if (preced)
7675
return new (cg->trHeapMemory()) TR::AdminInstruction(op, cond, node, fenceNode, preced, cg);
7776
return new (cg->trHeapMemory()) TR::AdminInstruction(op, cond, node, fenceNode, cg);
7877
}
7978

80-
TR::Instruction *generateRTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *treg, TR::Register *s1reg,
79+
TR::Instruction *Inst_DATA(TR::InstOpCode::Mnemonic op, TR::Node *node, uint32_t imm, TR::CodeGenerator *cg,
80+
TR::Instruction *preced)
81+
{
82+
if (preced)
83+
return new (cg->trHeapMemory()) TR::DataInstruction(op, node, imm, preced, cg);
84+
return new (cg->trHeapMemory()) TR::DataInstruction(op, node, imm, cg);
85+
}
86+
87+
TR::Instruction *Inst_RTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *treg, TR::Register *s1reg,
8188
TR::Register *s2reg, TR::CodeGenerator *cg, TR::Instruction *previous)
8289
{
8390
if (previous)
8491
return new (cg->trHeapMemory()) TR::RtypeInstruction(op, n, treg, s1reg, s2reg, previous, cg);
8592
return new (cg->trHeapMemory()) TR::RtypeInstruction(op, n, treg, s1reg, s2reg, cg);
8693
}
8794

88-
TR::Instruction *generateITYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *treg, TR::Register *sreg,
95+
TR::Instruction *Inst_ITYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *treg, TR::Register *sreg,
8996
uint32_t imm, TR::CodeGenerator *cg, TR::Instruction *previous)
9097
{
9198
if (previous)
9299
return new (cg->trHeapMemory()) TR::ItypeInstruction(op, n, treg, sreg, imm, previous, cg);
93100
return new (cg->trHeapMemory()) TR::ItypeInstruction(op, n, treg, sreg, imm, cg);
94101
}
95102

96-
TR::Instruction *generateITYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *treg, TR::Register *sreg,
103+
TR::Instruction *Inst_ITYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *treg, TR::Register *sreg,
97104
uint32_t imm, TR::RegisterDependencyConditions *cond, TR::CodeGenerator *cg, TR::Instruction *previous)
98105
{
99106
if (previous)
100107
return new (cg->trHeapMemory()) TR::ItypeInstruction(op, n, treg, sreg, imm, cond, previous, cg);
101108
return new (cg->trHeapMemory()) TR::ItypeInstruction(op, n, treg, sreg, imm, cond, cg);
102109
}
103110

104-
TR::Instruction *generateLOAD(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *trgReg,
105-
TR::MemoryReference *memRef, TR::CodeGenerator *cg, TR::Instruction *previous)
111+
TR::Instruction *Inst_LOAD(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *trgReg, TR::MemoryReference *memRef,
112+
TR::CodeGenerator *cg, TR::Instruction *previous)
106113
{
107114
if (previous)
108115
return new (cg->trHeapMemory()) TR::LoadInstruction(op, n, trgReg, memRef, previous, cg);
109116
return new (cg->trHeapMemory()) TR::LoadInstruction(op, n, trgReg, memRef, cg);
110117
}
111118

112-
TR::Instruction *generateSTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *s1reg, TR::Register *s2reg,
119+
TR::Instruction *Inst_STYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *s1reg, TR::Register *s2reg,
113120
uint32_t imm, TR::CodeGenerator *cg, TR::Instruction *previous)
114121
{
115122
if (previous)
116123
return new (cg->trHeapMemory()) TR::StypeInstruction(op, n, s1reg, s2reg, imm, previous, cg);
117124
return new (cg->trHeapMemory()) TR::StypeInstruction(op, n, s1reg, s2reg, imm, cg);
118125
}
119126

120-
TR::Instruction *generateSTORE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::MemoryReference *memRef,
121-
TR::Register *srcReg, TR::CodeGenerator *cg, TR::Instruction *previous)
127+
TR::Instruction *Inst_STORE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::MemoryReference *memRef, TR::Register *srcReg,
128+
TR::CodeGenerator *cg, TR::Instruction *previous)
122129
{
123130
if (previous)
124131
return new (cg->trHeapMemory()) TR::StoreInstruction(op, n, memRef, srcReg, previous, cg);
125132
return new (cg->trHeapMemory()) TR::StoreInstruction(op, n, memRef, srcReg, cg);
126133
}
127134

128-
TR::Instruction *generateBTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::LabelSymbol *sym, TR::Register *src1,
135+
TR::Instruction *Inst_BTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::LabelSymbol *sym, TR::Register *src1,
129136
TR::Register *src2, TR::CodeGenerator *cg, TR::Instruction *previous)
130137
{
131138
if (previous)
132139
return new (cg->trHeapMemory()) TR::BtypeInstruction(op, n, sym, src1, src2, previous, cg);
133140
return new (cg->trHeapMemory()) TR::BtypeInstruction(op, n, sym, src1, src2, cg);
134141
}
135142

136-
TR::Instruction *generateUTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, uint32_t imm, TR::Register *reg,
143+
TR::Instruction *Inst_UTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, uint32_t imm, TR::Register *reg,
137144
TR::CodeGenerator *cg, TR::Instruction *previous)
138145
{
139146
if (previous)
140147
return new (cg->trHeapMemory()) TR::UtypeInstruction(op, n, imm, reg, previous, cg);
141148
return new (cg->trHeapMemory()) TR::UtypeInstruction(op, n, imm, reg, cg);
142149
}
143150

144-
TR::Instruction *generateJTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *trgReg, uintptr_t imm,
151+
TR::Instruction *Inst_JTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *trgReg, uintptr_t imm,
145152
TR::RegisterDependencyConditions *cond, TR::SymbolReference *sr, TR::Snippet *s, TR::CodeGenerator *cg,
146153
TR::Instruction *previous)
147154
{
@@ -150,23 +157,23 @@ TR::Instruction *generateJTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Reg
150157
return new (cg->trHeapMemory()) TR::JtypeInstruction(op, n, trgReg, imm, cond, sr, s, cg);
151158
}
152159

153-
TR::Instruction *generateJTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *trgReg, TR::LabelSymbol *label,
160+
TR::Instruction *Inst_JTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *trgReg, TR::LabelSymbol *label,
154161
TR::CodeGenerator *cg, TR::Instruction *previous)
155162
{
156163
if (previous)
157164
return new (cg->trHeapMemory()) TR::JtypeInstruction(op, n, trgReg, label, previous, cg);
158165
return new (cg->trHeapMemory()) TR::JtypeInstruction(op, n, trgReg, label, cg);
159166
}
160167

161-
TR::Instruction *generateJTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *trgReg, TR::LabelSymbol *label,
168+
TR::Instruction *Inst_JTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *trgReg, TR::LabelSymbol *label,
162169
TR::RegisterDependencyConditions *cond, TR::CodeGenerator *cg, TR::Instruction *previous)
163170
{
164171
if (previous)
165172
return new (cg->trHeapMemory()) TR::JtypeInstruction(op, n, trgReg, label, cond, previous, cg);
166173
return new (cg->trHeapMemory()) TR::JtypeInstruction(op, n, trgReg, label, cond, cg);
167174
}
168175

169-
TR::Instruction *generateJTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *trgReg, TR::LabelSymbol *label,
176+
TR::Instruction *Inst_JTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Register *trgReg, TR::LabelSymbol *label,
170177
TR::Snippet *snippet, TR::RegisterDependencyConditions *cond, TR::CodeGenerator *cg, TR::Instruction *previous)
171178
{
172179
if (previous)
@@ -175,7 +182,7 @@ TR::Instruction *generateJTYPE(TR::InstOpCode::Mnemonic op, TR::Node *n, TR::Reg
175182
}
176183

177184
#ifdef J9_PROJECT_SPECIFIC
178-
TR::Instruction *generateVGNOP(TR::Node *n, TR_VirtualGuardSite *site, TR::RegisterDependencyConditions *cond,
185+
TR::Instruction *Inst_VGNOP(TR::Node *n, TR_VirtualGuardSite *site, TR::RegisterDependencyConditions *cond,
179186
TR::LabelSymbol *sym, TR::CodeGenerator *cg, TR::Instruction *previous)
180187
{
181188
if (previous)

0 commit comments

Comments
 (0)