changeset 18573:3566e1edb3b4

removed static references to HotSpotGraalRuntime
author Doug Simon <doug.simon@oracle.com>
date Thu, 27 Nov 2014 11:51:17 +0100
parents c4da2e160178
children 37d88a4af2ab
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CRC32Substitutions.java
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java	Thu Nov 27 11:50:17 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/AESCryptSubstitutions.java	Thu Nov 27 11:51:17 2014 +0100
@@ -44,8 +44,13 @@
 public class AESCryptSubstitutions {
 
     public static class Guard implements SubstitutionGuard {
+        private HotSpotVMConfig config;
+
+        public Guard(HotSpotVMConfig config) {
+            this.config = config;
+        }
+
         public boolean execute() {
-            HotSpotVMConfig config = HotSpotGraalRuntime.runtime().getConfig();
             if (config.useAESIntrinsics) {
                 assert config.aescryptEncryptBlockStub != 0L;
                 assert config.aescryptDecryptBlockStub != 0L;
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CRC32Substitutions.java	Thu Nov 27 11:50:17 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/replacements/CRC32Substitutions.java	Thu Nov 27 11:51:17 2014 +0100
@@ -44,14 +44,14 @@
 
     public static class Guard implements SubstitutionGuard {
 
-        private HotSpotGraalRuntimeProvider runtime;
+        private HotSpotVMConfig config;
 
-        public Guard(HotSpotGraalRuntimeProvider runtime) {
-            this.runtime = runtime;
+        public Guard(HotSpotVMConfig config) {
+            this.config = config;
         }
 
         public boolean execute() {
-            return runtime.getConfig().useCRC32Intrinsics;
+            return config.useCRC32Intrinsics;
         }
     }