1.1 --- a/src/share/vm/compiler/oopMap.hpp Fri Apr 11 09:56:35 2008 -0400 1.2 +++ b/src/share/vm/compiler/oopMap.hpp Sun Apr 13 17:43:42 2008 -0400 1.3 @@ -61,7 +61,7 @@ 1.4 unused_value =0, // powers of 2, for masking OopMapStream 1.5 oop_value = 1, 1.6 value_value = 2, 1.7 - dead_value = 4, 1.8 + narrowoop_value = 4, 1.9 callee_saved_value = 8, 1.10 derived_oop_value= 16, 1.11 stack_obj = 32 }; 1.12 @@ -90,14 +90,14 @@ 1.13 // Querying 1.14 bool is_oop() { return mask_bits(value(), type_mask_in_place) == oop_value; } 1.15 bool is_value() { return mask_bits(value(), type_mask_in_place) == value_value; } 1.16 - bool is_dead() { return mask_bits(value(), type_mask_in_place) == dead_value; } 1.17 + bool is_narrowoop() { return mask_bits(value(), type_mask_in_place) == narrowoop_value; } 1.18 bool is_callee_saved() { return mask_bits(value(), type_mask_in_place) == callee_saved_value; } 1.19 bool is_derived_oop() { return mask_bits(value(), type_mask_in_place) == derived_oop_value; } 1.20 bool is_stack_obj() { return mask_bits(value(), type_mask_in_place) == stack_obj; } 1.21 1.22 void set_oop() { set_value((value() & register_mask_in_place) | oop_value); } 1.23 void set_value() { set_value((value() & register_mask_in_place) | value_value); } 1.24 - void set_dead() { set_value((value() & register_mask_in_place) | dead_value); } 1.25 + void set_narrowoop() { set_value((value() & register_mask_in_place) | narrowoop_value); } 1.26 void set_callee_saved() { set_value((value() & register_mask_in_place) | callee_saved_value); } 1.27 void set_derived_oop() { set_value((value() & register_mask_in_place) | derived_oop_value); } 1.28 void set_stack_obj() { set_value((value() & register_mask_in_place) | stack_obj); } 1.29 @@ -176,6 +176,7 @@ 1.30 // slots to hold 4-byte values like ints and floats in the LP64 build. 1.31 void set_oop ( VMReg local); 1.32 void set_value( VMReg local); 1.33 + void set_narrowoop(VMReg local); 1.34 void set_dead ( VMReg local); 1.35 void set_callee_saved( VMReg local, VMReg caller_machine_register ); 1.36 void set_derived_oop ( VMReg local, VMReg derived_from_local_register ); 1.37 @@ -245,7 +246,7 @@ 1.38 static void all_do(const frame* fr, const RegisterMap* reg_map, 1.39 OopClosure* oop_fn, 1.40 void derived_oop_fn(oop* base, oop* derived), 1.41 - OopClosure* value_fn, OopClosure* dead_fn); 1.42 + OopClosure* value_fn); 1.43 1.44 // Printing 1.45 void print_on(outputStream* st) const;