*** old/src/share/vm/compiler/oopMap.hpp	Thu Jul  3 10:48:00 2008
--- new/src/share/vm/compiler/oopMap.hpp	Thu Jul  3 10:48:00 2008

*** 44,54 ****
--- 44,54 ----
    void set_value(int value)                         { _value = value; }
    short _content_reg;
  
  public:
    // Constants
!   enum { type_bits                = 6,
!   enum { type_bits                = 5,
           register_bits            = BitsPerShort - type_bits };
  
    enum { type_shift               = 0,
           register_shift           = type_bits };
  

*** 61,72 ****
--- 61,71 ----
           unused_value =0,       // powers of 2, for masking OopMapStream
           oop_value = 1,
           value_value = 2,
           narrowoop_value = 4,
           callee_saved_value = 8,
!          derived_oop_value= 16,
           stack_obj = 32 };
!          derived_oop_value= 16 };
  
    // Constructors
    OopMapValue () { set_value(0); set_content_reg(VMRegImpl::Bad()); }
    OopMapValue (VMReg reg, oop_types t) { set_reg_type(reg,t); }
    OopMapValue (VMReg reg, oop_types t, VMReg reg2) { set_reg_type(reg,t); set_content_reg(reg2); }

*** 91,108 ****
--- 90,105 ----
    bool is_oop()               { return mask_bits(value(), type_mask_in_place) == oop_value; }
    bool is_value()             { return mask_bits(value(), type_mask_in_place) == value_value; }
    bool is_narrowoop()           { return mask_bits(value(), type_mask_in_place) == narrowoop_value; }
    bool is_callee_saved()      { return mask_bits(value(), type_mask_in_place) == callee_saved_value; }
    bool is_derived_oop()       { return mask_bits(value(), type_mask_in_place) == derived_oop_value; }
    bool is_stack_obj()         { return mask_bits(value(), type_mask_in_place) == stack_obj; }
  
    void set_oop()              { set_value((value() & register_mask_in_place) | oop_value); }
    void set_value()            { set_value((value() & register_mask_in_place) | value_value); }
    void set_narrowoop()          { set_value((value() & register_mask_in_place) | narrowoop_value); }
    void set_callee_saved()     { set_value((value() & register_mask_in_place) | callee_saved_value); }
    void set_derived_oop()      { set_value((value() & register_mask_in_place) | derived_oop_value); }
    void set_stack_obj()        { set_value((value() & register_mask_in_place) | stack_obj); }
  
    VMReg reg() const { return VMRegImpl::as_VMReg(mask_bits(value(), register_mask_in_place) >> register_shift); }
    oop_types type() const      { return (oop_types)mask_bits(value(), type_mask_in_place); }
  
    static bool legal_vm_reg_name(VMReg p) {

*** 178,188 ****
--- 175,184 ----
    void set_value( VMReg local);
    void set_narrowoop(VMReg local);
    void set_dead ( VMReg local);
    void set_callee_saved( VMReg local, VMReg caller_machine_register );
    void set_derived_oop ( VMReg local, VMReg derived_from_local_register );
    void set_stack_obj( VMReg local);
    void set_xxx(VMReg reg, OopMapValue::oop_types x, VMReg optional);
  
    int heap_size() const;
    void copy_to(address addr);
    OopMap* deep_copy();