@@ -72,9 +72,9 @@ static InstructionListType createIncMemory(const MCSymbol *Target,
7272 Insts.back ().addOperand (MCOperand::createImm (1 )); // ScaleAmt
7373 Insts.back ().addOperand (MCOperand::createReg (X86::NoRegister)); // IndexReg
7474
75- Insts.back ().addOperand (MCOperand::createExpr (
76- MCSymbolRefExpr::create (Target, MCSymbolRefExpr::VK_None ,
77- *Ctx))); // Displacement
75+ Insts.back ().addOperand (
76+ MCOperand::createExpr ( MCSymbolRefExpr::create (Target ,
77+ *Ctx))); // Displacement
7878 Insts.back ().addOperand (
7979 MCOperand::createReg (X86::NoRegister)); // AddrSegmentReg
8080 return Insts;
@@ -1625,9 +1625,8 @@ class X86MCPlusBuilder : public MCPlusBuilder {
16251625 Inst.insert (Inst.begin (),
16261626 MCOperand::createReg (X86::NoRegister)); // AddrSegmentReg
16271627 Inst.insert (Inst.begin (),
1628- MCOperand::createExpr ( // Displacement
1629- MCSymbolRefExpr::create (TargetLocation,
1630- MCSymbolRefExpr::VK_None, *Ctx)));
1628+ MCOperand::createExpr ( // Displacement
1629+ MCSymbolRefExpr::create (TargetLocation, *Ctx)));
16311630 Inst.insert (Inst.begin (),
16321631 MCOperand::createReg (X86::NoRegister)); // IndexReg
16331632 Inst.insert (Inst.begin (),
@@ -2420,8 +2419,7 @@ class X86MCPlusBuilder : public MCPlusBuilder {
24202419 .addReg (RegNo)
24212420 .addImm (Imm));
24222421 Code.emplace_back (MCInstBuilder (X86::JCC_1)
2423- .addExpr (MCSymbolRefExpr::create (
2424- Target, MCSymbolRefExpr::VK_None, *Ctx))
2422+ .addExpr (MCSymbolRefExpr::create (Target, *Ctx))
24252423 .addImm (X86::COND_E));
24262424 return Code;
24272425 }
@@ -2432,8 +2430,7 @@ class X86MCPlusBuilder : public MCPlusBuilder {
24322430 InstructionListType Code;
24332431 Code.emplace_back (MCInstBuilder (X86::CMP64ri8).addReg (RegNo).addImm (Imm));
24342432 Code.emplace_back (MCInstBuilder (X86::JCC_1)
2435- .addExpr (MCSymbolRefExpr::create (
2436- Target, MCSymbolRefExpr::VK_None, *Ctx))
2433+ .addExpr (MCSymbolRefExpr::create (Target, *Ctx))
24372434 .addImm (X86::COND_NE));
24382435 return Code;
24392436 }
@@ -2738,24 +2735,23 @@ class X86MCPlusBuilder : public MCPlusBuilder {
27382735 Inst.clear ();
27392736 Inst.setOpcode (X86::JMP_1);
27402737 Inst.clear ();
2741- Inst.addOperand (MCOperand::createExpr (
2742- MCSymbolRefExpr::create (TBB, MCSymbolRefExpr::VK_None, *Ctx)));
2738+ Inst.addOperand (MCOperand::createExpr (MCSymbolRefExpr::create (TBB, *Ctx)));
27432739 }
27442740
27452741 void createLongUncondBranch (MCInst &Inst, const MCSymbol *Target,
27462742 MCContext *Ctx) const override {
27472743 Inst.setOpcode (X86::JMP_4);
27482744 Inst.clear ();
2749- Inst.addOperand (MCOperand::createExpr (
2750- MCSymbolRefExpr::create (Target, MCSymbolRefExpr::VK_None , *Ctx)));
2745+ Inst.addOperand (
2746+ MCOperand::createExpr ( MCSymbolRefExpr::create (Target , *Ctx)));
27512747 }
27522748
27532749 void createCall (MCInst &Inst, const MCSymbol *Target,
27542750 MCContext *Ctx) override {
27552751 Inst.setOpcode (X86::CALL64pcrel32);
27562752 Inst.clear ();
2757- Inst.addOperand (MCOperand::createExpr (
2758- MCSymbolRefExpr::create (Target, MCSymbolRefExpr::VK_None , *Ctx)));
2753+ Inst.addOperand (
2754+ MCOperand::createExpr ( MCSymbolRefExpr::create (Target , *Ctx)));
27592755 }
27602756
27612757 void createTailCall (MCInst &Inst, const MCSymbol *Target,
@@ -2779,17 +2775,17 @@ class X86MCPlusBuilder : public MCPlusBuilder {
27792775 MCContext *Ctx) const override {
27802776 Inst.setOpcode (X86::JCC_1);
27812777 Inst.clear ();
2782- Inst.addOperand (MCOperand::createExpr (
2783- MCSymbolRefExpr::create (Target, MCSymbolRefExpr::VK_None , *Ctx)));
2778+ Inst.addOperand (
2779+ MCOperand::createExpr ( MCSymbolRefExpr::create (Target , *Ctx)));
27842780 Inst.addOperand (MCOperand::createImm (CC));
27852781 }
27862782
27872783 void createLongCondBranch (MCInst &Inst, const MCSymbol *Target, unsigned CC,
27882784 MCContext *Ctx) const override {
27892785 Inst.setOpcode (X86::JCC_4);
27902786 Inst.clear ();
2791- Inst.addOperand (MCOperand::createExpr (
2792- MCSymbolRefExpr::create (Target, MCSymbolRefExpr::VK_None , *Ctx)));
2787+ Inst.addOperand (
2788+ MCOperand::createExpr ( MCSymbolRefExpr::create (Target , *Ctx)));
27932789 Inst.addOperand (MCOperand::createImm (CC));
27942790 }
27952791
@@ -2798,17 +2794,17 @@ class X86MCPlusBuilder : public MCPlusBuilder {
27982794 unsigned InvCC = getInvertedCondCode (getCondCode (Inst));
27992795 assert (InvCC != X86::COND_INVALID && " invalid branch instruction" );
28002796 Inst.getOperand (Info->get (Inst.getOpcode ()).NumOperands - 1 ).setImm (InvCC);
2801- Inst.getOperand (0 ) = MCOperand::createExpr (
2802- MCSymbolRefExpr::create (TBB, MCSymbolRefExpr::VK_None , *Ctx));
2797+ Inst.getOperand (0 ) =
2798+ MCOperand::createExpr ( MCSymbolRefExpr::create (TBB , *Ctx));
28032799 }
28042800
28052801 bool replaceBranchCondition (MCInst &Inst, const MCSymbol *TBB, MCContext *Ctx,
28062802 unsigned CC) const override {
28072803 if (CC == X86::COND_INVALID)
28082804 return false ;
28092805 Inst.getOperand (Info->get (Inst.getOpcode ()).NumOperands - 1 ).setImm (CC);
2810- Inst.getOperand (0 ) = MCOperand::createExpr (
2811- MCSymbolRefExpr::create (TBB, MCSymbolRefExpr::VK_None , *Ctx));
2806+ Inst.getOperand (0 ) =
2807+ MCOperand::createExpr ( MCSymbolRefExpr::create (TBB , *Ctx));
28122808 return true ;
28132809 }
28142810
@@ -2846,8 +2842,8 @@ class X86MCPlusBuilder : public MCPlusBuilder {
28462842 MCContext *Ctx) const override {
28472843 assert ((isCall (Inst) || isBranch (Inst)) && !isIndirectBranch (Inst) &&
28482844 " Invalid instruction" );
2849- Inst.getOperand (0 ) = MCOperand::createExpr (
2850- MCSymbolRefExpr::create (TBB, MCSymbolRefExpr::VK_None , *Ctx));
2845+ Inst.getOperand (0 ) =
2846+ MCOperand::createExpr ( MCSymbolRefExpr::create (TBB , *Ctx));
28512847 }
28522848
28532849 MCPhysReg getX86R11 () const override { return X86::R11; }
@@ -2894,8 +2890,8 @@ class X86MCPlusBuilder : public MCPlusBuilder {
28942890 bool IsTailCall) override {
28952891 Inst.clear ();
28962892 Inst.setOpcode (IsTailCall ? X86::JMP_4 : X86::CALL64pcrel32);
2897- Inst.addOperand (MCOperand::createExpr (
2898- MCSymbolRefExpr::create (Target, MCSymbolRefExpr::VK_None , *Ctx)));
2893+ Inst.addOperand (
2894+ MCOperand::createExpr ( MCSymbolRefExpr::create (Target , *Ctx)));
28992895 if (IsTailCall)
29002896 setTailCall (Inst);
29012897 }
@@ -2905,8 +2901,8 @@ class X86MCPlusBuilder : public MCPlusBuilder {
29052901 Seq.clear ();
29062902 MCInst Inst;
29072903 Inst.setOpcode (X86::JMP_1);
2908- Inst.addOperand (MCOperand::createExpr (
2909- MCSymbolRefExpr::create (Target, MCSymbolRefExpr::VK_None , *Ctx)));
2904+ Inst.addOperand (
2905+ MCOperand::createExpr ( MCSymbolRefExpr::create (Target , *Ctx)));
29102906 if (IsTailCall)
29112907 setTailCall (Inst);
29122908 Seq.emplace_back (Inst);
@@ -3332,8 +3328,8 @@ class X86MCPlusBuilder : public MCPlusBuilder {
33323328 Target.addOperand (MCOperand::createReg (FuncAddrReg));
33333329 if (Targets[i].first ) {
33343330 // Is this OK?
3335- Target.addOperand (MCOperand::createExpr (MCSymbolRefExpr::create (
3336- Targets[i].first , MCSymbolRefExpr::VK_None , *Ctx)));
3331+ Target.addOperand (MCOperand::createExpr (
3332+ MCSymbolRefExpr::create ( Targets[i].first , *Ctx)));
33373333 } else {
33383334 const uint64_t Addr = Targets[i].second ;
33393335 // Immediate address is out of sign extended 32 bit range.
@@ -3409,8 +3405,8 @@ class X86MCPlusBuilder : public MCPlusBuilder {
34093405 Je.clear ();
34103406 Je.setOpcode (X86::JCC_1);
34113407 if (Targets[i].first )
3412- Je.addOperand (MCOperand::createExpr (MCSymbolRefExpr::create (
3413- Targets[i].first , MCSymbolRefExpr::VK_None , *Ctx)));
3408+ Je.addOperand (MCOperand::createExpr (
3409+ MCSymbolRefExpr::create ( Targets[i].first , *Ctx)));
34143410 else
34153411 Je.addOperand (MCOperand::createImm (Targets[i].second ));
34163412
@@ -3422,8 +3418,8 @@ class X86MCPlusBuilder : public MCPlusBuilder {
34223418 // Jump to next compare if target addresses don't match.
34233419 Jne.clear ();
34243420 Jne.setOpcode (X86::JCC_1);
3425- Jne.addOperand (MCOperand::createExpr ( MCSymbolRefExpr::create (
3426- NextTarget, MCSymbolRefExpr::VK_None , *Ctx)));
3421+ Jne.addOperand (
3422+ MCOperand::createExpr ( MCSymbolRefExpr::create (NextTarget , *Ctx)));
34273423 Jne.addOperand (MCOperand::createImm (X86::COND_NE));
34283424
34293425 // Call specific target directly.
@@ -3442,8 +3438,8 @@ class X86MCPlusBuilder : public MCPlusBuilder {
34423438 CallOrJmp.setOpcode (IsTailCall ? X86::JMP_4 : X86::CALL64pcrel32);
34433439
34443440 if (Targets[i].first )
3445- CallOrJmp.addOperand (MCOperand::createExpr (MCSymbolRefExpr::create (
3446- Targets[i].first , MCSymbolRefExpr::VK_None , *Ctx)));
3441+ CallOrJmp.addOperand (MCOperand::createExpr (
3442+ MCSymbolRefExpr::create ( Targets[i].first , *Ctx)));
34473443 else
34483444 CallOrJmp.addOperand (MCOperand::createImm (Targets[i].second ));
34493445 }
@@ -3545,8 +3541,8 @@ class X86MCPlusBuilder : public MCPlusBuilder {
35453541
35463542 // Jump to target if indices match
35473543 JEInst.setOpcode (X86::JCC_1);
3548- JEInst.addOperand (MCOperand::createExpr (MCSymbolRefExpr::create (
3549- Targets[i].first , MCSymbolRefExpr::VK_None , *Ctx)));
3544+ JEInst.addOperand (MCOperand::createExpr (
3545+ MCSymbolRefExpr::create ( Targets[i].first , *Ctx)));
35503546 JEInst.addOperand (MCOperand::createImm (X86::COND_E));
35513547 }
35523548
@@ -3571,9 +3567,9 @@ class X86MCPlusBuilder : public MCPlusBuilder {
35713567 Inst.addOperand (MCOperand::createReg (X86::RIP)); // BaseReg
35723568 Inst.addOperand (MCOperand::createImm (1 )); // ScaleAmt
35733569 Inst.addOperand (MCOperand::createReg (X86::NoRegister)); // IndexReg
3574- Inst.addOperand (MCOperand::createExpr (
3575- MCSymbolRefExpr::create (Src, MCSymbolRefExpr::VK_None ,
3576- *Ctx))); // Displacement
3570+ Inst.addOperand (
3571+ MCOperand::createExpr ( MCSymbolRefExpr::create (Src ,
3572+ *Ctx))); // Displacement
35773573 Inst.addOperand (MCOperand::createReg (X86::NoRegister)); // AddrSegmentReg
35783574 }
35793575
@@ -3585,9 +3581,9 @@ class X86MCPlusBuilder : public MCPlusBuilder {
35853581 Inst.addOperand (MCOperand::createReg (X86::RIP)); // BaseReg
35863582 Inst.addOperand (MCOperand::createImm (1 )); // ScaleAmt
35873583 Inst.addOperand (MCOperand::createReg (X86::NoRegister)); // IndexReg
3588- Inst.addOperand (MCOperand::createExpr (
3589- MCSymbolRefExpr::create (Src, MCSymbolRefExpr::VK_None ,
3590- *Ctx))); // Displacement
3584+ Inst.addOperand (
3585+ MCOperand::createExpr ( MCSymbolRefExpr::create (Src ,
3586+ *Ctx))); // Displacement
35913587 Inst.addOperand (MCOperand::createReg (X86::NoRegister)); // AddrSegmentReg
35923588 }
35933589};
0 commit comments