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

lib/Target/X86/MCTargetDesc/X86MCNaCl.cpp

 //=== X86MCNaCl.cpp - Expansion of NaCl pseudo-instructions      --*- C++ -*-=//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 //===----------------------------------------------------------------------===//
@@ skipping 472 matching lines @@
 //
 //   We need global state to keep track of the explicit prefix (PREFIX_*)
 //   instructions. Unfortunately, the assembly parser prefers to generate
 //   these instead of combined instructions. At this time, having only
 //   one explicit prefix is supported.
 bool CustomExpandInstNaClX86(const llvm::MCSubtargetInfo &STI,
                              const MCInst &Inst, MCStreamer &Out,
                              X86MCNaClSFIState &State) {
   // If we are emitting to .s, only sandbox pseudos not supported by gas.
   if (Out.hasRawTextSupport()) {
-    if (Inst.getOpcode() != X86::NACL_ANDSPi32)
+    if (!(Inst.getOpcode() == X86::NACL_ANDSPi8 ||
+          Inst.getOpcode() == X86::NACL_ANDSPi32))
       return false;
   }
   // If we make a call to EmitInstruction, we will be called recursively. In
   // this case we just want the raw instruction to be emitted instead of
   // handling the insruction here.
   if (State.EmitRaw == true && !State.PrefixPass) {
     return false;
   }
   EmitRawState E(State);
   unsigned Opc = Inst.getOpcode();
@@ skipping 60 matching lines @@
     EmitSPArith(STI, X86::ADD32ri, Inst.getOperand(0), Out);
     return true;
   case X86::NACL_SSPi8:
     assert(State.PrefixSaved == 0);
     EmitSPArith(STI, X86::SUB32ri8, Inst.getOperand(0), Out);
     return true;
   case X86::NACL_SSPi32:
     assert(State.PrefixSaved == 0);
     EmitSPArith(STI, X86::SUB32ri, Inst.getOperand(0), Out);
     return true;
+  case X86::NACL_ANDSPi8:
+    assert(State.PrefixSaved == 0);
+    EmitSPArith(STI, X86::AND32ri8, Inst.getOperand(0), Out);
+    return true;
   case X86::NACL_ANDSPi32:
     assert(State.PrefixSaved == 0);
     EmitSPArith(STI, X86::AND32ri, Inst.getOperand(0), Out);
     return true;
   case X86::NACL_SPADJi32:
     assert(State.PrefixSaved == 0);
     EmitSPAdj(STI, Inst.getOperand(0), Out);
     return true;
   case X86::NACL_RESTBPm:
     assert(State.PrefixSaved == 0);
@@ skipping 244 matching lines @@
 
 unsigned DemoteRegTo32_(unsigned RegIn) {
   if (RegIn == 0)
     return 0;
   unsigned RegOut = getX86SubSuperRegister_(RegIn, MVT::i32, false);
   assert(RegOut != 0);
   return RegOut;
 }
 } //namespace
 // @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@