PNaCl localmod mods in LLVM to 223109 (local files only)

lib/Target/X86/X86NaClRewritePass.cpp

 //=== X86NaClRewritePAss.cpp - Rewrite instructions for NaCl SFI --*- C++ -*-=//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file contains a pass that ensures stores and loads and stack/frame
@@ skipping 218 matching lines @@
   DebugLoc DL = MI.getDebugLoc();
   unsigned DestReg = MI.getOperand(0).getReg();
   assert(DestReg == X86::ESP || DestReg == X86::RSP);
 
   unsigned NewOpc = 0;
   switch (Opc) {
   case X86::ADD64ri8 : NewOpc = X86::NACL_ASPi8; break;
   case X86::ADD64ri32: NewOpc = X86::NACL_ASPi32; break;
   case X86::SUB64ri8 : NewOpc = X86::NACL_SSPi8; break;
   case X86::SUB64ri32: NewOpc = X86::NACL_SSPi32; break;
+  case X86::AND64ri8 : NewOpc = X86::NACL_ANDSPi8; break;
   case X86::AND64ri32: NewOpc = X86::NACL_ANDSPi32; break;
   }
   if (NewOpc) {
     BuildMI(MBB, MBBI, DL, TII->get(NewOpc))
       .addImm(MI.getOperand(2).getImm())
       .addReg(FlagUseZeroBasedSandbox ? 0 : X86::R15);
     MI.eraseFromParent();
     return true;
   }
 
@@ skipping 446 matching lines @@
       }
     }
   }
   return Modified;
 }
 
 bool X86NaClRewritePass::runOnMachineFunction(MachineFunction &MF) {
   bool Modified = false;
 
   TM = &MF.getTarget();
-  TII = TM->getInstrInfo();
-  TRI = TM->getRegisterInfo();
+  TII = MF.getSubtarget().getInstrInfo();
+  TRI = MF.getSubtarget().getRegisterInfo();
   Subtarget = &TM->getSubtarget<X86Subtarget>();
   Is64Bit = Subtarget->is64Bit();
 
   assert(Subtarget->isTargetNaCl() && "Unexpected target in NaClRewritePass!");
 
   DEBUG(dbgs() << "*************** NaCl Rewrite Pass ***************\n");
   for (MachineFunction::iterator MFI = MF.begin(), E = MF.end();
        MFI != E;
        ++MFI) {
     Modified |= runOnMachineBasicBlock(*MFI);
@@ skipping 25 matching lines @@
   }
   return Modified;
 }
 
 /// createX86NaClRewritePassPass - returns an instance of the pass.
 namespace llvm {
   FunctionPass* createX86NaClRewritePass() {
     return new X86NaClRewritePass();
   }
 }