* Complete new store buffer on ia32. The store buffer now covers...

src/ia32/ic-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 1705 matching lines @@
       address + Assembler::kCallTargetAddressOffset;
 
   // If the instruction following the call is not a test eax, nothing
   // was inlined.
   if (*test_instruction_address != Assembler::kTestEaxByte) return false;
 
   // Extract the encoded deltas from the test eax instruction.
   Address encoded_offsets_address = test_instruction_address + 1;
   int encoded_offsets = *reinterpret_cast<int*>(encoded_offsets_address);
   int delta_to_map_check = -(encoded_offsets & 0xFFFF);
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
   int delta_to_record_write = encoded_offsets >> 16;
-#endif
 
   // Patch the map to check. The map address is the last 4 bytes of
   // the 7-byte operand-immediate compare instruction.
   Address map_check_address = test_instruction_address + delta_to_map_check;
   Address map_address = map_check_address + 3;
   *(reinterpret_cast<Object**>(map_address)) = map;
 
   // Patch the offset in the store instruction. The offset is in the
   // last 4 bytes of a six byte register-to-memory move instruction.
   Address offset_address =
       map_check_address + StoreIC::kOffsetToStoreInstruction + 2;
   // The offset should have initial value (kMaxInt - 1), cleared value
   // (-1) or we should be clearing the inlined version.
   ASSERT(*reinterpret_cast<int*>(offset_address) == kMaxInt - 1 ||
          *reinterpret_cast<int*>(offset_address) == -1 ||
          (offset == 0 && map == Heap::null_value()));
   *reinterpret_cast<int*>(offset_address) = offset - kHeapObjectTag;
 
-#ifdef ENABLE_CARDMARKING_WRITE_BARRIER
   // Patch the offset in the write-barrier code. The offset is the
   // last 4 bytes of a six byte lea instruction.
   offset_address = map_check_address + delta_to_record_write + 2;
   // The offset should have initial value (kMaxInt), cleared value
   // (-1) or we should be clearing the inlined version.
   ASSERT(*reinterpret_cast<int*>(offset_address) == kMaxInt ||
          *reinterpret_cast<int*>(offset_address) == -1 ||
          (offset == 0 && map == Heap::null_value()));
   *reinterpret_cast<int*>(offset_address) = offset - kHeapObjectTag;
-#endif
 
   return true;
 }
 
 
 static bool PatchInlinedMapCheck(Address address, Object* map) {
   if (V8::UseCrankshaft()) return false;
 
   Address test_instruction_address =
       address + Assembler::kCallTargetAddressOffset;
@@ skipping 344 matching lines @@
   Condition cc = *jmp_address == Assembler::kJncShortOpcode
       ? not_zero
       : zero;
   *jmp_address = static_cast<byte>(Assembler::kJccShortPrefix | cc);
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32