| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
| 2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
| 3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
| 4 // met: | 4 // met: |
| 5 // | 5 // |
| 6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
| 7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
| 8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
| 9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
| 10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 movq(kScratchRegister, ExternalReference::new_space_mask(isolate())); | 278 movq(kScratchRegister, ExternalReference::new_space_mask(isolate())); |
| 279 and_(scratch, kScratchRegister); | 279 and_(scratch, kScratchRegister); |
| 280 } else { | 280 } else { |
| 281 movq(scratch, ExternalReference::new_space_mask(isolate())); | 281 movq(scratch, ExternalReference::new_space_mask(isolate())); |
| 282 and_(scratch, object); | 282 and_(scratch, object); |
| 283 } | 283 } |
| 284 movq(kScratchRegister, ExternalReference::new_space_start(isolate())); | 284 movq(kScratchRegister, ExternalReference::new_space_start(isolate())); |
| 285 cmpq(scratch, kScratchRegister); | 285 cmpq(scratch, kScratchRegister); |
| 286 j(cc, branch, distance); | 286 j(cc, branch, distance); |
| 287 } else { | 287 } else { |
| 288 ASSERT(is_int32(static_cast<int64_t>(HEAP->NewSpaceMask()))); | 288 ASSERT(is_int32(static_cast<int64_t>(isolate()->heap()->NewSpaceMask()))); |
| 289 intptr_t new_space_start = | 289 intptr_t new_space_start = |
| 290 reinterpret_cast<intptr_t>(HEAP->NewSpaceStart()); | 290 reinterpret_cast<intptr_t>(isolate()->heap()->NewSpaceStart()); |
| 291 movq(kScratchRegister, -new_space_start, RelocInfo::NONE64); | 291 movq(kScratchRegister, -new_space_start, RelocInfo::NONE64); |
| 292 if (scratch.is(object)) { | 292 if (scratch.is(object)) { |
| 293 addq(scratch, kScratchRegister); | 293 addq(scratch, kScratchRegister); |
| 294 } else { | 294 } else { |
| 295 lea(scratch, Operand(object, kScratchRegister, times_1, 0)); | 295 lea(scratch, Operand(object, kScratchRegister, times_1, 0)); |
| 296 } | 296 } |
| 297 and_(scratch, Immediate(static_cast<int32_t>(HEAP->NewSpaceMask()))); | 297 and_(scratch, |
| 298 Immediate(static_cast<int32_t>(isolate()->heap()->NewSpaceMask()))); |
| 298 j(cc, branch, distance); | 299 j(cc, branch, distance); |
| 299 } | 300 } |
| 300 } | 301 } |
| 301 | 302 |
| 302 | 303 |
| 303 void MacroAssembler::RecordWriteField( | 304 void MacroAssembler::RecordWriteField( |
| 304 Register object, | 305 Register object, |
| 305 int offset, | 306 int offset, |
| 306 Register value, | 307 Register value, |
| 307 Register dst, | 308 Register dst, |
| (...skipping 4387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4695 j(greater, &no_memento_available); | 4696 j(greater, &no_memento_available); |
| 4696 CompareRoot(MemOperand(scratch_reg, -AllocationMemento::kSize), | 4697 CompareRoot(MemOperand(scratch_reg, -AllocationMemento::kSize), |
| 4697 Heap::kAllocationMementoMapRootIndex); | 4698 Heap::kAllocationMementoMapRootIndex); |
| 4698 bind(&no_memento_available); | 4699 bind(&no_memento_available); |
| 4699 } | 4700 } |
| 4700 | 4701 |
| 4701 | 4702 |
| 4702 } } // namespace v8::internal | 4703 } } // namespace v8::internal |
| 4703 | 4704 |
| 4704 #endif // V8_TARGET_ARCH_X64 | 4705 #endif // V8_TARGET_ARCH_X64 |
| OLD | NEW |