1.1 --- a/src/cpu/x86/vm/interpreter_x86_32.cpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/cpu/x86/vm/interpreter_x86_32.cpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 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 @@ -76,7 +76,7 @@
1.22
1.23 address InterpreterGenerator::generate_empty_entry(void) {
1.24
1.25 - // rbx,: methodOop
1.26 + // rbx,: Method*
1.27 // rcx: receiver (unused)
1.28 // rsi: previous interpreter state (C++ interpreter) must preserve
1.29 // rsi: sender sp must set sp to this value on return
1.30 @@ -107,7 +107,7 @@
1.31
1.32 address InterpreterGenerator::generate_math_entry(AbstractInterpreter::MethodKind kind) {
1.33
1.34 - // rbx,: methodOop
1.35 + // rbx,: Method*
1.36 // rcx: scratrch
1.37 // rsi: sender sp
1.38
1.39 @@ -219,7 +219,7 @@
1.40 // Attempt to execute abstract method. Throw exception
1.41 address InterpreterGenerator::generate_abstract_entry(void) {
1.42
1.43 - // rbx,: methodOop
1.44 + // rbx,: Method*
1.45 // rcx: receiver (unused)
1.46 // rsi: previous interpreter state (C++ interpreter) must preserve
1.47
