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

Side by Side Diff: src/arm/assembler-arm.cc

Issue 311903003: Fix Arm release build after r21653 (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 6 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 | « no previous file | 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 (c) 1994-2006 Sun Microsystems Inc. 1 // Copyright (c) 1994-2006 Sun Microsystems Inc.
2 // All Rights Reserved. 2 // All Rights Reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions 5 // modification, are permitted provided that the following conditions
6 // are met: 6 // are met:
7 // 7 //
8 // - Redistributions of source code must retain the above copyright notice, 8 // - Redistributions of source code must retain the above copyright notice,
9 // this list of conditions and the following disclaimer. 9 // this list of conditions and the following disclaimer.
10 // 10 //
(...skipping 3574 matching lines...) Expand 10 before | Expand all | Expand 10 after
3585 count_of_code_ptr_, 3585 count_of_code_ptr_,
3586 count_of_heap_ptr_, 3586 count_of_heap_ptr_,
3587 count_of_32bit_); 3587 count_of_32bit_);
3588 return isolate->factory()->NewConstantPoolArray(small); 3588 return isolate->factory()->NewConstantPoolArray(small);
3589 } 3589 }
3590 } 3590 }
3591 3591
3592 3592
3593 void ConstantPoolBuilder::Populate(Assembler* assm, 3593 void ConstantPoolBuilder::Populate(Assembler* assm,
3594 ConstantPoolArray* constant_pool) { 3594 ConstantPoolArray* constant_pool) {
3595 ConstantPoolArray::LayoutSection section = ConstantPoolArray::SMALL_SECTION; 3595 ASSERT(count_of_64bit_ == constant_pool->number_of_entries(
3596 ASSERT(count_of_64bit_ == 3596 ConstantPoolArray::INT64, ConstantPoolArray::SMALL_SECTION));
3597 constant_pool->number_of_entries(ConstantPoolArray::INT64, section)); 3597 ASSERT(count_of_code_ptr_ == constant_pool->number_of_entries(
3598 ASSERT(count_of_code_ptr_ == 3598 ConstantPoolArray::CODE_PTR, ConstantPoolArray::SMALL_SECTION));
3599 constant_pool->number_of_entries(ConstantPoolArray::CODE_PTR, section)); 3599 ASSERT(count_of_heap_ptr_ == constant_pool->number_of_entries(
3600 ASSERT(count_of_heap_ptr_ == 3600 ConstantPoolArray::HEAP_PTR, ConstantPoolArray::SMALL_SECTION));
3601 constant_pool->number_of_entries(ConstantPoolArray::HEAP_PTR, section)); 3601 ASSERT(count_of_32bit_ == constant_pool->number_of_entries(
3602 ASSERT(count_of_32bit_ == 3602 ConstantPoolArray::INT32, ConstantPoolArray::SMALL_SECTION));
3603 constant_pool->number_of_entries(ConstantPoolArray::INT32, section));
3604 ASSERT(entries_.size() == merged_indexes_.size()); 3603 ASSERT(entries_.size() == merged_indexes_.size());
3605 3604
3606 int index_64bit = 0; 3605 int index_64bit = 0;
3607 int index_code_ptr = count_of_64bit_; 3606 int index_code_ptr = count_of_64bit_;
3608 int index_heap_ptr = count_of_64bit_ + count_of_code_ptr_; 3607 int index_heap_ptr = count_of_64bit_ + count_of_code_ptr_;
3609 int index_32bit = count_of_64bit_ + count_of_code_ptr_ + count_of_heap_ptr_; 3608 int index_32bit = count_of_64bit_ + count_of_code_ptr_ + count_of_heap_ptr_;
3610 3609
3611 size_t i; 3610 size_t i;
3612 std::vector<RelocInfo>::const_iterator rinfo; 3611 std::vector<RelocInfo>::const_iterator rinfo;
3613 for (rinfo = entries_.begin(), i = 0; rinfo != entries_.end(); rinfo++, i++) { 3612 for (rinfo = entries_.begin(), i = 0; rinfo != entries_.end(); rinfo++, i++) {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
3663 ASSERT((index_64bit == count_of_64bit_) && 3662 ASSERT((index_64bit == count_of_64bit_) &&
3664 (index_code_ptr == (index_64bit + count_of_code_ptr_)) && 3663 (index_code_ptr == (index_64bit + count_of_code_ptr_)) &&
3665 (index_heap_ptr == (index_code_ptr + count_of_heap_ptr_)) && 3664 (index_heap_ptr == (index_code_ptr + count_of_heap_ptr_)) &&
3666 (index_32bit == (index_heap_ptr + count_of_32bit_))); 3665 (index_32bit == (index_heap_ptr + count_of_32bit_)));
3667 } 3666 }
3668 3667
3669 3668
3670 } } // namespace v8::internal 3669 } } // namespace v8::internal
3671 3670
3672 #endif // V8_TARGET_ARCH_ARM 3671 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698