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

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

Issue 261024: X64: Fix incompatability with previous revision. (Closed)
Patch Set: Created 11 years, 2 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
« no previous file with comments | « no previous file | src/x64/virtual-frame-x64.cc » ('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 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 683 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 bind(&correct_result); 694 bind(&correct_result);
695 } 695 }
696 } 696 }
697 697
698 698
699 void MacroAssembler::SmiTryAddConstant(Register dst, 699 void MacroAssembler::SmiTryAddConstant(Register dst,
700 Register src, 700 Register src,
701 Smi* constant, 701 Smi* constant,
702 Label* on_not_smi_result) { 702 Label* on_not_smi_result) {
703 // Does not assume that src is a smi. 703 // Does not assume that src is a smi.
704 ASSERT_EQ(1, kSmiTagMask); 704 ASSERT_EQ(static_cast<intptr_t>(1), kSmiTagMask);
705 ASSERT_EQ(0, kSmiTag); 705 ASSERT_EQ(0, kSmiTag);
706 ASSERT(!dst.is(kScratchRegister)); 706 ASSERT(!dst.is(kScratchRegister));
707 ASSERT(!src.is(kScratchRegister)); 707 ASSERT(!src.is(kScratchRegister));
708 708
709 JumpIfNotSmi(src, on_not_smi_result); 709 JumpIfNotSmi(src, on_not_smi_result);
710 Register tmp = (dst.is(src) ? kScratchRegister : dst); 710 Register tmp = (dst.is(src) ? kScratchRegister : dst);
711 Move(tmp, constant); 711 Move(tmp, constant);
712 addq(tmp, src); 712 addq(tmp, src);
713 j(overflow, on_not_smi_result); 713 j(overflow, on_not_smi_result);
714 if (dst.is(src)) { 714 if (dst.is(src)) {
(...skipping 2280 matching lines...) Expand 10 before | Expand all | Expand 10 after
2995 CodePatcher::~CodePatcher() { 2995 CodePatcher::~CodePatcher() {
2996 // Indicate that code has changed. 2996 // Indicate that code has changed.
2997 CPU::FlushICache(address_, size_); 2997 CPU::FlushICache(address_, size_);
2998 2998
2999 // Check that the code was patched as expected. 2999 // Check that the code was patched as expected.
3000 ASSERT(masm_.pc_ == address_ + size_); 3000 ASSERT(masm_.pc_ == address_ + size_);
3001 ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap); 3001 ASSERT(masm_.reloc_info_writer.pos() == address_ + size_ + Assembler::kGap);
3002 } 3002 }
3003 3003
3004 } } // namespace v8::internal 3004 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/x64/virtual-frame-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698