Mercurial > hg > graal-compiler
comparison src/share/vm/graal/graalRuntime.hpp @ 21527:07b088d61d5d
added HotSpotJVMCIRuntime* classes, replaced references to HotSpotGraalRuntime in VM with HotSpotJVMCIRuntime (JBS:GRAAL-53)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 22 May 2015 23:26:20 +0200 |
parents | 923c37b10fb4 |
children |
comparison
equal
deleted
inserted
replaced
21526:1da7aef31a08 | 21527:07b088d61d5d |
---|---|
29 #include "runtime/deoptimization.hpp" | 29 #include "runtime/deoptimization.hpp" |
30 | 30 |
31 class GraalRuntime: public CHeapObj<mtCompiler> { | 31 class GraalRuntime: public CHeapObj<mtCompiler> { |
32 private: | 32 private: |
33 | 33 |
34 static jobject _HotSpotGraalRuntime_instance; | 34 static jobject _HotSpotJVMCIRuntime_instance; |
35 static bool _HotSpotGraalRuntime_initialized; | 35 static bool _HotSpotJVMCIRuntime_initialized; |
36 static const char* _generated_sources_sha1; | 36 static const char* _generated_sources_sha1; |
37 | 37 |
38 static bool _shutdown_called; | 38 static bool _shutdown_called; |
39 | 39 |
40 /** | 40 /** |
131 */ | 131 */ |
132 static void ensure_graal_class_loader_is_initialized(); | 132 static void ensure_graal_class_loader_is_initialized(); |
133 | 133 |
134 static void initialize_natives(JNIEnv *env, jclass c2vmClass); | 134 static void initialize_natives(JNIEnv *env, jclass c2vmClass); |
135 | 135 |
136 static bool is_HotSpotGraalRuntime_initialized() { return _HotSpotGraalRuntime_initialized; } | 136 static bool is_HotSpotJVMCIRuntime_initialized() { return _HotSpotJVMCIRuntime_initialized; } |
137 | 137 |
138 /** | 138 /** |
139 * Gets the singleton HotSpotGraalRuntime instance, initializing it if necessary | 139 * Gets the singleton HotSpotJVMCIRuntime instance, initializing it if necessary |
140 */ | 140 */ |
141 static Handle get_HotSpotGraalRuntime() { | 141 static Handle get_HotSpotJVMCIRuntime() { |
142 initialize_Graal(); | 142 initialize_JVMCI(); |
143 return Handle(JNIHandles::resolve_non_null(_HotSpotGraalRuntime_instance)); | 143 return Handle(JNIHandles::resolve_non_null(_HotSpotJVMCIRuntime_instance)); |
144 } | 144 } |
145 | 145 |
146 static jobject get_HotSpotGraalRuntime_jobject() { | 146 static jobject get_HotSpotJVMCIRuntime_jobject() { |
147 initialize_Graal(); | 147 initialize_JVMCI(); |
148 assert(_HotSpotGraalRuntime_initialized, "must be"); | 148 assert(_HotSpotJVMCIRuntime_initialized, "must be"); |
149 return _HotSpotGraalRuntime_instance; | 149 return _HotSpotJVMCIRuntime_instance; |
150 } | 150 } |
151 | 151 |
152 static Handle callInitializer(const char* className, const char* methodName, const char* returnType); | 152 static Handle callInitializer(const char* className, const char* methodName, const char* returnType); |
153 | 153 |
154 /** | 154 /** |
155 * Trigger initialization of HotSpotGraalRuntime through Graal.runtime() | 155 * Trigger initialization of HotSpotJVMCIRuntime through JVMCI.getRuntime() |
156 */ | 156 */ |
157 static void initialize_Graal(); | 157 static void initialize_JVMCI(); |
158 | 158 |
159 /** | 159 /** |
160 * Explicitly initialize HotSpotGraalRuntime itself | 160 * Explicitly initialize HotSpotJVMCIRuntime itself |
161 */ | 161 */ |
162 static void initialize_HotSpotGraalRuntime(); | 162 static void initialize_HotSpotJVMCIRuntime(); |
163 | 163 |
164 static void shutdown(); | 164 static void shutdown(); |
165 | 165 |
166 static bool shutdown_called() { | 166 static bool shutdown_called() { |
167 return _shutdown_called; | 167 return _shutdown_called; |