comparison src/share/vm/interpreter/abstractInterpreter.hpp @ 14422:2b8e28fdf503

Merge
author kvn
date Tue, 05 Nov 2013 17:38:04 -0800
parents 6cc7093e1341 bd3237e0e18d
children d8041d695d19 0bf37f737702
comparison
equal deleted inserted replaced
14421:3068270ba476 14422:2b8e28fdf503
28 #include "code/stubs.hpp" 28 #include "code/stubs.hpp"
29 #include "interpreter/bytecodes.hpp" 29 #include "interpreter/bytecodes.hpp"
30 #include "runtime/thread.inline.hpp" 30 #include "runtime/thread.inline.hpp"
31 #include "runtime/vmThread.hpp" 31 #include "runtime/vmThread.hpp"
32 #include "utilities/top.hpp" 32 #include "utilities/top.hpp"
33 #ifdef TARGET_ARCH_MODEL_x86_32 33 #ifdef TARGET_ARCH_x86
34 # include "interp_masm_x86_32.hpp" 34 # include "interp_masm_x86.hpp"
35 #endif
36 #ifdef TARGET_ARCH_MODEL_x86_64
37 # include "interp_masm_x86_64.hpp"
38 #endif 35 #endif
39 #ifdef TARGET_ARCH_MODEL_sparc 36 #ifdef TARGET_ARCH_MODEL_sparc
40 # include "interp_masm_sparc.hpp" 37 # include "interp_masm_sparc.hpp"
41 #endif 38 #endif
42 #ifdef TARGET_ARCH_MODEL_zero 39 #ifdef TARGET_ARCH_MODEL_zero
162 static bool can_be_compiled(methodHandle m); 159 static bool can_be_compiled(methodHandle m);
163 160
164 // Runtime support 161 // Runtime support
165 162
166 // length = invoke bytecode length (to advance to next bytecode) 163 // length = invoke bytecode length (to advance to next bytecode)
167 static address deopt_entry (TosState state, int length) { ShouldNotReachHere(); return NULL; } 164 static address deopt_entry(TosState state, int length) { ShouldNotReachHere(); return NULL; }
168 static address return_entry (TosState state, int length) { ShouldNotReachHere(); return NULL; } 165 static address return_entry(TosState state, int length, Bytecodes::Code code) { ShouldNotReachHere(); return NULL; }
169 166
170 static address rethrow_exception_entry() { return _rethrow_exception_entry; } 167 static address rethrow_exception_entry() { return _rethrow_exception_entry; }
171 168
172 // Activation size in words for a method that is just being called. 169 // Activation size in words for a method that is just being called.
173 // Parameters haven't been pushed so count them too. 170 // Parameters haven't been pushed so count them too.