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

     1.1 --- a/src/cpu/x86/vm/vtableStubs_x86_64.cpp	Fri Aug 31 16:39:35 2012 -0700
     1.2 +++ b/src/cpu/x86/vm/vtableStubs_x86_64.cpp	Sat Sep 01 13:25:18 2012 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -73,7 +73,7 @@
    1.11    if (DebugVtables) {
    1.12      Label L;
    1.13      // check offset vs vtable length
    1.14 -    __ cmpl(Address(rax, instanceKlass::vtable_length_offset() * wordSize),
    1.15 +    __ cmpl(Address(rax, InstanceKlass::vtable_length_offset() * wordSize),
    1.16              vtable_index * vtableEntry::size());
    1.17      __ jcc(Assembler::greater, L);
    1.18      __ movl(rbx, vtable_index);
    1.19 @@ -83,7 +83,7 @@
    1.20    }
    1.21  #endif // PRODUCT
    1.22  
    1.23 -  // load methodOop and target address
    1.24 +  // load Method* and target address
    1.25    const Register method = rbx;
    1.26  
    1.27    __ lookup_virtual_method(rax, vtable_index, method);
    1.28 @@ -92,16 +92,16 @@
    1.29      Label L;
    1.30      __ cmpptr(method, (int32_t)NULL_WORD);
    1.31      __ jcc(Assembler::equal, L);
    1.32 -    __ cmpptr(Address(method, methodOopDesc::from_compiled_offset()), (int32_t)NULL_WORD);
    1.33 +    __ cmpptr(Address(method, Method::from_compiled_offset()), (int32_t)NULL_WORD);
    1.34      __ jcc(Assembler::notZero, L);
    1.35      __ stop("Vtable entry is NULL");
    1.36      __ bind(L);
    1.37    }
    1.38    // rax: receiver klass
    1.39 -  // rbx: methodOop
    1.40 +  // rbx: Method*
    1.41    // rcx: receiver
    1.42    address ame_addr = __ pc();
    1.43 -  __ jmp( Address(rbx, methodOopDesc::from_compiled_offset()));
    1.44 +  __ jmp( Address(rbx, Method::from_compiled_offset()));
    1.45  
    1.46    __ flush();
    1.47  
    1.48 @@ -161,14 +161,14 @@
    1.49    const Register method = rbx;
    1.50    Label throw_icce;
    1.51  
    1.52 -  // Get methodOop and entrypoint for compiler
    1.53 +  // Get Method* and entrypoint for compiler
    1.54    __ lookup_interface_method(// inputs: rec. class, interface, itable index
    1.55                               r10, rax, itable_index,
    1.56                               // outputs: method, scan temp. reg
    1.57                               method, r11,
    1.58                               throw_icce);
    1.59  
    1.60 -  // method (rbx): methodOop
    1.61 +  // method (rbx): Method*
    1.62    // j_rarg0: receiver
    1.63  
    1.64  #ifdef ASSERT
    1.65 @@ -176,17 +176,17 @@
    1.66      Label L2;
    1.67      __ cmpptr(method, (int32_t)NULL_WORD);
    1.68      __ jcc(Assembler::equal, L2);
    1.69 -    __ cmpptr(Address(method, methodOopDesc::from_compiled_offset()), (int32_t)NULL_WORD);
    1.70 +    __ cmpptr(Address(method, Method::from_compiled_offset()), (int32_t)NULL_WORD);
    1.71      __ jcc(Assembler::notZero, L2);
    1.72      __ stop("compiler entrypoint is null");
    1.73      __ bind(L2);
    1.74    }
    1.75  #endif // ASSERT
    1.76  
    1.77 -  // rbx: methodOop
    1.78 +  // rbx: Method*
    1.79    // j_rarg0: receiver
    1.80    address ame_addr = __ pc();
    1.81 -  __ jmp(Address(method, methodOopDesc::from_compiled_offset()));
    1.82 +  __ jmp(Address(method, Method::from_compiled_offset()));
    1.83  
    1.84    __ bind(throw_icce);
    1.85    __ jump(RuntimeAddress(StubRoutines::throw_IncompatibleClassChangeError_entry()));