1.1 --- a/src/share/vm/oops/markOop.hpp Wed Oct 03 08:08:52 2012 -0700
1.2 +++ b/src/share/vm/oops/markOop.hpp Wed Oct 03 20:31:41 2012 +0200
1.3 @@ -318,7 +318,7 @@
1.4 intptr_t tmp = (intptr_t) monitor;
1.5 return (markOop) (tmp | monitor_value);
1.6 }
1.7 - static markOop encode(JavaThread* thread, int age, int bias_epoch) {
1.8 + static markOop encode(JavaThread* thread, uint age, int bias_epoch) {
1.9 intptr_t tmp = (intptr_t) thread;
1.10 assert(UseBiasedLocking && ((tmp & (epoch_mask_in_place | age_mask_in_place | biased_lock_mask_in_place)) == 0), "misaligned JavaThread pointer");
1.11 assert(age <= max_age, "age too large");
1.12 @@ -333,10 +333,10 @@
1.13 markOop set_marked() { return markOop((value() & ~lock_mask_in_place) | marked_value); }
1.14 markOop set_unmarked() { return markOop((value() & ~lock_mask_in_place) | unlocked_value); }
1.15
1.16 - int age() const { return mask_bits(value() >> age_shift, age_mask); }
1.17 - markOop set_age(int v) const {
1.18 + uint age() const { return mask_bits(value() >> age_shift, age_mask); }
1.19 + markOop set_age(uint v) const {
1.20 assert((v & ~age_mask) == 0, "shouldn't overflow age field");
1.21 - return markOop((value() & ~age_mask_in_place) | (((intptr_t)v & age_mask) << age_shift));
1.22 + return markOop((value() & ~age_mask_in_place) | (((uintptr_t)v & age_mask) << age_shift));
1.23 }
1.24 markOop incr_age() const { return age() == max_age ? markOop(this) : set_age(age() + 1); }
1.25
