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/serialize.cc

Issue 8382031: Revert 9763 after build bot failures. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 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 | 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 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 744 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 755
756 756
757 void Deserializer::ReadChunk(Object** current, 757 void Deserializer::ReadChunk(Object** current,
758 Object** limit, 758 Object** limit,
759 int source_space, 759 int source_space,
760 Address current_object_address) { 760 Address current_object_address) {
761 Isolate* const isolate = isolate_; 761 Isolate* const isolate = isolate_;
762 bool write_barrier_needed = (current_object_address != NULL && 762 bool write_barrier_needed = (current_object_address != NULL &&
763 source_space != NEW_SPACE && 763 source_space != NEW_SPACE &&
764 source_space != CELL_SPACE && 764 source_space != CELL_SPACE &&
765 source_space == OLD_DATA_SPACE); 765 source_space != OLD_DATA_SPACE);
766 while (current < limit) { 766 while (current < limit) {
767 int data = source_->Get(); 767 int data = source_->Get();
768 switch (data) { 768 switch (data) {
769 #define CASE_STATEMENT(where, how, within, space_number) \ 769 #define CASE_STATEMENT(where, how, within, space_number) \
770 case where + how + within + space_number: \ 770 case where + how + within + space_number: \
771 ASSERT((where & ~kPointedToMask) == 0); \ 771 ASSERT((where & ~kPointedToMask) == 0); \
772 ASSERT((how & ~kHowToCodeMask) == 0); \ 772 ASSERT((how & ~kHowToCodeMask) == 0); \
773 ASSERT((within & ~kWhereToPointMask) == 0); \ 773 ASSERT((within & ~kWhereToPointMask) == 0); \
774 ASSERT((space_number & ~kSpaceMask) == 0); 774 ASSERT((space_number & ~kSpaceMask) == 0);
775 775
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
1641 fullness_[space] = RoundUp(fullness_[space], Page::kPageSize); 1641 fullness_[space] = RoundUp(fullness_[space], Page::kPageSize);
1642 } 1642 }
1643 } 1643 }
1644 int allocation_address = fullness_[space]; 1644 int allocation_address = fullness_[space];
1645 fullness_[space] = allocation_address + size; 1645 fullness_[space] = allocation_address + size;
1646 return allocation_address; 1646 return allocation_address;
1647 } 1647 }
1648 1648
1649 1649
1650 } } // namespace v8::internal 1650 } } // namespace v8::internal
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