Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/cpu/x86/vm/assembler_x86.cpp	Fri Mar 11 22:33:47 2011 -0800
     1.2 +++ b/src/cpu/x86/vm/assembler_x86.cpp	Fri Mar 11 22:34:57 2011 -0800
     1.3 @@ -7831,7 +7831,7 @@
     1.4  void MacroAssembler::check_method_handle_type(Register mtype_reg, Register mh_reg,
     1.5                                                Register temp_reg,
     1.6                                                Label& wrong_method_type) {
     1.7 -  Address type_addr(mh_reg, delayed_value(java_dyn_MethodHandle::type_offset_in_bytes, temp_reg));
     1.8 +  Address type_addr(mh_reg, delayed_value(java_lang_invoke_MethodHandle::type_offset_in_bytes, temp_reg));
     1.9    // compare method type against that of the receiver
    1.10    if (UseCompressedOops) {
    1.11      load_heap_oop(temp_reg, type_addr);
    1.12 @@ -7851,14 +7851,14 @@
    1.13                                                  Register temp_reg) {
    1.14    assert_different_registers(vmslots_reg, mh_reg, temp_reg);
    1.15    // load mh.type.form.vmslots
    1.16 -  if (java_dyn_MethodHandle::vmslots_offset_in_bytes() != 0) {
    1.17 +  if (java_lang_invoke_MethodHandle::vmslots_offset_in_bytes() != 0) {
    1.18      // hoist vmslots into every mh to avoid dependent load chain
    1.19 -    movl(vmslots_reg, Address(mh_reg, delayed_value(java_dyn_MethodHandle::vmslots_offset_in_bytes, temp_reg)));
    1.20 +    movl(vmslots_reg, Address(mh_reg, delayed_value(java_lang_invoke_MethodHandle::vmslots_offset_in_bytes, temp_reg)));
    1.21    } else {
    1.22      Register temp2_reg = vmslots_reg;
    1.23 -    load_heap_oop(temp2_reg, Address(mh_reg,    delayed_value(java_dyn_MethodHandle::type_offset_in_bytes, temp_reg)));
    1.24 -    load_heap_oop(temp2_reg, Address(temp2_reg, delayed_value(java_dyn_MethodType::form_offset_in_bytes, temp_reg)));
    1.25 -    movl(vmslots_reg, Address(temp2_reg, delayed_value(java_dyn_MethodTypeForm::vmslots_offset_in_bytes, temp_reg)));
    1.26 +    load_heap_oop(temp2_reg, Address(mh_reg,    delayed_value(java_lang_invoke_MethodHandle::type_offset_in_bytes, temp_reg)));
    1.27 +    load_heap_oop(temp2_reg, Address(temp2_reg, delayed_value(java_lang_invoke_MethodType::form_offset_in_bytes, temp_reg)));
    1.28 +    movl(vmslots_reg, Address(temp2_reg, delayed_value(java_lang_invoke_MethodTypeForm::vmslots_offset_in_bytes, temp_reg)));
    1.29    }
    1.30  }
    1.31  
    1.32 @@ -7873,7 +7873,7 @@
    1.33  
    1.34    // pick out the interpreted side of the handler
    1.35    // NOTE: vmentry is not an oop!
    1.36 -  movptr(temp_reg, Address(mh_reg, delayed_value(java_dyn_MethodHandle::vmentry_offset_in_bytes, temp_reg)));
    1.37 +  movptr(temp_reg, Address(mh_reg, delayed_value(java_lang_invoke_MethodHandle::vmentry_offset_in_bytes, temp_reg)));
    1.38  
    1.39    // off we go...
    1.40    jmp(Address(temp_reg, MethodHandleEntry::from_interpreted_entry_offset_in_bytes()));