1.1 --- a/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 04:07:20 2011 -0700
1.2 +++ b/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 08:17:15 2011 -0700
1.3 @@ -72,9 +72,9 @@
1.4 }
1.5 };
1.6
1.7 -// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
1.8 -// macros. These macros are used to guard entry points into the VM and
1.9 -// perform checks upon leave of the VM.
1.10 +// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
1.11 +// VM_ENTRY_BASE macros. These macros are used to guard entry points into
1.12 +// the VM and perform checks upon leave of the VM.
1.13
1.14
1.15 class InterfaceSupport: AllStatic {
1.16 @@ -433,7 +433,7 @@
1.17
1.18 // LEAF routines do not lock, GC or throw exceptions
1.19
1.20 -#define __LEAF(result_type, header) \
1.21 +#define VM_LEAF_BASE(result_type, header) \
1.22 TRACE_CALL(result_type, header) \
1.23 debug_only(NoHandleMark __hm;) \
1.24 /* begin of body */
1.25 @@ -441,7 +441,7 @@
1.26
1.27 // ENTRY routines may lock, GC and throw exceptions
1.28
1.29 -#define __ENTRY(result_type, header, thread) \
1.30 +#define VM_ENTRY_BASE(result_type, header, thread) \
1.31 TRACE_CALL(result_type, header) \
1.32 HandleMarkCleaner __hm(thread); \
1.33 Thread* THREAD = thread; \
1.34 @@ -450,7 +450,7 @@
1.35
1.36 // QUICK_ENTRY routines behave like ENTRY but without a handle mark
1.37
1.38 -#define __QUICK_ENTRY(result_type, header, thread) \
1.39 +#define VM_QUICK_ENTRY_BASE(result_type, header, thread) \
1.40 TRACE_CALL(result_type, header) \
1.41 debug_only(NoHandleMark __hm;) \
1.42 Thread* THREAD = thread; \
1.43 @@ -463,20 +463,20 @@
1.44 #define IRT_ENTRY(result_type, header) \
1.45 result_type header { \
1.46 ThreadInVMfromJava __tiv(thread); \
1.47 - __ENTRY(result_type, header, thread) \
1.48 + VM_ENTRY_BASE(result_type, header, thread) \
1.49 debug_only(VMEntryWrapper __vew;)
1.50
1.51
1.52 #define IRT_LEAF(result_type, header) \
1.53 result_type header { \
1.54 - __LEAF(result_type, header) \
1.55 + VM_LEAF_BASE(result_type, header) \
1.56 debug_only(No_Safepoint_Verifier __nspv(true);)
1.57
1.58
1.59 #define IRT_ENTRY_NO_ASYNC(result_type, header) \
1.60 result_type header { \
1.61 ThreadInVMfromJavaNoAsyncException __tiv(thread); \
1.62 - __ENTRY(result_type, header, thread) \
1.63 + VM_ENTRY_BASE(result_type, header, thread) \
1.64 debug_only(VMEntryWrapper __vew;)
1.65
1.66 // Another special case for nmethod_entry_point so the nmethod that the
1.67 @@ -487,7 +487,7 @@
1.68 result_type header { \
1.69 nmethodLocker _nmlock(nm); \
1.70 ThreadInVMfromJavaNoAsyncException __tiv(thread); \
1.71 - __ENTRY(result_type, header, thread)
1.72 + VM_ENTRY_BASE(result_type, header, thread)
1.73
1.74 #define IRT_END }
1.75
1.76 @@ -497,20 +497,20 @@
1.77 #define JRT_ENTRY(result_type, header) \
1.78 result_type header { \
1.79 ThreadInVMfromJava __tiv(thread); \
1.80 - __ENTRY(result_type, header, thread) \
1.81 + VM_ENTRY_BASE(result_type, header, thread) \
1.82 debug_only(VMEntryWrapper __vew;)
1.83
1.84
1.85 #define JRT_LEAF(result_type, header) \
1.86 result_type header { \
1.87 - __LEAF(result_type, header) \
1.88 + VM_LEAF_BASE(result_type, header) \
1.89 debug_only(JRT_Leaf_Verifier __jlv;)
1.90
1.91
1.92 #define JRT_ENTRY_NO_ASYNC(result_type, header) \
1.93 result_type header { \
1.94 ThreadInVMfromJavaNoAsyncException __tiv(thread); \
1.95 - __ENTRY(result_type, header, thread) \
1.96 + VM_ENTRY_BASE(result_type, header, thread) \
1.97 debug_only(VMEntryWrapper __vew;)
1.98
1.99 // Same as JRT Entry but allows for return value after the safepoint
1.100 @@ -543,11 +543,11 @@
1.101 assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
1.102 ThreadInVMfromNative __tiv(thread); \
1.103 debug_only(VMNativeEntryWrapper __vew;) \
1.104 - __ENTRY(result_type, header, thread)
1.105 + VM_ENTRY_BASE(result_type, header, thread)
1.106
1.107
1.108 // Ensure that the VMNativeEntryWrapper constructor, which can cause
1.109 -// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
1.110 +// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
1.111 #define JNI_QUICK_ENTRY(result_type, header) \
1.112 extern "C" { \
1.113 result_type JNICALL header { \
1.114 @@ -555,7 +555,7 @@
1.115 assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
1.116 ThreadInVMfromNative __tiv(thread); \
1.117 debug_only(VMNativeEntryWrapper __vew;) \
1.118 - __QUICK_ENTRY(result_type, header, thread)
1.119 + VM_QUICK_ENTRY_BASE(result_type, header, thread)
1.120
1.121
1.122 #define JNI_LEAF(result_type, header) \
1.123 @@ -563,7 +563,7 @@
1.124 result_type JNICALL header { \
1.125 JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
1.126 assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
1.127 - __LEAF(result_type, header)
1.128 + VM_LEAF_BASE(result_type, header)
1.129
1.130
1.131 // Close the routine and the extern "C"
1.132 @@ -579,7 +579,7 @@
1.133 JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
1.134 ThreadInVMfromNative __tiv(thread); \
1.135 debug_only(VMNativeEntryWrapper __vew;) \
1.136 - __ENTRY(result_type, header, thread)
1.137 + VM_ENTRY_BASE(result_type, header, thread)
1.138
1.139
1.140 #define JVM_ENTRY_NO_ENV(result_type, header) \
1.141 @@ -588,7 +588,7 @@
1.142 JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \
1.143 ThreadInVMfromNative __tiv(thread); \
1.144 debug_only(VMNativeEntryWrapper __vew;) \
1.145 - __ENTRY(result_type, header, thread)
1.146 + VM_ENTRY_BASE(result_type, header, thread)
1.147
1.148
1.149 #define JVM_QUICK_ENTRY(result_type, header) \
1.150 @@ -597,14 +597,14 @@
1.151 JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
1.152 ThreadInVMfromNative __tiv(thread); \
1.153 debug_only(VMNativeEntryWrapper __vew;) \
1.154 - __QUICK_ENTRY(result_type, header, thread)
1.155 + VM_QUICK_ENTRY_BASE(result_type, header, thread)
1.156
1.157
1.158 #define JVM_LEAF(result_type, header) \
1.159 extern "C" { \
1.160 result_type JNICALL header { \
1.161 VM_Exit::block_if_vm_exited(); \
1.162 - __LEAF(result_type, header)
1.163 + VM_LEAF_BASE(result_type, header)
1.164
1.165
1.166 #define JVM_END } }
