Suzero. X8664. NaCl Sandboxing.

src/IceInstX8632.cpp

Index: src/IceInstX8632.cpp
diff --git a/src/IceInstX8632.cpp b/src/IceInstX8632.cpp
index a4218b72e9326ece745f2c25df2464f25e6fc78c..ff36c7a32aeb10f425ba1cf7b9debb6d05b6e221 100644
--- a/src/IceInstX8632.cpp
+++ b/src/IceInstX8632.cpp
@@ -76,9 +76,9 @@ void TargetX8632Traits::X86Operand::dump(const Cfg *, Ostream &Str) const {
 
 TargetX8632Traits::X86OperandMem::X86OperandMem(
     Cfg *Func, Type Ty, Variable *Base, Constant *Offset, Variable *Index,
-    uint16_t Shift, SegmentRegisters SegmentReg, bool IsPIC)
+    uint16_t Shift, SegmentRegisters SegmentReg, bool IsRebased)
     : X86Operand(kMem, Ty), Base(Base), Offset(Offset), Index(Index),
-      Shift(Shift), SegmentReg(SegmentReg), IsPIC(IsPIC) {
+      Shift(Shift), SegmentReg(SegmentReg), IsRebased(IsRebased) {
   assert(Shift <= 3);
   Vars = nullptr;
   NumVars = 0;
@@ -118,12 +118,12 @@ void validateMemOperandPIC(const TargetX8632Traits::X86OperandMem *Mem,
   const bool HasCR =
       Mem->getOffset() && llvm::isa<ConstantRelocatable>(Mem->getOffset());
   (void)HasCR;
-  const bool IsPIC = Mem->getIsPIC();
-  (void)IsPIC;
+  const bool IsRebased = Mem->getIsRebased();
+  (void)IsRebased;
   if (UseNonsfi)
-    assert(HasCR == IsPIC);
+    assert(HasCR == IsRebased);
   else
-    assert(!IsPIC);
+    assert(!IsRebased);
 }
 
 } // end of anonymous namespace
@@ -260,7 +260,7 @@ void TargetX8632Traits::X86OperandMem::emitSegmentOverride(
 
 TargetX8632Traits::Address TargetX8632Traits::X86OperandMem::toAsmAddress(
     TargetX8632Traits::Assembler *Asm,
-    const Ice::TargetLowering *TargetLowering) const {
+    const Ice::TargetLowering *TargetLowering, bool /*LeaAddr*/) const {

[Jim Stichnoth, 2016/01/14 00:09:52]

IsLeaAddr

[John, 2016/01/14 23:18:25]

Done.

   const auto *Target =
       static_cast<const ::Ice::X8632::TargetX8632 *>(TargetLowering);
   const bool UseNonsfi = Target->getGlobalContext()->getFlags().getUseNonsfi();