comparison src/share/vm/runtime/javaCalls.hpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents e522a00b91aa f34d701e952e
children b8f261ba79c6
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
27 27
28 #include "memory/allocation.hpp" 28 #include "memory/allocation.hpp"
29 #include "oops/method.hpp" 29 #include "oops/method.hpp"
30 #include "runtime/handles.hpp" 30 #include "runtime/handles.hpp"
31 #include "runtime/javaFrameAnchor.hpp" 31 #include "runtime/javaFrameAnchor.hpp"
32 #include "runtime/thread.inline.hpp"
32 #include "runtime/vmThread.hpp" 33 #include "runtime/vmThread.hpp"
33 #ifdef TARGET_ARCH_x86 34 #ifdef TARGET_ARCH_x86
34 # include "jniTypes_x86.hpp" 35 # include "jniTypes_x86.hpp"
35 #endif 36 #endif
36 #ifdef TARGET_ARCH_sparc 37 #ifdef TARGET_ARCH_sparc
42 #ifdef TARGET_ARCH_arm 43 #ifdef TARGET_ARCH_arm
43 # include "jniTypes_arm.hpp" 44 # include "jniTypes_arm.hpp"
44 #endif 45 #endif
45 #ifdef TARGET_ARCH_ppc 46 #ifdef TARGET_ARCH_ppc
46 # include "jniTypes_ppc.hpp" 47 # include "jniTypes_ppc.hpp"
47 #endif
48 #ifdef TARGET_OS_FAMILY_linux
49 # include "thread_linux.inline.hpp"
50 #endif
51 #ifdef TARGET_OS_FAMILY_solaris
52 # include "thread_solaris.inline.hpp"
53 #endif
54 #ifdef TARGET_OS_FAMILY_windows
55 # include "thread_windows.inline.hpp"
56 #endif
57 #ifdef TARGET_OS_FAMILY_bsd
58 # include "thread_bsd.inline.hpp"
59 #endif 48 #endif
60 49
61 // A JavaCallWrapper is constructed before each JavaCall and destructed after the call. 50 // A JavaCallWrapper is constructed before each JavaCall and destructed after the call.
62 // Its purpose is to allocate/deallocate a new handle block and to save/restore the last 51 // Its purpose is to allocate/deallocate a new handle block and to save/restore the last
63 // Java fp/sp. A pointer to the JavaCallWrapper is stored on the stack. 52 // Java fp/sp. A pointer to the JavaCallWrapper is stored on the stack.