src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp

changeset 5628
f98f5d48f511
parent 4860
46f6f063b272
child 6198
55fb97c4c58d
     1.1 --- a/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp	Fri Aug 23 18:04:35 2013 -0700
     1.2 +++ b/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp	Wed Aug 21 13:34:45 2013 +0200
     1.3 @@ -307,7 +307,7 @@
     1.4        assert(a_byte == *start++, "should be the same code");
     1.5      }
     1.6  #endif
     1.7 -  } else if (_id == load_mirror_id) {
     1.8 +  } else if (_id == load_mirror_id || _id == load_appendix_id) {
     1.9      // produce a copy of the load mirror instruction for use by the being initialized case
    1.10  #ifdef ASSERT
    1.11      address start = __ pc();
    1.12 @@ -384,6 +384,7 @@
    1.13      case access_field_id:  target = Runtime1::entry_for(Runtime1::access_field_patching_id); break;
    1.14      case load_klass_id:    target = Runtime1::entry_for(Runtime1::load_klass_patching_id); reloc_type = relocInfo::metadata_type; break;
    1.15      case load_mirror_id:   target = Runtime1::entry_for(Runtime1::load_mirror_patching_id); reloc_type = relocInfo::oop_type; break;
    1.16 +    case load_appendix_id: target = Runtime1::entry_for(Runtime1::load_appendix_patching_id); reloc_type = relocInfo::oop_type; break;
    1.17      default: ShouldNotReachHere();
    1.18    }
    1.19    __ bind(call_patch);
    1.20 @@ -397,7 +398,7 @@
    1.21    ce->add_call_info_here(_info);
    1.22    __ br(Assembler::always, false, Assembler::pt, _patch_site_entry);
    1.23    __ delayed()->nop();
    1.24 -  if (_id == load_klass_id || _id == load_mirror_id) {
    1.25 +  if (_id == load_klass_id || _id == load_mirror_id || _id == load_appendix_id) {
    1.26      CodeSection* cs = __ code_section();
    1.27      address pc = (address)_pc_start;
    1.28      RelocIterator iter(cs, pc, pc + 1);

mercurial