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

Side by Side Diff: src/heap.h

Issue 293363006: Merge v8globals.h and globals.h (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 7 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/globals.h ('k') | src/ia32/macro-assembler-ia32.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 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef V8_HEAP_H_ 5 #ifndef V8_HEAP_H_
6 #define V8_HEAP_H_ 6 #define V8_HEAP_H_
7 7
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "allocation.h" 10 #include "allocation.h"
11 #include "assert-scope.h" 11 #include "assert-scope.h"
12 #include "counters.h" 12 #include "counters.h"
13 #include "globals.h" 13 #include "globals.h"
14 #include "incremental-marking.h" 14 #include "incremental-marking.h"
15 #include "list.h" 15 #include "list.h"
16 #include "mark-compact.h" 16 #include "mark-compact.h"
17 #include "objects-visiting.h" 17 #include "objects-visiting.h"
18 #include "spaces.h" 18 #include "spaces.h"
19 #include "splay-tree-inl.h" 19 #include "splay-tree-inl.h"
20 #include "store-buffer.h" 20 #include "store-buffer.h"
21 #include "v8globals.h"
22 21
23 namespace v8 { 22 namespace v8 {
24 namespace internal { 23 namespace internal {
25 24
26 // Defines all the roots in Heap. 25 // Defines all the roots in Heap.
27 #define STRONG_ROOT_LIST(V) \ 26 #define STRONG_ROOT_LIST(V) \
28 V(Map, byte_array_map, ByteArrayMap) \ 27 V(Map, byte_array_map, ByteArrayMap) \
29 V(Map, free_space_map, FreeSpaceMap) \ 28 V(Map, free_space_map, FreeSpaceMap) \
30 V(Map, one_pointer_filler_map, OnePointerFillerMap) \ 29 V(Map, one_pointer_filler_map, OnePointerFillerMap) \
31 V(Map, two_pointer_filler_map, TwoPointerFillerMap) \ 30 V(Map, two_pointer_filler_map, TwoPointerFillerMap) \
(...skipping 2801 matching lines...) Expand 10 before | Expand all | Expand 10 after
2833 DisallowHeapAllocation no_allocation; // i.e. no gc allowed. 2832 DisallowHeapAllocation no_allocation; // i.e. no gc allowed.
2834 2833
2835 private: 2834 private:
2836 DISALLOW_IMPLICIT_CONSTRUCTORS(PathTracer); 2835 DISALLOW_IMPLICIT_CONSTRUCTORS(PathTracer);
2837 }; 2836 };
2838 #endif // DEBUG 2837 #endif // DEBUG
2839 2838
2840 } } // namespace v8::internal 2839 } } // namespace v8::internal
2841 2840
2842 #endif // V8_HEAP_H_ 2841 #endif // V8_HEAP_H_
OLDNEW
« no previous file with comments | « src/globals.h ('k') | src/ia32/macro-assembler-ia32.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698