Subzero: Add Non-SFI support for x86-32.

src/IceAssemblerX86BaseImpl.h

Index: src/IceAssemblerX86BaseImpl.h
diff --git a/src/IceAssemblerX86BaseImpl.h b/src/IceAssemblerX86BaseImpl.h
index 46654b1f9bfe11ba107ac50bd49c29e822a75e66..99725b443065286e714bdd7a9df44ce45786fdf3 100644
--- a/src/IceAssemblerX86BaseImpl.h
+++ b/src/IceAssemblerX86BaseImpl.h
@@ -122,7 +122,7 @@ void AssemblerX86Base<Machine>::call(const ConstantRelocatable *label) {
   AssemblerBuffer::EnsureCapacity ensured(&Buffer);
   intptr_t call_start = Buffer.getPosition();
   emitUint8(0xE8);
-  emitFixup(this->createFixup(Traits::PcRelFixup, label));
+  emitFixup(this->createFixup(Traits::FixupKindPcRel, label));

[John, 2015/12/22 15:44:38]

I prefer the other name. The prefix "FixupKind" just bloats the code more than
it is needed. 'PcRelFixup' conveys the idea (to me, at least) that the member is
a Pc Relative Fixup. If you care enough to distinguish between the enum and an
instance of the Fixup class, then I would strongly suggest using
'PcRelFixupKind' (but I still think 'kind' is unnecessary here)

[Jim Stichnoth, 2015/12/28 07:54:07]

Good point.

For this naming, I'm trying to distinguish between constexpr values in the
Traits namespace, and values of static members in the TargetLowering object that
depend on flags (like --nonsfi or --sandbox).

How about this approach.  For the constexpr names, I changed:
  FixupKindPcRel  --> FK_PcRel
  FixupKindGotPC  --> FK_GotPC
  FixupKindAbs    --> FK_Abs
  FixupKindGofoff --> FK_Gotoff
in the style of enum value naming.

   emitInt32(-4);
   assert((Buffer.getPosition() - call_start) == kCallExternalLabelSize);
   (void)call_start;
@@ -133,7 +133,8 @@ void AssemblerX86Base<Machine>::call(const Immediate &abs_address) {
   AssemblerBuffer::EnsureCapacity ensured(&Buffer);
   intptr_t call_start = Buffer.getPosition();
   emitUint8(0xE8);
-  emitFixup(this->createFixup(Traits::PcRelFixup, AssemblerFixup::NullSymbol));
+  emitFixup(
+      this->createFixup(Traits::FixupKindPcRel, AssemblerFixup::NullSymbol));
   emitInt32(abs_address.value() - 4);
   assert((Buffer.getPosition() - call_start) == kCallExternalLabelSize);
   (void)call_start;
@@ -3132,7 +3133,8 @@ void AssemblerX86Base<Machine>::j(typename Traits::Cond::BrCond condition,
   AssemblerBuffer::EnsureCapacity ensured(&Buffer);
   emitUint8(0x0F);
   emitUint8(0x80 + condition);
-  emitFixup(this->createFixup(Traits::PcRelFixup, label));
+  assert(0 && "Untested - please verify and then remove this assert.");
+  emitFixup(this->createFixup(Traits::FixupKindPcRel, label));
   emitInt32(-4);
 }
 
@@ -3172,7 +3174,8 @@ template <class Machine>
 void AssemblerX86Base<Machine>::jmp(const ConstantRelocatable *label) {
   AssemblerBuffer::EnsureCapacity ensured(&Buffer);
   emitUint8(0xE9);
-  emitFixup(this->createFixup(Traits::PcRelFixup, label));
+  assert(0 && "Untested - please verify and then remove this assert.");
+  emitFixup(this->createFixup(Traits::FixupKindPcRel, label));
   emitInt32(-4);
 }