1.1 --- a/src/share/vm/compiler/oopMap.hpp Fri Jul 11 01:14:44 2008 -0700 1.2 +++ b/src/share/vm/compiler/oopMap.hpp Fri Jul 11 12:19:29 2008 -0700 1.3 @@ -46,7 +46,7 @@ 1.4 1.5 public: 1.6 // Constants 1.7 - enum { type_bits = 6, 1.8 + enum { type_bits = 5, 1.9 register_bits = BitsPerShort - type_bits }; 1.10 1.11 enum { type_shift = 0, 1.12 @@ -63,8 +63,7 @@ 1.13 value_value = 2, 1.14 narrowoop_value = 4, 1.15 callee_saved_value = 8, 1.16 - derived_oop_value= 16, 1.17 - stack_obj = 32 }; 1.18 + derived_oop_value= 16 }; 1.19 1.20 // Constructors 1.21 OopMapValue () { set_value(0); set_content_reg(VMRegImpl::Bad()); } 1.22 @@ -93,14 +92,12 @@ 1.23 bool is_narrowoop() { return mask_bits(value(), type_mask_in_place) == narrowoop_value; } 1.24 bool is_callee_saved() { return mask_bits(value(), type_mask_in_place) == callee_saved_value; } 1.25 bool is_derived_oop() { return mask_bits(value(), type_mask_in_place) == derived_oop_value; } 1.26 - bool is_stack_obj() { return mask_bits(value(), type_mask_in_place) == stack_obj; } 1.27 1.28 void set_oop() { set_value((value() & register_mask_in_place) | oop_value); } 1.29 void set_value() { set_value((value() & register_mask_in_place) | value_value); } 1.30 void set_narrowoop() { set_value((value() & register_mask_in_place) | narrowoop_value); } 1.31 void set_callee_saved() { set_value((value() & register_mask_in_place) | callee_saved_value); } 1.32 void set_derived_oop() { set_value((value() & register_mask_in_place) | derived_oop_value); } 1.33 - void set_stack_obj() { set_value((value() & register_mask_in_place) | stack_obj); } 1.34 1.35 VMReg reg() const { return VMRegImpl::as_VMReg(mask_bits(value(), register_mask_in_place) >> register_shift); } 1.36 oop_types type() const { return (oop_types)mask_bits(value(), type_mask_in_place); } 1.37 @@ -180,7 +177,6 @@ 1.38 void set_dead ( VMReg local); 1.39 void set_callee_saved( VMReg local, VMReg caller_machine_register ); 1.40 void set_derived_oop ( VMReg local, VMReg derived_from_local_register ); 1.41 - void set_stack_obj( VMReg local); 1.42 void set_xxx(VMReg reg, OopMapValue::oop_types x, VMReg optional); 1.43 1.44 int heap_size() const;