src/cpu/sparc/vm/vtableStubs_sparc.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 217,233 ****
      if (is_vtable_stub) {
        // ld;ld;ld,jmp,nop
        const int basic = 5*BytesPerInstWord +
                          // shift;add for load_klass (only shift with zero heap based)
                          (UseCompressedKlassPointers ?
!                          ((Universe::narrow_klass_base() == NULL) ? BytesPerInstWord : 2*BytesPerInstWord) : 0);
        return basic + slop;
      } else {
        const int basic = (28 LP64_ONLY(+ 6)) * BytesPerInstWord +
                          // shift;add for load_klass (only shift with zero heap based)
                          (UseCompressedKlassPointers ?
!                          ((Universe::narrow_klass_base() == NULL) ? BytesPerInstWord : 2*BytesPerInstWord) : 0);
        return (basic + slop);
      }
    }
  
    // In order to tune these parameters, run the JVM with VM options
--- 217,233 ----
      if (is_vtable_stub) {
        // ld;ld;ld,jmp,nop
        const int basic = 5*BytesPerInstWord +
                          // shift;add for load_klass (only shift with zero heap based)
                          (UseCompressedKlassPointers ?
!                           MacroAssembler::instr_size_for_decode_klass_not_null() : 0);
        return basic + slop;
      } else {
        const int basic = (28 LP64_ONLY(+ 6)) * BytesPerInstWord +
                          // shift;add for load_klass (only shift with zero heap based)
                          (UseCompressedKlassPointers ?
!                           MacroAssembler::instr_size_for_decode_klass_not_null() : 0);
        return (basic + slop);
      }
    }
  
    // In order to tune these parameters, run the JVM with VM options