src/hotspot/share/c1/c1_Runtime1.cpp

rev 59103 : imported patch hotspot

*** 240,250 ****
    case dtrace_object_alloc_id:
    case slow_subtype_check_id:
    case fpu2long_stub_id:
    case unwind_exception_id:
    case counter_overflow_id:
! #if defined(SPARC) || defined(PPC32)
    case handle_exception_nofpu_id:  // Unused on sparc
  #endif
      expect_oop_map = false;
      break;
    default:
--- 240,250 ----
    case dtrace_object_alloc_id:
    case slow_subtype_check_id:
    case fpu2long_stub_id:
    case unwind_exception_id:
    case counter_overflow_id:
! #if defined(PPC32)
    case handle_exception_nofpu_id:  // Unused on sparc
  #endif
      expect_oop_map = false;
      break;
    default:
*** 1131,1141 ****
            }
          } else {
            ShouldNotReachHere();
          }
  
! #if defined(SPARC) || defined(PPC32)
          if (load_klass_or_mirror_patch_id ||
              stub_id == Runtime1::load_appendix_patching_id) {
            // Update the location in the nmethod with the proper
            // metadata.  When the code was generated, a NULL was stuffed
            // in the metadata table and that table needs to be update to
--- 1131,1141 ----
            }
          } else {
            ShouldNotReachHere();
          }
  
! #if defined(PPC32)
          if (load_klass_or_mirror_patch_id ||
              stub_id == Runtime1::load_appendix_patching_id) {
            // Update the location in the nmethod with the proper
            // metadata.  When the code was generated, a NULL was stuffed
            // in the metadata table and that table needs to be update to
*** 1222,1238 ****
              // the reloc info so that it will get updated during
              // future GCs.
              RelocIterator iter(nm, (address)instr_pc, (address)(instr_pc + 1));
              relocInfo::change_reloc_info_for_address(&iter, (address) instr_pc,
                                                       relocInfo::none, rtype);
- #ifdef SPARC
-             // Sparc takes two relocations for an metadata so update the second one.
-             address instr_pc2 = instr_pc + NativeMovConstReg::add_offset;
-             RelocIterator iter2(nm, instr_pc2, instr_pc2 + 1);
-             relocInfo::change_reloc_info_for_address(&iter2, (address) instr_pc2,
-                                                      relocInfo::none, rtype);
- #endif
  #ifdef PPC32
            { address instr_pc2 = instr_pc + NativeMovConstReg::lo_offset;
              RelocIterator iter2(nm, instr_pc2, instr_pc2 + 1);
              relocInfo::change_reloc_info_for_address(&iter2, (address) instr_pc2,
                                                       relocInfo::none, rtype);
--- 1222,1231 ----