Mercurial > hg > graal-compiler

comparison graal/com.oracle.jvmci.hotspot/src/com/oracle/jvmci/hotspot/HotSpotJVMCIRuntime.java @ 21558:d563baeca9df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed uses of Graal terminology to JVMCI (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Wed, 27 May 2015 13:43:27 +0200
parents 48c1ebd24120
children 4f63449b4422
comparison
equal deleted inserted replaced
21557:31fc2fce38f3 21558:d563baeca9df
180 180
181 protected final HotSpotVMConfig config; 181 protected final HotSpotVMConfig config;
182 private final JVMCIBackend hostBackend; 182 private final JVMCIBackend hostBackend;
183 183
184 /** 184 /**
185 * Graal mirrors are stored as a {@link ClassValue} associated with the {@link Class} of the 185 * JVMCI mirrors are stored as a {@link ClassValue} associated with the {@link Class} of the
186 * type. This data structure stores both {@link HotSpotResolvedObjectType} and 186 * type. This data structure stores both {@link HotSpotResolvedObjectType} and
187 * {@link HotSpotResolvedPrimitiveType} types. 187 * {@link HotSpotResolvedPrimitiveType} types.
188 */ 188 */
189 private final ClassValue<ResolvedJavaType> graalMirrors = new ClassValue<ResolvedJavaType>() { 189 private final ClassValue<ResolvedJavaType> jvmciMirrors = new ClassValue<ResolvedJavaType>() {
190 @Override 190 @Override
191 protected ResolvedJavaType computeValue(Class<?> javaClass) { 191 protected ResolvedJavaType computeValue(Class<?> javaClass) {
192 if (javaClass.isPrimitive()) { 192 if (javaClass.isPrimitive()) {
193 Kind kind = Kind.fromJavaClass(javaClass); 193 Kind kind = Kind.fromJavaClass(javaClass);
194 return new HotSpotResolvedPrimitiveType(kind); 194 return new HotSpotResolvedPrimitiveType(kind);
205 compilerToVm = toVM; 205 compilerToVm = toVM;
206 try (InitTimer t = timer("HotSpotVMConfig<init>")) { 206 try (InitTimer t = timer("HotSpotVMConfig<init>")) {
207 config = new HotSpotVMConfig(compilerToVm); 207 config = new HotSpotVMConfig(compilerToVm);
208 } 208 }
209 209
210 if (Boolean.valueOf(System.getProperty("graal.printconfig"))) { 210 if (Boolean.valueOf(System.getProperty("jvmci.printconfig"))) {
211 printConfig(config); 211 printConfig(config);
212 } 212 }
213 213
214 String hostArchitecture = config.getHostArchitectureName(); 214 String hostArchitecture = config.getHostArchitectureName();
215 215
228 assert oldValue == null : "cannot overwrite existing backend for architecture " + arch.getSimpleName(); 228 assert oldValue == null : "cannot overwrite existing backend for architecture " + arch.getSimpleName();
229 return backend; 229 return backend;
230 } 230 }
231 231
232 public ResolvedJavaType fromClass(Class<?> javaClass) { 232 public ResolvedJavaType fromClass(Class<?> javaClass) {
233 return graalMirrors.get(javaClass); 233 return jvmciMirrors.get(javaClass);
234 } 234 }
235 235
236 private static void printConfig(HotSpotVMConfig config) { 236 private static void printConfig(HotSpotVMConfig config) {
237 Field[] fields = config.getClass().getDeclaredFields(); 237 Field[] fields = config.getClass().getDeclaredFields();
238 Map<String, Field> sortedFields = new TreeMap<>(); 238 Map<String, Field> sortedFields = new TreeMap<>();