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

     1.1 --- a/src/share/vm/code/nmethod.hpp	Mon Aug 23 09:09:36 2010 -0700
     1.2 +++ b/src/share/vm/code/nmethod.hpp	Wed Aug 25 05:27:54 2010 -0700
     1.3 @@ -312,7 +312,7 @@
     1.4                                       int frame_size);
     1.5  
     1.6    int trap_offset() const      { return _trap_offset; }
     1.7 -  address trap_address() const { return code_begin() + _trap_offset; }
     1.8 +  address trap_address() const { return insts_begin() + _trap_offset; }
     1.9  
    1.10  #endif // def HAVE_DTRACE_H
    1.11  
    1.12 @@ -336,8 +336,8 @@
    1.13    bool is_compiled_by_shark() const;
    1.14  
    1.15    // boundaries for different parts
    1.16 -  address code_begin            () const          { return _entry_point; }
    1.17 -  address code_end              () const          { return           header_begin() + _stub_offset          ; }
    1.18 +  address insts_begin           () const          { return code_begin(); }
    1.19 +  address insts_end             () const          { return           header_begin() + _stub_offset          ; }
    1.20    address exception_begin       () const          { return           header_begin() + _exception_offset     ; }
    1.21    address deopt_handler_begin   () const          { return           header_begin() + _deoptimize_offset    ; }
    1.22    address deopt_mh_handler_begin() const          { return           header_begin() + _deoptimize_mh_offset ; }
    1.23 @@ -361,7 +361,7 @@
    1.24    address nul_chk_table_end     () const          { return           header_begin() + _nmethod_end_offset   ; }
    1.25  
    1.26    // Sizes
    1.27 -  int code_size         () const                  { return            code_end         () -            code_begin         (); }
    1.28 +  int insts_size        () const                  { return            insts_end        () -            insts_begin        (); }
    1.29    int stub_size         () const                  { return            stub_end         () -            stub_begin         (); }
    1.30    int consts_size       () const                  { return            consts_end       () -            consts_begin       (); }
    1.31    int oops_size         () const                  { return (address)  oops_end         () - (address)  oops_begin         (); }
    1.32 @@ -374,7 +374,7 @@
    1.33    int total_size        () const;
    1.34  
    1.35    // Containment
    1.36 -  bool code_contains         (address addr) const { return code_begin         () <= addr && addr < code_end         (); }
    1.37 +  bool insts_contains        (address addr) const { return insts_begin        () <= addr && addr < insts_end        (); }
    1.38    bool stub_contains         (address addr) const { return stub_begin         () <= addr && addr < stub_end         (); }
    1.39    bool consts_contains       (address addr) const { return consts_begin       () <= addr && addr < consts_end       (); }
    1.40    bool oops_contains         (oop*    addr) const { return oops_begin         () <= addr && addr < oops_end         (); }
    1.41 @@ -506,7 +506,7 @@
    1.42    void clear_inline_caches();
    1.43    void cleanup_inline_caches();
    1.44    bool inlinecache_check_contains(address addr) const {
    1.45 -    return (addr >= instructions_begin() && addr < verified_entry_point());
    1.46 +    return (addr >= code_begin() && addr < verified_entry_point());
    1.47    }
    1.48  
    1.49    // unlink and deallocate this nmethod
    1.50 @@ -559,7 +559,7 @@
    1.51  
    1.52    PcDesc* find_pc_desc(address pc, bool approximate) {
    1.53      PcDesc* desc = _pc_desc_cache.last_pc_desc();
    1.54 -    if (desc != NULL && desc->pc_offset() == pc - instructions_begin()) {
    1.55 +    if (desc != NULL && desc->pc_offset() == pc - code_begin()) {
    1.56        return desc;
    1.57      }
    1.58      return find_pc_desc_internal(pc, approximate);