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

Side by Side Diff: src/heap.cc

Issue 256753002: Merge v8utils.* and utils.* (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 8 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/global-handles.h ('k') | src/hydrogen-instructions.h » ('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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "mark-compact.h" 42 #include "mark-compact.h"
43 #include "natives.h" 43 #include "natives.h"
44 #include "objects-visiting.h" 44 #include "objects-visiting.h"
45 #include "objects-visiting-inl.h" 45 #include "objects-visiting-inl.h"
46 #include "once.h" 46 #include "once.h"
47 #include "runtime-profiler.h" 47 #include "runtime-profiler.h"
48 #include "scopeinfo.h" 48 #include "scopeinfo.h"
49 #include "snapshot.h" 49 #include "snapshot.h"
50 #include "store-buffer.h" 50 #include "store-buffer.h"
51 #include "utils/random-number-generator.h" 51 #include "utils/random-number-generator.h"
52 #include "utils.h"
52 #include "v8conversions.h" 53 #include "v8conversions.h"
53 #include "v8threads.h" 54 #include "v8threads.h"
54 #include "v8utils.h"
55 #include "vm-state-inl.h" 55 #include "vm-state-inl.h"
56 #if V8_TARGET_ARCH_ARM && !V8_INTERPRETED_REGEXP 56 #if V8_TARGET_ARCH_ARM && !V8_INTERPRETED_REGEXP
57 #include "regexp-macro-assembler.h" 57 #include "regexp-macro-assembler.h"
58 #include "arm/regexp-macro-assembler-arm.h" 58 #include "arm/regexp-macro-assembler-arm.h"
59 #endif 59 #endif
60 #if V8_TARGET_ARCH_MIPS && !V8_INTERPRETED_REGEXP 60 #if V8_TARGET_ARCH_MIPS && !V8_INTERPRETED_REGEXP
61 #include "regexp-macro-assembler.h" 61 #include "regexp-macro-assembler.h"
62 #include "mips/regexp-macro-assembler-mips.h" 62 #include "mips/regexp-macro-assembler-mips.h"
63 #endif 63 #endif
64 64
(...skipping 6594 matching lines...) Expand 10 before | Expand all | Expand 10 after
6659 static_cast<int>(object_sizes_last_time_[index])); 6659 static_cast<int>(object_sizes_last_time_[index]));
6660 CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT) 6660 CODE_AGE_LIST_COMPLETE(ADJUST_LAST_TIME_OBJECT_COUNT)
6661 #undef ADJUST_LAST_TIME_OBJECT_COUNT 6661 #undef ADJUST_LAST_TIME_OBJECT_COUNT
6662 6662
6663 OS::MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_)); 6663 OS::MemCopy(object_counts_last_time_, object_counts_, sizeof(object_counts_));
6664 OS::MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_)); 6664 OS::MemCopy(object_sizes_last_time_, object_sizes_, sizeof(object_sizes_));
6665 ClearObjectStats(); 6665 ClearObjectStats();
6666 } 6666 }
6667 6667
6668 } } // namespace v8::internal 6668 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/global-handles.h ('k') | src/hydrogen-instructions.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698