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

Side by Side Diff: src/serialize.cc

Issue 660173: Fix bad merge of serialize.cc numbers for external references to ... (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/partial_snapshots/
Patch Set: Created 10 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/objects-inl.h ('k') | src/x64/ic-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 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 Add(ExternalReference::keyed_lookup_cache_keys().address(), 431 Add(ExternalReference::keyed_lookup_cache_keys().address(),
432 UNCLASSIFIED, 432 UNCLASSIFIED,
433 24, 433 24,
434 "KeyedLookupCache::keys()"); 434 "KeyedLookupCache::keys()");
435 Add(ExternalReference::keyed_lookup_cache_field_offsets().address(), 435 Add(ExternalReference::keyed_lookup_cache_field_offsets().address(),
436 UNCLASSIFIED, 436 UNCLASSIFIED,
437 25, 437 25,
438 "KeyedLookupCache::field_offsets()"); 438 "KeyedLookupCache::field_offsets()");
439 Add(ExternalReference::transcendental_cache_array_address().address(), 439 Add(ExternalReference::transcendental_cache_array_address().address(),
440 UNCLASSIFIED, 440 UNCLASSIFIED,
441 25, 441 26,
442 "TranscendentalCache::caches()"); 442 "TranscendentalCache::caches()");
443 } 443 }
444 444
445 445
446 ExternalReferenceEncoder::ExternalReferenceEncoder() 446 ExternalReferenceEncoder::ExternalReferenceEncoder()
447 : encodings_(Match) { 447 : encodings_(Match) {
448 ExternalReferenceTable* external_references = 448 ExternalReferenceTable* external_references =
449 ExternalReferenceTable::instance(); 449 ExternalReferenceTable::instance();
450 for (int i = 0; i < external_references->size(); ++i) { 450 for (int i = 0; i < external_references->size(); ++i) {
451 Put(external_references->address(i), i); 451 Put(external_references->address(i), i);
(...skipping 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
1358 fullness_[space] = RoundUp(fullness_[space], Page::kPageSize); 1358 fullness_[space] = RoundUp(fullness_[space], Page::kPageSize);
1359 } 1359 }
1360 } 1360 }
1361 int allocation_address = fullness_[space]; 1361 int allocation_address = fullness_[space];
1362 fullness_[space] = allocation_address + size; 1362 fullness_[space] = allocation_address + size;
1363 return allocation_address; 1363 return allocation_address;
1364 } 1364 }
1365 1365
1366 1366
1367 } } // namespace v8::internal 1367 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/objects-inl.h ('k') | src/x64/ic-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698