Bring toiger up to date with bleeding edge 984.

src/assembler-ia32-inl.h

Index: src/assembler-ia32-inl.h
===================================================================
--- src/assembler-ia32-inl.h	(revision 1004)
+++ src/assembler-ia32-inl.h	(working copy)
@@ -152,6 +152,12 @@
 }
 
 
+Immediate::Immediate(Label *internal_offset) {
+  x_ = reinterpret_cast<int32_t>(internal_offset);
+  rmode_ = RelocInfo::INTERNAL_REFERENCE;
+}
+
+
 Immediate::Immediate(Handle<Object> handle) {
   // Verify all Objects referred by code are NOT in new space.
   Object* obj = *handle;
@@ -200,11 +206,27 @@
 
 
 void Assembler::emit(const Immediate& x) {
+  if (x.rmode_ == RelocInfo::INTERNAL_REFERENCE) {
+    Label* label = reinterpret_cast<Label*>(x.x_);
+    emit_code_relative_offset(label);
+    return;
+  }
   if (x.rmode_ != RelocInfo::NONE) RecordRelocInfo(x.rmode_);
   emit(x.x_);
 }
 
 
+void Assembler::emit_code_relative_offset(Label* label) {
+  if (label->is_bound()) {
+    int32_t pos;
+    pos = label->pos() + Code::kHeaderSize - kHeapObjectTag;
+    emit(pos);
+  } else {
+    emit_disp(label, Displacement::CODE_RELATIVE);
+  }
+}
+
+
 void Assembler::emit_w(const Immediate& x) {
   ASSERT(x.rmode_ == RelocInfo::NONE);
   uint16_t value = static_cast<uint16_t>(x.x_);