src/share/vm/oops/valueKlass.hpp

*** 34,52 ****
  
  class ValueKlass: public InstanceKlass {
    friend class VMStructs;
    friend class InstanceKlass;
  
! private:
  
    // Constructor
    ValueKlass(const ClassFileParser& parser)
      : InstanceKlass(parser, InstanceKlass::_misc_kind_value_type) {
      set_has_vcc_klass();
    }
  
    // static Klass* array_klass_impl(InstanceKlass* this_k, bool or_null, int n, TRAPS);
   protected:
    // Returns the array class for the n'th dimension
    Klass* array_klass_impl(bool or_null, int n, TRAPS);
  
    // Returns the array class with this class as element type
--- 34,88 ----
  
  class ValueKlass: public InstanceKlass {
    friend class VMStructs;
    friend class InstanceKlass;
  
!  private:
  
    // Constructor
    ValueKlass(const ClassFileParser& parser)
      : InstanceKlass(parser, InstanceKlass::_misc_kind_value_type) {
      set_has_vcc_klass();
    }
  
+   address adr_extended_sig() const {
+     address adr_vcc = adr_vcc_klass();
+     if (adr_vcc == NULL) {
+       address adr_jf = adr_value_fields_klasses();
+       if (adr_jf != NULL) {
+         return adr_jf + this->java_fields_count() * sizeof(Klass*);
+       }
+ 
+       address adr_fing = adr_fingerprint();
+       if (adr_fing != NULL) {
+         return adr_fingerprint() + sizeof(u8);
+       }
+ 
+       InstanceKlass** adr_host = adr_host_klass();
+       if (adr_host != NULL) {
+         return (address)(adr_host + 1);
+       }
+ 
+       Klass** adr_impl = adr_implementor();
+       if (adr_impl != NULL) {
+         return (address)(adr_impl + 1);
+       }
+ 
+       return (address)end_of_nonstatic_oop_maps();
+     } else {
+       return adr_vcc + sizeof(Klass*);
+     }
+   }
+ 
+   address adr_return_regs() const {
+     return adr_extended_sig() + sizeof(intptr_t);
+   }
+ 
    // static Klass* array_klass_impl(InstanceKlass* this_k, bool or_null, int n, TRAPS);
+ 
+   GrowableArray<SigEntry> collect_fields(int base_off = 0) const;
+ 
   protected:
    // Returns the array class for the n'th dimension
    Klass* array_klass_impl(bool or_null, int n, TRAPS);
  
    // Returns the array class with this class as element type
*** 143,157 ****
  
    template <bool nv, typename T, class OopClosureType>
    inline void oop_iterate_specialized_bounded(const address oop_addr, OopClosureType* closure, void* lo, void* hi);
  
    // calling convention support
!   GrowableArray<SigEntry> collect_fields(int base_off = 0) const;
!   GrowableArray<SigEntry> return_convention(VMRegPair*& regs, int& nb_fields) const;
!   void save_oop_fields(const GrowableArray<SigEntry>& sig_vk, RegisterMap& map, const VMRegPair* regs, GrowableArray<Handle>& handles, int nb_fields) const;
    bool save_oop_results(RegisterMap& map, GrowableArray<Handle>& handles) const;
    void restore_oop_results(RegisterMap& map, GrowableArray<Handle>& handles) const;
!   oop realloc_result(const GrowableArray<SigEntry>& sig_vk, const RegisterMap& reg_map, const VMRegPair* regs, const GrowableArray<Handle>& handles, int nb_fields, TRAPS);
    static ValueKlass* returned_value_type(const RegisterMap& reg_map);
  };
  
  #endif /* SHARE_VM_OOPS_VALUEKLASS_HPP */
--- 179,200 ----
  
    template <bool nv, typename T, class OopClosureType>
    inline void oop_iterate_specialized_bounded(const address oop_addr, OopClosureType* closure, void* lo, void* hi);
  
    // calling convention support
!   void initialize_calling_convention();
!   const Array<SigEntry>* extended_sig() const {
!     assert(this != SystemDictionary::___Value_klass(), "make no sense for __Value");
!     return *((Array<SigEntry>**)adr_extended_sig());
!   }
!   const Array<VMRegPair>* return_regs() const {
!     assert(this != SystemDictionary::___Value_klass(), "make no sense for __Value");
!     return *((Array<VMRegPair>**)adr_return_regs());
!   }
!   void save_oop_fields(const RegisterMap& map, GrowableArray<Handle>& handles) const;
    bool save_oop_results(RegisterMap& map, GrowableArray<Handle>& handles) const;
    void restore_oop_results(RegisterMap& map, GrowableArray<Handle>& handles) const;
!   oop realloc_result(const RegisterMap& reg_map, const GrowableArray<Handle>& handles, TRAPS);
    static ValueKlass* returned_value_type(const RegisterMap& reg_map);
  };
  
  #endif /* SHARE_VM_OOPS_VALUEKLASS_HPP */