Mercurial > hg > graal-compiler

changeset 22469:eb2f0fb5b0a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[SPARC] Only accept STORE_LOAD memory barrier in LIR Instruction
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Fri, 14 Aug 2015 09:59:41 +0200
parents cdd5ff710208
children d898359f572c
files graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java mx.graal/suite.py
diffstat 3 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java	Fri Aug 14 09:28:43 2015 +0200
+++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java	Fri Aug 14 09:59:41 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 20txa", "15, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java	Fri Aug 14 09:28:43 2015 +0200
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java	Fri Aug 14 09:59:41 2015 +0200
@@ -24,6 +24,7 @@
 
 import static com.oracle.graal.asm.sparc.SPARCAssembler.*;
 import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*;
+import static jdk.internal.jvmci.code.MemoryBarriers.*;
 import static jdk.internal.jvmci.code.ValueUtil.*;
 import static jdk.internal.jvmci.meta.Kind.*;
 import static jdk.internal.jvmci.sparc.SPARC.*;
@@ -340,7 +341,12 @@
         @Override
         public void emitCode(CompilationResultBuilder crb, SPARCMacroAssembler masm) {
             getDelayedControlTransfer().emitControlTransfer(crb, masm);
-            masm.membar(barriers);
+            masm.membar(MEMBAR_STORE_LOAD);
+        }
+
+        @Override
+        public void verify() {
+            assert barriers == STORE_LOAD : String.format("Got barriers 0x%x; On SPARC only STORE_LOAD barriers are accepted; all other barriers are not neccessary due to TSO", barriers);
         }
     }
 
--- a/mx.graal/suite.py	Fri Aug 14 09:28:43 2015 +0200
+++ b/mx.graal/suite.py	Fri Aug 14 09:59:41 2015 +0200
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "4a532b03e2cdd75fdd40f6fca73ffaa8d50ad21a",
+               "version" : "9c55f608b79e19647fb7a45afec3280b07bc47fa",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"},