src/cpu/x86/vm/c1_CodeStubs_x86.cpp

changeset 5628
f98f5d48f511
parent 4860
46f6f063b272
child 6198
55fb97c4c58d
     1.1 --- a/src/cpu/x86/vm/c1_CodeStubs_x86.cpp	Fri Aug 23 18:04:35 2013 -0700
     1.2 +++ b/src/cpu/x86/vm/c1_CodeStubs_x86.cpp	Wed Aug 21 13:34:45 2013 +0200
     1.3 @@ -402,6 +402,7 @@
     1.4      case access_field_id:  target = Runtime1::entry_for(Runtime1::access_field_patching_id); break;
     1.5      case load_klass_id:    target = Runtime1::entry_for(Runtime1::load_klass_patching_id); reloc_type = relocInfo::metadata_type; break;
     1.6      case load_mirror_id:   target = Runtime1::entry_for(Runtime1::load_mirror_patching_id); reloc_type = relocInfo::oop_type; break;
     1.7 +    case load_appendix_id:      target = Runtime1::entry_for(Runtime1::load_appendix_patching_id); reloc_type = relocInfo::oop_type; break;
     1.8      default: ShouldNotReachHere();
     1.9    }
    1.10    __ bind(call_patch);
    1.11 @@ -419,7 +420,7 @@
    1.12    for (int j = __ offset() ; j < jmp_off + 5 ; j++ ) {
    1.13      __ nop();
    1.14    }
    1.15 -  if (_id == load_klass_id || _id == load_mirror_id) {
    1.16 +  if (_id == load_klass_id || _id == load_mirror_id || _id == load_appendix_id) {
    1.17      CodeSection* cs = __ code_section();
    1.18      RelocIterator iter(cs, (address)_pc_start, (address)(_pc_start + 1));
    1.19      relocInfo::change_reloc_info_for_address(&iter, (address) _pc_start, reloc_type, relocInfo::none);

mercurial