Mercurial > hg > truffle

changeset 11930:47a5e23bb418

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix more PTX warnings.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 07 Oct 2013 03:12:05 +0200
parents b18d4089535d
children 9fe53a7b42b8
files graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/PTXAssembler.java graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXTestOp.java
diffstat 2 files changed, 12 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/PTXAssembler.java	Mon Oct 07 03:11:20 2013 +0200
+++ b/graal/com.oracle.graal.asm.ptx/src/com/oracle/graal/asm/ptx/PTXAssembler.java	Mon Oct 07 03:12:05 2013 +0200
@@ -716,9 +716,7 @@
     }
 
     public enum BooleanOperator {
-        AND("and"),
-        OR("or"),
-        XOR("xor");
+        AND("and"), OR("or"), XOR("xor");
 
         private final String output;
 
@@ -731,18 +729,15 @@
         }
     }
 
-    public static class Setp  {
-
+    public static class Setp {
 
-        private BooleanOperator    booleanOperator;
-        private ConditionOperator  operator;
+        private BooleanOperator booleanOperator;
+        private ConditionOperator operator;
         private Value first, second;
         private Kind kind;
         private int predicate;
 
-        public Setp(Condition condition,
-                    Value first, Value second,
-                    int predicateRegisterNumber) {
+        public Setp(Condition condition, Value first, Value second, int predicateRegisterNumber) {
             setFirst(first);
             setSecond(second);
             setPredicate(predicateRegisterNumber);
@@ -750,9 +745,7 @@
             setConditionOperator(operatorForConditon(condition));
         }
 
-        public Setp(Condition condition, BooleanOperator operator,
-                    Value first, Value second,
-                    int predicateRegisterNumber) {
+        public Setp(Condition condition, BooleanOperator operator, Value first, Value second, int predicateRegisterNumber) {
             setFirst(first);
             setSecond(second);
             setPredicate(predicateRegisterNumber);
@@ -920,18 +913,11 @@
         public void emit(PTXAssembler asm) {
 
             if (booleanOperator != null) {
-                asm.emitString("setp." +
-                               operator.getOperator() + "." +
-                               booleanOperator.getOperator() +
-                               typeForKind(kind) + " %p" + predicate +
-                               emitValue(first) + emitValue(second) +
-                               ", %r;"); // Predicates need to be objects
+                asm.emitString("setp." + operator.getOperator() + "." + booleanOperator.getOperator() + typeForKind(kind) + " %p" + predicate + emitValue(first) + emitValue(second) + ", %r;"); // Predicates
+// need to be objects
 
             } else {
-                asm.emitString("setp." +
-                               operator.getOperator() + "." +
-                               typeForKind(kind) + " %p" + predicate +
-                               emitValue(first) + emitValue(second) + ";");
+                asm.emitString("setp." + operator.getOperator() + "." + typeForKind(kind) + " %p" + predicate + emitValue(first) + emitValue(second) + ";");
             }
         }
     }
--- a/graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXTestOp.java	Mon Oct 07 03:11:20 2013 +0200
+++ b/graal/com.oracle.graal.lir.ptx/src/com/oracle/graal/lir/ptx/PTXTestOp.java	Mon Oct 07 03:12:05 2013 +0200
@@ -24,12 +24,10 @@
 
 import static com.oracle.graal.asm.ptx.PTXAssembler.BooleanOperator.*;
 import static com.oracle.graal.asm.ptx.PTXAssembler.*;
-import static com.oracle.graal.api.code.ValueUtil.*;
 import static com.oracle.graal.lir.LIRInstruction.OperandFlag.*;
 
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.asm.ptx.*;
-import com.oracle.graal.graph.*;
 import com.oracle.graal.lir.asm.*;
 import com.oracle.graal.nodes.calc.Condition;
 
@@ -47,20 +45,16 @@
 
     @Override
     public void emitCode(TargetMethodAssembler tasm, PTXAssembler masm) {
-        emit(tasm, masm, x, y, predicate);
+        emit(masm, x, y, predicate);
     }
 
     @Override
     protected void verify() {
         super.verify();
-        assert (x.getKind() == Kind.Int &&
-                y.getKind().getStackKind() == Kind.Int) ||
-                (x.getKind() == Kind.Long && y.getKind() == Kind.Long) :
-                x + " " + y;
+        assert (x.getKind() == Kind.Int && y.getKind().getStackKind() == Kind.Int) || (x.getKind() == Kind.Long && y.getKind() == Kind.Long) : x + " " + y;
     }
 
-    public static void emit(TargetMethodAssembler tasm, PTXAssembler masm,
-                            Value x, Value y, int predicate) {
+    public static void emit(PTXAssembler masm, Value x, Value y, int predicate) {
         /*
          * This is not yet quite right - as the result for the equivalent in
          * ControlPTXText.testIntegerTestBranch2I is wrong.