Mercurial > hg > graal-compiler

changeset 22698:d7ebda8d855e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update jvmci import: Remove initializeArchitecture methods.
author Roland Schatz <roland.schatz@oracle.com>
date Thu, 24 Sep 2015 14:44:21 +0200
parents 848cec401fda
children fbb8c5ee2a2c
files graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackendFactory.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java mx.graal/suite.py
diffstat 5 files changed, 1 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java	Thu Sep 24 14:29:13 2015 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java	Thu Sep 24 14:44:21 2015 +0200
@@ -29,7 +29,6 @@
 import java.util.List;
 
 import jdk.internal.jvmci.amd64.AMD64;
-import jdk.internal.jvmci.code.Architecture;
 import jdk.internal.jvmci.code.CodeCacheProvider;
 import jdk.internal.jvmci.code.Register;
 import jdk.internal.jvmci.code.RegisterConfig;
@@ -237,9 +236,4 @@
     public String toString() {
         return "AMD64";
     }
-
-    public Architecture initializeArchitecture(Architecture arch) {
-        assert arch instanceof AMD64;
-        return arch;
-    }
 }
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java	Thu Sep 24 14:29:13 2015 +0200
+++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackendFactory.java	Thu Sep 24 14:44:21 2015 +0200
@@ -26,7 +26,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import jdk.internal.jvmci.code.Architecture;
 import jdk.internal.jvmci.code.CodeCacheProvider;
 import jdk.internal.jvmci.code.Register;
 import jdk.internal.jvmci.code.RegisterConfig;
@@ -147,9 +146,4 @@
     public String toString() {
         return "SPARC";
     }
-
-    public Architecture initializeArchitecture(Architecture arch) {
-        assert arch instanceof SPARC;
-        return arch;
-    }
 }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackendFactory.java	Thu Sep 24 14:29:13 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotBackendFactory.java	Thu Sep 24 14:44:21 2015 +0200
@@ -22,14 +22,11 @@
  */
 package com.oracle.graal.hotspot;
 
-import jdk.internal.jvmci.code.Architecture;
 import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntimeProvider;
 
 import com.oracle.graal.phases.tiers.CompilerConfiguration;
 
 public interface HotSpotBackendFactory {
 
-    Architecture initializeArchitecture(Architecture arch);
-
     HotSpotBackend createBackend(HotSpotGraalRuntimeProvider runtime, CompilerConfiguration compilerConfiguration, HotSpotJVMCIRuntimeProvider jvmciRuntime, HotSpotBackend host);
 }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java	Thu Sep 24 14:29:13 2015 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalCompilerFactory.java	Thu Sep 24 14:44:21 2015 +0200
@@ -24,7 +24,6 @@
 
 import static jdk.internal.jvmci.inittimer.InitTimer.timer;
 import jdk.internal.jvmci.code.Architecture;
-import jdk.internal.jvmci.common.JVMCIError;
 import jdk.internal.jvmci.compiler.Compiler;
 import jdk.internal.jvmci.compiler.CompilerFactory;
 import jdk.internal.jvmci.hotspot.HotSpotJVMCIRuntime;
@@ -51,15 +50,6 @@
 
     protected abstract CompilerConfiguration createCompilerConfiguration();
 
-    @Override
-    public Architecture initializeArchitecture(Architecture arch) {
-        HotSpotBackendFactory backend = getBackendFactory(arch);
-        if (backend == null) {
-            throw new JVMCIError("no Graal backend found for %s", arch);
-        }
-        return backend.initializeArchitecture(arch);
-    }
-
     @SuppressWarnings("try")
     @Override
     public Compiler createCompiler(JVMCIRuntime runtime) {
--- a/mx.graal/suite.py	Thu Sep 24 14:29:13 2015 +0200
+++ b/mx.graal/suite.py	Thu Sep 24 14:44:21 2015 +0200
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "940b668f08096098428e510fc267aec15657e77e",
+               "version" : "9409f7cec59a49d5e08a455a4437ca57f2d0b229",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},