Mercurial > hg > graal-compiler

changeset 22131:6b4469fe86c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[SPARC] Use correct position in SPARCAssembler.insertNopAfterCBCond
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Tue, 30 Jun 2015 16:43:18 +0200
parents 3f01bf8c02eb
children 32805899dae9
files graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java jvmci/jdk.internal.jvmci.sparc/src/jdk/internal/jvmci/sparc/SPARC.java
diffstat 2 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java	Tue Jun 30 12:32:51 2015 +0200
+++ b/graal/com.oracle.graal.asm.sparc/src/com/oracle/graal/asm/sparc/SPARCAssembler.java	Tue Jun 30 16:43:18 2015 +0200
@@ -166,12 +166,7 @@
         }
 
         public static Op2s byValue(int value) {
-            for (Op2s op : values()) {
-                if (op.getValue() == value) {
-                    return op;
-                }
-            }
-            return null;
+            return OP2S[value];
         }
     }
 
@@ -992,7 +987,7 @@
     }
 
     public void insertNopAfterCBCond() {
-        int pos = position();
+        int pos = position() - INSTRUCTION_SIZE;
         if (pos == 0) {
             return;
         }
--- a/jvmci/jdk.internal.jvmci.sparc/src/jdk/internal/jvmci/sparc/SPARC.java	Tue Jun 30 12:32:51 2015 +0200
+++ b/jvmci/jdk.internal.jvmci.sparc/src/jdk/internal/jvmci/sparc/SPARC.java	Tue Jun 30 16:43:18 2015 +0200
@@ -242,6 +242,8 @@
      */
     public static final int MEMORY_ACCESS_ALIGN = 4;
 
+    public static final int INSTRUCTION_SIZE = 4;
+
     public final Set<CPUFeature> features;
 
     public SPARC(Set<CPUFeature> features) {