[MIPS] Modify LongBranch expansion to work with sandboxing

lib/Target/Mips/MipsLongBranch.cpp

 //===-- MipsLongBranch.cpp - Emit long branches ---------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass expands a branch or jump instruction into a long branch if its
@@ skipping 50 matching lines @@
 
   class MipsLongBranch : public MachineFunctionPass {
 
   public:
     static char ID;
     MipsLongBranch(TargetMachine &tm)
       : MachineFunctionPass(ID), TM(tm),
         TII(static_cast<const MipsInstrInfo*>(tm.getInstrInfo())),
         IsPIC(TM.getRelocationModel() == Reloc::PIC_),
         ABI(TM.getSubtarget<MipsSubtarget>().getTargetABI()),
-        LongBranchSeqSize(!IsPIC ? 2 : (ABI == MipsSubtarget::N64 ? 13 : 9)) {}
+        LongBranchSeqSize(!IsPIC ? 2 : (ABI == MipsSubtarget::N64 ? 13 :
+            (/*@LOCALMOD*/Triple(TM.getTargetTriple()).isOSNaCl() ? 10 : 9))) {}
 
     virtual const char *getPassName() const {
       return "Mips Long Branch";
     }
 
     bool runOnMachineFunction(MachineFunction &F);
 
   private:
     void splitMBB(MachineBasicBlock *MBB);
     void initMBBInfo();
@@ skipping 174 matching lines @@
   MBB->removeSuccessor(TgtMBB);
   MBB->addSuccessor(LongBrMBB);
 
   if (IsPIC) {
     MachineBasicBlock *BalTgtMBB = MF->CreateMachineBasicBlock(BB);
     MF->insert(FallThroughMBB, BalTgtMBB);
     LongBrMBB->addSuccessor(BalTgtMBB);
     BalTgtMBB->addSuccessor(TgtMBB);
 
     int64_t TgtAddress = MBBInfos[TgtMBB->getNumber()].Address;
-    unsigned BalTgtMBBSize = 5;
+    // @LOCALMOD-START
+    unsigned BalTgtMBBSize = Triple(TM.getTargetTriple()).isOSNaCl() ? 6 : 5;
+    // @LOCALMOD-END
     int64_t Offset = TgtAddress - (I.Address + I.Size - BalTgtMBBSize * 4);
     int64_t Lo = SignExtend64<16>(Offset & 0xffff);
     int64_t Hi = SignExtend64<16>(((Offset + 0x8000) >> 16) & 0xffff);
 
     if (ABI != MipsSubtarget::N64) {
       // $longbr:
       //  addiu $sp, $sp, -8
       //  sw $ra, 0($sp)
       //  bal $baltgt
       //  lui $at, %hi($tgt - $baltgt)
       // $baltgt:
       //  addiu $at, $at, %lo($tgt - $baltgt)
       //  addu $at, $ra, $at
       //  lw $ra, 0($sp)
       //  jr $at
       //  addiu $sp, $sp, 8
       // $fallthrough:
       //
 
       Pos = LongBrMBB->begin();
 
       BuildMI(*LongBrMBB, Pos, DL, TII->get(Mips::ADDiu), Mips::SP)
         .addReg(Mips::SP).addImm(-8);
       BuildMI(*LongBrMBB, Pos, DL, TII->get(Mips::SW)).addReg(Mips::RA)
         .addReg(Mips::SP).addImm(0);
 
-      MIBundleBuilder(*LongBrMBB, Pos)
-        .append(BuildMI(*MF, DL, TII->get(Mips::BAL_BR)).addMBB(BalTgtMBB))
-        .append(BuildMI(*MF, DL, TII->get(Mips::LUi), Mips::AT).addImm(Hi));
+      if (Triple(TM.getTargetTriple()).isOSNaCl()) {
+        // @LOCALMOD-START
+        // We cannot use immediate value in LUi and ADDiu instructions below
+        // which create 32-bit offset of the target basic block from the BAL
+        // target because it does not take sandboxed instructions into account
+        // (sanboxing is run after this pass). We therefore replace it with

[Mark Seaborn, 2013/10/24 23:38:43]

"sandboxing"

[petarj, 2013/11/21 18:23:42]

Done.

+        // basic block operand which is resolved during fixup.
+        MIBundleBuilder(*LongBrMBB, Pos)
+          .append(BuildMI(*MF, DL, TII->get(Mips::BAL_BR)).addMBB(BalTgtMBB))
+          .append(BuildMI(*MF, DL, TII->get(Mips::LUi), Mips::AT)
+                  .addMBB(TgtMBB, MipsII::MO_NACL_LONG_BRANCH_HI16));
 
-      Pos = BalTgtMBB->begin();
+        Pos = BalTgtMBB->begin();
 
-      BuildMI(*BalTgtMBB, Pos, DL, TII->get(Mips::ADDiu), Mips::AT)
-        .addReg(Mips::AT).addImm(Lo);
-      BuildMI(*BalTgtMBB, Pos, DL, TII->get(Mips::ADDu), Mips::AT)
-        .addReg(Mips::RA).addReg(Mips::AT);
-      BuildMI(*BalTgtMBB, Pos, DL, TII->get(Mips::LW), Mips::RA)
-        .addReg(Mips::SP).addImm(0);
+        BuildMI(*BalTgtMBB, Pos, DL, TII->get(Mips::ADDiu), Mips::AT)
+          .addReg(Mips::AT).addMBB(TgtMBB, MipsII::MO_NACL_LONG_BRANCH_LO16);
+        BuildMI(*BalTgtMBB, Pos, DL, TII->get(Mips::ADDu), Mips::AT)
+          .addReg(Mips::RA).addReg(Mips::AT);
+        BuildMI(*BalTgtMBB, Pos, DL, TII->get(Mips::LW), Mips::RA)
+          .addReg(Mips::SP).addImm(0);
 
-      MIBundleBuilder(*BalTgtMBB, Pos)
-        .append(BuildMI(*MF, DL, TII->get(Mips::JR)).addReg(Mips::AT))
-        .append(BuildMI(*MF, DL, TII->get(Mips::ADDiu), Mips::SP)
-                .addReg(Mips::SP).addImm(8));
+        // In NaCl, modifying sp is not allowed in branch delay slot.
+        BuildMI(*BalTgtMBB, Pos, DL, TII->get(Mips::ADDiu), Mips::SP)
+          .addReg(Mips::SP).addImm(8);
+
+        MIBundleBuilder(*BalTgtMBB, Pos)
+          .append(BuildMI(*MF, DL, TII->get(Mips::JR)).addReg(Mips::AT))
+          .append(BuildMI(*MF, DL, TII->get(Mips::NOP)));
+
+        // Align target of JR instruction.
+        TgtMBB->setAlignment(4);
+        // @LOCALMOD-END
+      } else {
+        MIBundleBuilder(*LongBrMBB, Pos)
+          .append(BuildMI(*MF, DL, TII->get(Mips::BAL_BR)).addMBB(BalTgtMBB))
+          .append(BuildMI(*MF, DL, TII->get(Mips::LUi), Mips::AT).addImm(Hi));
+
+        Pos = BalTgtMBB->begin();
+
+        BuildMI(*BalTgtMBB, Pos, DL, TII->get(Mips::ADDiu), Mips::AT)
+          .addReg(Mips::AT).addImm(Lo);
+        BuildMI(*BalTgtMBB, Pos, DL, TII->get(Mips::ADDu), Mips::AT)
+          .addReg(Mips::RA).addReg(Mips::AT);
+        BuildMI(*BalTgtMBB, Pos, DL, TII->get(Mips::LW), Mips::RA)
+          .addReg(Mips::SP).addImm(0);
+
+        MIBundleBuilder(*BalTgtMBB, Pos)
+          .append(BuildMI(*MF, DL, TII->get(Mips::JR)).addReg(Mips::AT))
+          .append(BuildMI(*MF, DL, TII->get(Mips::ADDiu), Mips::SP)
+                  .addReg(Mips::SP).addImm(8));
+      }
     } else {
       // $longbr:
       //  daddiu $sp, $sp, -16
       //  sd $ra, 0($sp)
       //  lui64 $at, %highest($tgt - $baltgt)
       //  daddiu $at, $at, %higher($tgt - $baltgt)
       //  dsll $at, $at, 16
       //  daddiu $at, $at, %hi($tgt - $baltgt)
       //  bal $baltgt
       //  dsll $at, $at, 16
@@ skipping 103 matching lines @@
   while (MadeChange) {
     MadeChange = false;
 
     for (I = MBBInfos.begin(); I != E; ++I) {
       // Skip if this MBB doesn't have a branch or the branch has already been
       // converted to a long branch.
       if (!I->Br || I->HasLongBranch)
         continue;
 
       // Check if offset fits into 16-bit immediate field of branches.
-      if (!ForceLongBranch && isInt<16>(computeOffset(I->Br) / 4))
-        continue;
+      if (Triple(TM.getTargetTriple()).isOSNaCl()) {
+        // @LOCALMOD-START
+        int64_t Offset = computeOffset(I->Br) / 4;
+
+        // This offset calculation does not include sandboxing instructions
+        // that will be added later. Since at this point we dont know the

[Mark Seaborn, 2013/10/24 23:38:43]

"don't".  Maybe "added later in the MC layer" (which is why it has to come
later)?

[petarj, 2013/11/21 18:23:42]

Done.

+        // exact amount of code that sanboxing will add, we conservatively

[Mark Seaborn, 2013/10/24 23:38:43]

"sandboxing"

[petarj, 2013/11/21 18:23:42]

Done.

+        // estimate that code will not grow more than 100%.
+        Offset *= 2;
+
+        if (!ForceLongBranch && isInt<16>(Offset))
+          continue;
+        // @LOCALMOD-END
+      } else {
+        if (!ForceLongBranch && isInt<16>(computeOffset(I->Br) / 4))
+          continue;
+      }
 
       I->HasLongBranch = true;
       I->Size += LongBranchSeqSize * 4;
       ++LongBranches;
       EverMadeChange = MadeChange = true;
     }
   }
 
   if (!EverMadeChange)
     return true;
 
   // Compute basic block addresses.
   if (TM.getRelocationModel() == Reloc::PIC_) {
     uint64_t Address = 0;
 
     for (I = MBBInfos.begin(); I != E; Address += I->Size, ++I)
       I->Address = Address;
   }
 
   // Do the expansion.
   for (I = MBBInfos.begin(); I != E; ++I)
     if (I->HasLongBranch)
       expandToLongBranch(*I);
 
   MF->RenumberBlocks();
 
   return true;
 }