Provide baseline GC version.

src/ia32/codegen-ia32.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 7668 matching lines @@
   // Bring addresses into index1 and index2.
   __ lea(index1.reg(), FixedArrayElementOperand(tmp1.reg(), index1.reg()));
   __ lea(index2.reg(), FixedArrayElementOperand(tmp1.reg(), index2.reg()));
 
   // Swap elements.
   __ mov(object.reg(), Operand(index1.reg(), 0));
   __ mov(tmp2.reg(),   Operand(index2.reg(), 0));
   __ mov(Operand(index2.reg(), 0), object.reg());
   __ mov(Operand(index1.reg(), 0), tmp2.reg());
 
+#ifndef BASELINE_GC
   Label done;
   __ InNewSpace(tmp1.reg(), tmp2.reg(), equal, &done);
   // Possible optimization: do a check that both values are Smis
   // (or them and test against Smi mask.)
 
   __ mov(tmp2.reg(), tmp1.reg());
   __ RecordWriteHelper(tmp2.reg(), index1.reg(), object.reg());
   __ RecordWriteHelper(tmp1.reg(), index2.reg(), object.reg());
   __ bind(&done);
+#endif
 
   deferred->BindExit();
   frame_->Push(Factory::undefined_value());
 }
 
 
 void CodeGenerator::GenerateCallFunction(ZoneList<Expression*>* args) {
   Comment cmnt(masm_, "[ GenerateCallFunction");
 
   ASSERT(args->length() >= 2);
@@ skipping 1917 matching lines @@
     // If the receiver and the value share a register allocate a new
     // register for the receiver.
     if (receiver.reg().is(value.reg())) {
       receiver = allocator()->Allocate();
       ASSERT(receiver.is_valid());
       __ mov(receiver.reg(), Operand(value.reg()));
     }
 
     // Update the write barrier. To save instructions in the inlined
     // version we do not filter smis.
+#ifndef BASELINE_GC
     Label skip_write_barrier;
     __ InNewSpace(receiver.reg(), value.reg(), equal, &skip_write_barrier);
     int delta_to_record_write = masm_->SizeOfCodeGeneratedSince(&patch_site);
     __ lea(scratch.reg(), Operand(receiver.reg(), offset));
     __ RecordWriteHelper(receiver.reg(), scratch.reg(), value.reg());
     if (FLAG_debug_code) {
       __ mov(receiver.reg(), Immediate(BitCast<int32_t>(kZapValue)));
       __ mov(value.reg(), Immediate(BitCast<int32_t>(kZapValue)));
       __ mov(scratch.reg(), Immediate(BitCast<int32_t>(kZapValue)));
     }
     __ bind(&skip_write_barrier);
+#endif
     value.Unuse();
     scratch.Unuse();
     receiver.Unuse();
     done.Jump(&result);
 
     slow.Bind(&value, &receiver);
     frame()->Push(&receiver);
     frame()->Push(&value);
     result = frame()->CallStoreIC(name, is_contextual);
     // Encode the offset to the map check instruction and the offset
     // to the write barrier store address computation in a test eax
     // instruction.
     int delta_to_patch_site = masm_->SizeOfCodeGeneratedSince(&patch_site);
+#ifndef BASELINE_GC
     __ test(eax,
             Immediate((delta_to_record_write << 16) | delta_to_patch_site));
+#else
+    __ test(eax,
+            Immediate(delta_to_patch_site));

[Vitaly Repeshko, 2010/12/13 13:38:01]

This can cause short encoding for the test instruction and
StoreIC::PatchInlinedStore might fail.

+#endif
     done.Bind(&result);
   }
 
   ASSERT_EQ(expected_height, frame()->height());
   return result;
 }
 
 
 Result CodeGenerator::EmitKeyedLoad() {
 #ifdef DEBUG
@@ skipping 546 matching lines @@
   memcpy(chunk->GetStartAddress(), desc.buffer, desc.instr_size);
   CPU::FlushICache(chunk->GetStartAddress(), desc.instr_size);
   return FUNCTION_CAST<MemCopyFunction>(chunk->GetStartAddress());
 }
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32