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

     1.1 --- a/src/os/bsd/vm/os_bsd.cpp	Wed Apr 03 16:43:09 2013 -0700
     1.2 +++ b/src/os/bsd/vm/os_bsd.cpp	Thu Apr 04 10:01:26 2013 -0700
     1.3 @@ -152,7 +152,6 @@
     1.4  // utility functions
     1.5  
     1.6  static int SR_initialize();
     1.7 -static int SR_finalize();
     1.8  
     1.9  julong os::available_memory() {
    1.10    return Bsd::available_memory();
    1.11 @@ -2783,10 +2782,6 @@
    1.12    return 0;
    1.13  }
    1.14  
    1.15 -static int SR_finalize() {
    1.16 -  return 0;
    1.17 -}
    1.18 -
    1.19  
    1.20  // returns true on success and false on error - really an error is fatal
    1.21  // but this seems the normal response to library errors
    1.22 @@ -3595,16 +3590,6 @@
    1.23  ////////////////////////////////////////////////////////////////////////////////
    1.24  // debug support
    1.25  
    1.26 -static address same_page(address x, address y) {
    1.27 -  int page_bits = -os::vm_page_size();
    1.28 -  if ((intptr_t(x) & page_bits) == (intptr_t(y) & page_bits))
    1.29 -    return x;
    1.30 -  else if (x > y)
    1.31 -    return (address)(intptr_t(y) | ~page_bits) + 1;
    1.32 -  else
    1.33 -    return (address)(intptr_t(y) & page_bits);
    1.34 -}
    1.35 -
    1.36  bool os::find(address addr, outputStream* st) {
    1.37    Dl_info dlinfo;
    1.38    memset(&dlinfo, 0, sizeof(dlinfo));
    1.39 @@ -3628,8 +3613,8 @@
    1.40  
    1.41      if (Verbose) {
    1.42        // decode some bytes around the PC
    1.43 -      address begin = same_page(addr-40, addr);
    1.44 -      address end   = same_page(addr+40, addr);
    1.45 +      address begin = clamp_address_in_page(addr-40, addr, os::vm_page_size());
    1.46 +      address end   = clamp_address_in_page(addr+40, addr, os::vm_page_size());
    1.47        address       lowest = (address) dlinfo.dli_sname;
    1.48        if (!lowest)  lowest = (address) dlinfo.dli_fbase;
    1.49        if (begin < lowest)  begin = lowest;