@@ -555,9 +555,9 @@ class RISCVMCPlusBuilder : public MCPlusBuilder {
555555 .addReg (RegCnt);
556556 }
557557
558- InstructionListType createCmpJE (MCPhysReg RegNo, MCPhysReg RegTmp,
559- const MCSymbol *Target,
560- MCContext *Ctx) const {
558+ InstructionListType createCmpJERISCV (MCPhysReg RegNo, MCPhysReg RegTmp,
559+ const MCSymbol *Target,
560+ MCContext *Ctx) const {
561561 InstructionListType Insts;
562562 Insts.emplace_back (
563563 MCInstBuilder (RISCV::SUB).addReg (RegTmp).addReg (RegNo).addReg (RegNo));
@@ -718,7 +718,7 @@ class RISCVMCPlusBuilder : public MCPlusBuilder {
718718 Insts.emplace_back ();
719719 loadReg (Insts.back (), RISCV::X10, RISCV::X10, 0 );
720720 InstructionListType cmpJmp =
721- createCmpJE (RISCV::X10, RISCV::X11, IndCallHandler, Ctx);
721+ createCmpJERISCV (RISCV::X10, RISCV::X11, IndCallHandler, Ctx);
722722 Insts.insert (Insts.end (), cmpJmp.begin (), cmpJmp.end ());
723723 Insts.emplace_back ();
724724 createStackPointerIncrement (Insts.back (), 16 );
@@ -777,8 +777,8 @@ class RISCVMCPlusBuilder : public MCPlusBuilder {
777777 return createGetter (Ctx, " __bolt_instr_num_funcs" );
778778 }
779779
780- void convertIndirectCallToLoad (MCInst &Inst, MCPhysReg Reg,
781- MCPhysReg ZeroReg) const {
780+ void convertIndirectCallToLoadRISCV (MCInst &Inst, MCPhysReg Reg,
781+ MCPhysReg ZeroReg) const {
782782 bool IsTailCall = isTailCall (Inst);
783783 if (IsTailCall)
784784 removeAnnotation (Inst, MCPlus::MCAnnotation::kTailCall );
@@ -845,7 +845,7 @@ class RISCVMCPlusBuilder : public MCPlusBuilder {
845845 InstructionListType Insts;
846846 spillRegs (Insts, {RISCV::X10, RISCV::X11});
847847 Insts.emplace_back (CallInst);
848- convertIndirectCallToLoad (Insts.back (), RISCV::X10, RISCV::X0);
848+ convertIndirectCallToLoadRISCV (Insts.back (), RISCV::X10, RISCV::X0);
849849 InstructionListType LoadImm = createLoadImmediate (RISCV::X11, CallSiteID);
850850 Insts.insert (Insts.end (), LoadImm.begin (), LoadImm.end ());
851851 spillRegs (Insts, {RISCV::X10, RISCV::X11});
0 commit comments