Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/code/nmethod.hpp	Thu May 12 19:39:58 2011 -0700
     1.2 +++ b/src/share/vm/code/nmethod.hpp	Tue May 03 10:30:34 2011 -0700
     1.3 @@ -109,7 +109,7 @@
     1.4  class nmethod : public CodeBlob {
     1.5    friend class VMStructs;
     1.6    friend class NMethodSweeper;
     1.7 -  friend class CodeCache;  // non-perm oops
     1.8 +  friend class CodeCache;  // scavengable oops
     1.9   private:
    1.10    // Shared fields for all nmethod's
    1.11    methodOop _method;
    1.12 @@ -466,17 +466,17 @@
    1.13    bool is_at_poll_return(address pc);
    1.14    bool is_at_poll_or_poll_return(address pc);
    1.15  
    1.16 -  // Non-perm oop support
    1.17 +  // Scavengable oop support
    1.18    bool  on_scavenge_root_list() const                  { return (_scavenge_root_state & 1) != 0; }
    1.19   protected:
    1.20 -  enum { npl_on_list = 0x01, npl_marked = 0x10 };
    1.21 -  void  set_on_scavenge_root_list()                    { _scavenge_root_state = npl_on_list; }
    1.22 +  enum { sl_on_list = 0x01, sl_marked = 0x10 };
    1.23 +  void  set_on_scavenge_root_list()                    { _scavenge_root_state = sl_on_list; }
    1.24    void  clear_on_scavenge_root_list()                  { _scavenge_root_state = 0; }
    1.25    // assertion-checking and pruning logic uses the bits of _scavenge_root_state
    1.26  #ifndef PRODUCT
    1.27 -  void  set_scavenge_root_marked()                     { _scavenge_root_state |= npl_marked; }
    1.28 -  void  clear_scavenge_root_marked()                   { _scavenge_root_state &= ~npl_marked; }
    1.29 -  bool  scavenge_root_not_marked()                     { return (_scavenge_root_state &~ npl_on_list) == 0; }
    1.30 +  void  set_scavenge_root_marked()                     { _scavenge_root_state |= sl_marked; }
    1.31 +  void  clear_scavenge_root_marked()                   { _scavenge_root_state &= ~sl_marked; }
    1.32 +  bool  scavenge_root_not_marked()                     { return (_scavenge_root_state &~ sl_on_list) == 0; }
    1.33    // N.B. there is no positive marked query, and we only use the not_marked query for asserts.
    1.34  #endif //PRODUCT
    1.35    nmethod* scavenge_root_link() const                  { return _scavenge_root_link; }