Mercurial > hg > truffle
comparison src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | f81a7c0c618d |
children |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
58 | 58 |
59 // Too risky for the 4/10/02 putback | 59 // Too risky for the 4/10/02 putback |
60 // BarrierSet::Name kind() { return BarrierSet::CardTableExtension; } | 60 // BarrierSet::Name kind() { return BarrierSet::CardTableExtension; } |
61 | 61 |
62 // Scavenge support | 62 // Scavenge support |
63 void scavenge_contents(ObjectStartArray* start_array, | |
64 MutableSpace* sp, | |
65 HeapWord* space_top, | |
66 PSPromotionManager* pm); | |
67 | |
68 void scavenge_contents_parallel(ObjectStartArray* start_array, | 63 void scavenge_contents_parallel(ObjectStartArray* start_array, |
69 MutableSpace* sp, | 64 MutableSpace* sp, |
70 HeapWord* space_top, | 65 HeapWord* space_top, |
71 PSPromotionManager* pm, | 66 PSPromotionManager* pm, |
72 uint stripe_number, | 67 uint stripe_number, |