1.1 --- a/src/share/vm/gc_implementation/g1/heapRegion.hpp Wed Apr 11 16:18:45 2012 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegion.hpp Wed Apr 18 07:21:15 2012 -0400
1.3 @@ -52,12 +52,15 @@
1.4 class HeapRegion;
1.5 class HeapRegionSetBase;
1.6
1.7 -#define HR_FORMAT SIZE_FORMAT":(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
1.8 +#define HR_FORMAT "%u:(%s)["PTR_FORMAT","PTR_FORMAT","PTR_FORMAT"]"
1.9 #define HR_FORMAT_PARAMS(_hr_) \
1.10 (_hr_)->hrs_index(), \
1.11 (_hr_)->is_survivor() ? "S" : (_hr_)->is_young() ? "E" : "-", \
1.12 (_hr_)->bottom(), (_hr_)->top(), (_hr_)->end()
1.13
1.14 +// sentinel value for hrs_index
1.15 +#define G1_NULL_HRS_INDEX ((uint) -1)
1.16 +
1.17 // A dirty card to oop closure for heap regions. It
1.18 // knows how to get the G1 heap and how to use the bitmap
1.19 // in the concurrent marker used by G1 to filter remembered
1.20 @@ -235,7 +238,7 @@
1.21
1.22 protected:
1.23 // The index of this region in the heap region sequence.
1.24 - size_t _hrs_index;
1.25 + uint _hrs_index;
1.26
1.27 HumongousType _humongous_type;
1.28 // For a humongous region, region in which it starts.
1.29 @@ -342,7 +345,7 @@
1.30
1.31 public:
1.32 // If "is_zeroed" is "true", the region "mr" can be assumed to contain zeros.
1.33 - HeapRegion(size_t hrs_index,
1.34 + HeapRegion(uint hrs_index,
1.35 G1BlockOffsetSharedArray* sharedOffsetArray,
1.36 MemRegion mr, bool is_zeroed);
1.37
1.38 @@ -389,7 +392,7 @@
1.39
1.40 // If this region is a member of a HeapRegionSeq, the index in that
1.41 // sequence, otherwise -1.
1.42 - size_t hrs_index() const { return _hrs_index; }
1.43 + uint hrs_index() const { return _hrs_index; }
1.44
1.45 // The number of bytes marked live in the region in the last marking phase.
1.46 size_t marked_bytes() { return _prev_marked_bytes; }
