1.1 --- a/src/cpu/x86/vm/interpreter_x86_64.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/cpu/x86/vm/interpreter_x86_64.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2003, 2011, 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 @@ -30,8 +30,8 @@
1.11 #include "interpreter/interpreterRuntime.hpp"
1.12 #include "interpreter/templateTable.hpp"
1.13 #include "oops/arrayOop.hpp"
1.14 -#include "oops/methodDataOop.hpp"
1.15 -#include "oops/methodOop.hpp"
1.16 +#include "oops/methodData.hpp"
1.17 +#include "oops/method.hpp"
1.18 #include "oops/oop.inline.hpp"
1.19 #include "prims/jvmtiExport.hpp"
1.20 #include "prims/jvmtiThreadState.hpp"
1.21 @@ -92,7 +92,7 @@
1.22 // Do Int register here
1.23 switch ( i ) {
1.24 case 0:
1.25 - __ movl(rscratch1, Address(rbx, methodOopDesc::access_flags_offset()));
1.26 + __ movl(rscratch1, Address(rbx, Method::access_flags_offset()));
1.27 __ testl(rscratch1, JVM_ACC_STATIC);
1.28 __ cmovptr(Assembler::zero, c_rarg1, Address(rsp, 0));
1.29 break;
1.30 @@ -177,7 +177,7 @@
1.31 }
1.32
1.33 // Now handle integrals. Only do c_rarg1 if not static.
1.34 - __ movl(c_rarg3, Address(rbx, methodOopDesc::access_flags_offset()));
1.35 + __ movl(c_rarg3, Address(rbx, Method::access_flags_offset()));
1.36 __ testl(c_rarg3, JVM_ACC_STATIC);
1.37 __ cmovptr(Assembler::zero, c_rarg1, Address(rsp, 0));
1.38
1.39 @@ -202,7 +202,7 @@
1.40
1.41 address InterpreterGenerator::generate_math_entry(AbstractInterpreter::MethodKind kind) {
1.42
1.43 - // rbx,: methodOop
1.44 + // rbx,: Method*
1.45 // rcx: scratrch
1.46 // r13: sender sp
1.47
1.48 @@ -303,7 +303,7 @@
1.49 // Abstract method entry
1.50 // Attempt to execute abstract method. Throw exception
1.51 address InterpreterGenerator::generate_abstract_entry(void) {
1.52 - // rbx: methodOop
1.53 + // rbx: Method*
1.54 // r13: sender SP
1.55
1.56 address entry_point = __ pc();
1.57 @@ -328,7 +328,7 @@
1.58 // Empty method, generate a very fast return.
1.59
1.60 address InterpreterGenerator::generate_empty_entry(void) {
1.61 - // rbx: methodOop
1.62 + // rbx: Method*
1.63 // r13: sender sp must set sp to this value on return
1.64
1.65 if (!UseFastEmptyMethods) {
