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

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

Issue 6347067: Fix potential overwriting of debug jumps of following code. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge/build-x64
Patch Set: Addressed review comments. Created 9 years, 10 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/macro-assembler-x64.h ('k') | test/cctest/cctest.status » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 the V8 project authors. All rights reserved. 1 // Copyright 2010 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 void MacroAssembler::PushRoot(Heap::RootListIndex index) { 61 void MacroAssembler::PushRoot(Heap::RootListIndex index) {
62 push(Operand(kRootRegister, index << kPointerSizeLog2)); 62 push(Operand(kRootRegister, index << kPointerSizeLog2));
63 } 63 }
64 64
65 65
66 void MacroAssembler::CompareRoot(Register with, Heap::RootListIndex index) { 66 void MacroAssembler::CompareRoot(Register with, Heap::RootListIndex index) {
67 cmpq(with, Operand(kRootRegister, index << kPointerSizeLog2)); 67 cmpq(with, Operand(kRootRegister, index << kPointerSizeLog2));
68 } 68 }
69 69
70 70
71 void MacroAssembler::CompareRoot(Operand with, Heap::RootListIndex index) { 71 void MacroAssembler::CompareRoot(const Operand& with,
72 Heap::RootListIndex index) {
73 ASSERT(!with.AddressUsesRegister(kScratchRegister));
72 LoadRoot(kScratchRegister, index); 74 LoadRoot(kScratchRegister, index);
73 cmpq(with, kScratchRegister); 75 cmpq(with, kScratchRegister);
74 } 76 }
75 77
76 78
77 void MacroAssembler::RecordWriteHelper(Register object, 79 void MacroAssembler::RecordWriteHelper(Register object,
78 Register addr, 80 Register addr,
79 Register scratch) { 81 Register scratch) {
80 if (FLAG_debug_code) { 82 if (FLAG_debug_code) {
81 // Check that the object is not in new space. 83 // Check that the object is not in new space.
(...skipping 2388 matching lines...) Expand 10 before | Expand all | Expand 10 after
2470 CPU::FlushICache(address_, size_); 2472 CPU::FlushICache(address_, size_);
2471 2473
2472 // Check that the code was patched as expected. 2474 // Check that the code was patched as expected.
2473 ASSERT(masm_.pc_ == address_ + size_); 2475 ASSERT(masm_.pc_ == address_ + size_);
2474 ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap); 2476 ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap);
2475 } 2477 }
2476 2478
2477 } } // namespace v8::internal 2479 } } // namespace v8::internal
2478 2480
2479 #endif // V8_TARGET_ARCH_X64 2481 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/macro-assembler-x64.h ('k') | test/cctest/cctest.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698