1.1 --- a/src/share/vm/interpreter/interpreterRuntime.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/interpreter/interpreterRuntime.hpp 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 @@ -28,7 +28,7 @@
1.11 #include "interpreter/bytecode.hpp"
1.12 #include "interpreter/linkResolver.hpp"
1.13 #include "memory/universe.hpp"
1.14 -#include "oops/methodOop.hpp"
1.15 +#include "oops/method.hpp"
1.16 #include "runtime/frame.inline.hpp"
1.17 #include "runtime/signature.hpp"
1.18 #include "utilities/top.hpp"
1.19 @@ -55,7 +55,7 @@
1.20 private:
1.21 // Helper functions to access current interpreter state
1.22 static frame last_frame(JavaThread *thread) { return thread->last_frame(); }
1.23 - static methodOop method(JavaThread *thread) { return last_frame(thread).interpreter_frame_method(); }
1.24 + static Method* method(JavaThread *thread) { return last_frame(thread).interpreter_frame_method(); }
1.25 static address bcp(JavaThread *thread) { return last_frame(thread).interpreter_frame_bcp(); }
1.26 static int bci(JavaThread *thread) { return last_frame(thread).interpreter_frame_bci(); }
1.27 static void set_bcp_and_mdp(address bcp, JavaThread*thread);
1.28 @@ -88,9 +88,9 @@
1.29 static void resolve_ldc (JavaThread* thread, Bytecodes::Code bytecode);
1.30
1.31 // Allocation
1.32 - static void _new (JavaThread* thread, constantPoolOopDesc* pool, int index);
1.33 + static void _new (JavaThread* thread, ConstantPool* pool, int index);
1.34 static void newarray (JavaThread* thread, BasicType type, jint size);
1.35 - static void anewarray (JavaThread* thread, constantPoolOopDesc* pool, int index, jint size);
1.36 + static void anewarray (JavaThread* thread, ConstantPool* pool, int index, jint size);
1.37 static void multianewarray(JavaThread* thread, jint* first_size_address);
1.38 static void register_finalizer(JavaThread* thread, oopDesc* obj);
1.39
1.40 @@ -124,9 +124,9 @@
1.41 static void resolve_invokedynamic(JavaThread* thread);
1.42
1.43 // Breakpoints
1.44 - static void _breakpoint(JavaThread* thread, methodOopDesc* method, address bcp);
1.45 - static Bytecodes::Code get_original_bytecode_at(JavaThread* thread, methodOopDesc* method, address bcp);
1.46 - static void set_original_bytecode_at(JavaThread* thread, methodOopDesc* method, address bcp, Bytecodes::Code new_code);
1.47 + static void _breakpoint(JavaThread* thread, Method* method, address bcp);
1.48 + static Bytecodes::Code get_original_bytecode_at(JavaThread* thread, Method* method, address bcp);
1.49 + static void set_original_bytecode_at(JavaThread* thread, Method* method, address bcp, Bytecodes::Code new_code);
1.50 static bool is_breakpoint(JavaThread *thread) { return Bytecodes::code_or_bp_at(bcp(thread)) == Bytecodes::_breakpoint; }
1.51
1.52 // Safepoints
1.53 @@ -142,9 +142,9 @@
1.54 static int interpreter_contains(address pc);
1.55
1.56 // Native signature handlers
1.57 - static void prepare_native_call(JavaThread* thread, methodOopDesc* method);
1.58 + static void prepare_native_call(JavaThread* thread, Method* method);
1.59 static address slow_signature_handler(JavaThread* thread,
1.60 - methodOopDesc* method,
1.61 + Method* method,
1.62 intptr_t* from, intptr_t* to);
1.63
1.64 #if defined(IA32) || defined(AMD64) || defined(ARM)
1.65 @@ -174,11 +174,11 @@
1.66 static nmethod* frequency_counter_overflow(JavaThread* thread, address branch_bcp);
1.67
1.68 // Interpreter profiling support
1.69 - static jint bcp_to_di(methodOopDesc* method, address cur_bcp);
1.70 + static jint bcp_to_di(Method* method, address cur_bcp);
1.71 static void profile_method(JavaThread* thread);
1.72 static void update_mdp_for_ret(JavaThread* thread, int bci);
1.73 #ifdef ASSERT
1.74 - static void verify_mdp(methodOopDesc* method, address bcp, address mdp);
1.75 + static void verify_mdp(Method* method, address bcp, address mdp);
1.76 #endif // ASSERT
1.77 };
1.78
