Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: src/x64/macro-assembler-x64.cc

Issue 6627046: X64 Crankshaft: Fix bug in DoStoreContextSlot, and enable it. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/x64/lithium-x64.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 cmpq(with, kScratchRegister); 88 cmpq(with, kScratchRegister);
89 } 89 }
90 90
91 91
92 void MacroAssembler::RecordWriteHelper(Register object, 92 void MacroAssembler::RecordWriteHelper(Register object,
93 Register addr, 93 Register addr,
94 Register scratch) { 94 Register scratch) {
95 if (FLAG_debug_code) { 95 if (FLAG_debug_code) {
96 // Check that the object is not in new space. 96 // Check that the object is not in new space.
97 NearLabel not_in_new_space; 97 NearLabel not_in_new_space;
98 InNewSpace(object, scratch, not_equal, &not_in_new_space); 98 if (addr.is(kScratchRegister)) {
99 push(kScratchRegister);
100 InNewSpace(object, scratch, not_equal, &not_in_new_space);
101 pop(kScratchRegister);
102 } else {
103 InNewSpace(object, scratch, not_equal, &not_in_new_space);
104 }
99 Abort("new-space object passed to RecordWriteHelper"); 105 Abort("new-space object passed to RecordWriteHelper");
100 bind(&not_in_new_space); 106 bind(&not_in_new_space);
101 } 107 }
102 108
103 // Compute the page start address from the heap object pointer, and reuse 109 // Compute the page start address from the heap object pointer, and reuse
104 // the 'object' register for it. 110 // the 'object' register for it.
105 and_(object, Immediate(~Page::kPageAlignmentMask)); 111 and_(object, Immediate(~Page::kPageAlignmentMask));
106 112
107 // Compute number of region covering addr. See Page::GetRegionNumberForAddress 113 // Compute number of region covering addr. See Page::GetRegionNumberForAddress
108 // method for more details. 114 // method for more details.
(...skipping 2555 matching lines...) Expand 10 before | Expand all | Expand 10 after
2664 CPU::FlushICache(address_, size_); 2670 CPU::FlushICache(address_, size_);
2665 2671
2666 // Check that the code was patched as expected. 2672 // Check that the code was patched as expected.
2667 ASSERT(masm_.pc_ == address_ + size_); 2673 ASSERT(masm_.pc_ == address_ + size_);
2668 ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap); 2674 ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap);
2669 } 2675 }
2670 2676
2671 } } // namespace v8::internal 2677 } } // namespace v8::internal
2672 2678
2673 #endif // V8_TARGET_ARCH_X64 2679 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/lithium-x64.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698