src/cpu/sparc/vm/nativeInst_sparc.cpp

*** 1,7 ****
  /*
!  * Copyright 1997-2009 Sun Microsystems, Inc.  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 1997-2010 Sun Microsystems, Inc.  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.
*** 319,330 ****
    set_long_at(sethi_offset, set_data32_sethi(  long_at(sethi_offset), x));
  #endif
    set_long_at(add_offset,   set_data32_simm13( long_at(add_offset),   x));
  
    // also store the value into an oop_Relocation cell, if any
!   CodeBlob* nm = CodeCache::find_blob(instruction_address());
!   if (nm != NULL) {
      RelocIterator iter(nm, instruction_address(), next_instruction_address());
      oop* oop_addr = NULL;
      while (iter.next()) {
        if (iter.type() == relocInfo::oop_type) {
          oop_Relocation *r = iter.oop_reloc();
--- 319,332 ----
    set_long_at(sethi_offset, set_data32_sethi(  long_at(sethi_offset), x));
  #endif
    set_long_at(add_offset,   set_data32_simm13( long_at(add_offset),   x));
  
    // also store the value into an oop_Relocation cell, if any
!   CodeBlob* cb = CodeCache::find_blob(instruction_address());
!   if (cb != NULL) {
!     nmethod* nm = cb->as_nmethod_or_null();
!     assert(nm, "must be");
      RelocIterator iter(nm, instruction_address(), next_instruction_address());
      oop* oop_addr = NULL;
      while (iter.next()) {
        if (iter.type() == relocInfo::oop_type) {
          oop_Relocation *r = iter.oop_reloc();
*** 428,439 ****
    set_long_at(sethi_offset, set_data32_sethi(long_at(sethi_offset), x));
  #endif
    set_long_at(add_offset, set_data32_simm13(long_at(add_offset), x));
  
    // also store the value into an oop_Relocation cell, if any
!   CodeBlob* nm = CodeCache::find_blob(instruction_address());
!   if (nm != NULL) {
      RelocIterator iter(nm, instruction_address(), next_instruction_address());
      oop* oop_addr = NULL;
      while (iter.next()) {
        if (iter.type() == relocInfo::oop_type) {
          oop_Relocation *r = iter.oop_reloc();
--- 430,443 ----
    set_long_at(sethi_offset, set_data32_sethi(long_at(sethi_offset), x));
  #endif
    set_long_at(add_offset, set_data32_simm13(long_at(add_offset), x));
  
    // also store the value into an oop_Relocation cell, if any
!   CodeBlob* cb = CodeCache::find_blob(instruction_address());
!   if (cb != NULL) {
!     nmethod* nm = cb->as_nmethod_or_null();
!     assert(nm, "must be");
      RelocIterator iter(nm, instruction_address(), next_instruction_address());
      oop* oop_addr = NULL;
      while (iter.next()) {
        if (iter.type() == relocInfo::oop_type) {
          oop_Relocation *r = iter.oop_reloc();