Mercurial > hg > truffle

changeset 16659:b377d9e85bc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[SPARC] Fist implementation of unsigned arithmethic (Still to improve)
author Stefan Anzinger <stefan.anzinger@gmail.com>
date Wed, 30 Jul 2014 08:50:26 -0700
parents 5b78f8542ccd
children 07c9a8824b62
files graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArithmetic.java
diffstat 2 files changed, 84 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java	Wed Jul 30 08:41:52 2014 -0700
+++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java	Wed Jul 30 08:50:26 2014 -0700
@@ -653,33 +653,36 @@
     }
 
     @Override
-    public Value emitUDiv(Value a, Value b, LIRFrameState state) {
-        // LIRFrameState state = state(deopting);
+    public Value emitURem(Value a, Value b, LIRFrameState state) {
+        Variable result = newVariable(LIRKind.derive(a, b));
         switch (a.getKind().getStackKind()) {
             case Int:
-                // emitDivRem(IUDIV, a, b, state);
-                // return emitMove(RAX_I);
+                append(new RemOp(IUREM, result, a, loadNonConst(b), state, this));
+                break;
             case Long:
-                // emitDivRem(LUDIV, a, b, state);
-                // return emitMove(RAX_L);
+                append(new RemOp(LUREM, result, a, loadNonConst(b), state, this));
+                break;
             default:
                 throw GraalInternalError.shouldNotReachHere();
         }
+        return result;
+
     }
 
     @Override
-    public Value emitURem(Value a, Value b, LIRFrameState state) {
-        // LIRFrameState state = state(deopting);
+    public Value emitUDiv(Value a, Value b, LIRFrameState state) {
+        SPARCArithmetic op;
         switch (a.getKind().getStackKind()) {
             case Int:
-                // emitDivRem(IUREM, a, b, state);
-                // return emitMove(RDX_I);
+                op = IUDIV;
+                break;
             case Long:
-                // emitDivRem(LUREM, a, b, state);
-                // return emitMove(RDX_L);
+                op = LUDIV;
+                break;
             default:
                 throw GraalInternalError.shouldNotReachHere();
         }
+        return emitBinary(op, false, a, b, state);
     }
 
     @Override
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArithmetic.java	Wed Jul 30 08:41:52 2014 -0700
+++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCArithmetic.java	Wed Jul 30 08:50:26 2014 -0700
@@ -324,6 +324,10 @@
                     assert isSimm13(crb.asIntConst(src2));
                     new Sdivx(asIntReg(src1), crb.asIntConst(src2), asIntReg(dst)).emit(masm);
                     break;
+                case IUDIV:
+                    assert isSimm13(crb.asIntConst(src2));
+                    new Udivx(asIntReg(src1), crb.asIntConst(src2), asIntReg(dst)).emit(masm);
+                    break;
                 case IAND:
                     assert isSimm13(crb.asIntConst(src2)) : src2;
                     new And(asIntReg(src1), crb.asIntConst(src2), asIntReg(dst)).emit(masm);
@@ -360,7 +364,7 @@
                     assert isSimm13(crb.asIntConst(src2));
                     new Mulx(asLongReg(src1), crb.asIntConst(src2), asLongReg(dst)).emit(masm);
                     break;
-                case LDIV:
+                case LDIV: {
                     int c = crb.asIntConst(src2);
                     exceptionOffset = masm.position();
                     if (c == 0) { // Generate div by zero trap
@@ -372,8 +376,14 @@
                         new Sdivx(asLongReg(src1), crb.asIntConst(src2), asLongReg(dst)).emit(masm);
                     }
                     break;
-                case LUDIV:
-                    throw GraalInternalError.unimplemented();
+                }
+                case LUDIV: {
+                    int c = crb.asIntConst(src2);
+                    assert isSimm13(c);
+                    exceptionOffset = masm.position();
+                    new Udivx(asLongReg(src1), c, asLongReg(dst)).emit(masm);
+                    break;
+                }
                 case LAND:
                     assert isSimm13(crb.asIntConst(src2));
                     new And(asLongReg(src1), crb.asIntConst(src2), asLongReg(dst)).emit(masm);
@@ -429,6 +439,11 @@
                     exceptionOffset = masm.position();
                     new Sdivx(asIntReg(src1), asIntReg(src2), asIntReg(dst)).emit(masm);
                     break;
+                case IUDIV:
+                    new Srl(asIntReg(src1), 0, asIntReg(src1)).emit(masm);
+                    exceptionOffset = masm.position();
+                    new Udivx(asIntReg(src1), asIntReg(src2), asIntReg(dst)).emit(masm);
+                    break;
                 case IAND:
                     new And(asIntReg(src1), asIntReg(src2), asIntReg(dst)).emit(masm);
                     break;
@@ -463,7 +478,9 @@
                     new Sdivx(asLongReg(src1), asLongReg(src2), asLongReg(dst)).emit(masm);
                     break;
                 case LUDIV:
-                    throw GraalInternalError.unimplemented();
+                    exceptionOffset = masm.position();
+                    new Udivx(asLongReg(src1), asLongReg(src2), asLongReg(dst)).emit(masm);
+                    break;
                 case LAND:
                     new And(asLongReg(src1), asLongReg(src2), asLongReg(dst)).emit(masm);
                     break;
@@ -533,8 +550,8 @@
                     } else {
                         new Setx(a % b, asIntReg(dst), false).emit(masm);
                     }
+                    break;
                 }
-                    break;
                 case LREM: {
                     long a = crb.asLongConst(src1);
                     long b = crb.asLongConst(src2);
@@ -544,8 +561,8 @@
                     } else {
                         new Setx(a % b, asLongReg(dst), false).emit(masm);
                     }
+                    break;
                 }
-                    break;
                 default:
                     throw GraalInternalError.shouldNotReachHere("not implemented");
             }
@@ -559,6 +576,13 @@
                     new Mulx(asIntReg(scratch1), crb.asIntConst(src2), asIntReg(scratch2)).emit(masm);
                     new Sub(asIntReg(src1), asIntReg(scratch2), asIntReg(dst)).emit(masm);
                     break;
+                case IUREM:
+                    new Sra(asIntReg(src1), 0, asIntReg(scratch1)).emit(masm);
+                    exceptionOffset = masm.position();
+                    new Udivx(asIntReg(scratch1), crb.asIntConst(src2), asIntReg(scratch1)).emit(masm);
+                    new Mulx(asIntReg(scratch1), crb.asIntConst(src2), asIntReg(scratch1)).emit(masm);
+                    new Sub(asIntReg(src1), asIntReg(scratch1), asIntReg(dst)).emit(masm);
+                    break;
                 case LREM:
                     assert isSimm13(crb.asIntConst(src2));
                     exceptionOffset = masm.position();
@@ -567,7 +591,12 @@
                     new Sub(asLongReg(src1), asLongReg(scratch2), asLongReg(dst)).emit(masm);
                     break;
                 case LUREM:
-                    throw GraalInternalError.unimplemented();
+                    assert isSimm13(crb.asIntConst(src2));
+                    exceptionOffset = masm.position();
+                    new Udivx(asLongReg(src1), crb.asIntConst(src2), asLongReg(scratch1)).emit(masm);
+                    new Mulx(asLongReg(scratch1), crb.asIntConst(src2), asLongReg(scratch2)).emit(masm);
+                    new Sub(asLongReg(src1), asLongReg(scratch2), asLongReg(dst)).emit(masm);
+                    break;
                 default:
                     throw GraalInternalError.shouldNotReachHere();
             }
@@ -584,6 +613,16 @@
                     new Mulx(asLongReg(scratch1), asLongReg(src2), asLongReg(scratch1)).emit(masm);
                     new Sub(asLongReg(srcLeft), asLongReg(scratch1), asLongReg(dst)).emit(masm);
                     break;
+                case LUREM:
+                    if (isConstant(src1)) {
+                        new Setx(crb.asLongConst(src1), asLongReg(scratch2), false).emit(masm);
+                        srcLeft = scratch2;
+                    }
+                    exceptionOffset = masm.position();
+                    new Udivx(asLongReg(srcLeft), asLongReg(src2), asLongReg(scratch1)).emit(masm);
+                    new Mulx(asLongReg(scratch1), asLongReg(src2), asLongReg(scratch1)).emit(masm);
+                    new Sub(asLongReg(srcLeft), asLongReg(scratch1), asLongReg(dst)).emit(masm);
+                    break;
                 case IREM:
                     if (isConstant(src1)) {
                         new Setx(crb.asIntConst(src1), asIntReg(scratch2), false).emit(masm);
@@ -594,8 +633,13 @@
                     new Mulx(asIntReg(scratch1), asIntReg(src2), asIntReg(scratch1)).emit(masm);
                     new Sub(asIntReg(srcLeft), asIntReg(scratch1), asIntReg(dst)).emit(masm);
                     break;
-                case LUREM:
-                    throw GraalInternalError.unimplemented();
+                case IUREM:
+                    new Sra(asIntReg(src1), 0, asIntReg(scratch1)).emit(masm);
+                    exceptionOffset = masm.position();
+                    new Udivx(asIntReg(scratch1), asIntReg(src2), asIntReg(scratch1)).emit(masm);
+                    new Mulx(asIntReg(scratch1), asIntReg(src2), asIntReg(scratch1)).emit(masm);
+                    new Sub(asIntReg(src1), asIntReg(scratch1), asIntReg(dst)).emit(masm);
+                    break;
                 default:
                     throw GraalInternalError.shouldNotReachHere();
             }
@@ -685,6 +729,18 @@
                     new Fitos(asFloatReg(dst), asFloatReg(dst)).emit(masm);
                     new Fsubs(asFloatReg(dst), asFloatReg(dst), asFloatReg(dst)).emit(masm);
                     break;
+                case MOV_D2L:
+                    new Movdtox(asDoubleReg(src), asLongReg(dst)).emit(masm);
+                    break;
+                case MOV_L2D:
+                    new Movxtod(asLongReg(src), asDoubleReg(dst)).emit(masm);
+                    break;
+                case MOV_F2I:
+                    new Movstosw(asFloatReg(src), asIntReg(dst)).emit(masm);
+                    break;
+                case MOV_I2F:
+                    new Movwtos(asIntReg(src), asFloatReg(dst)).emit(masm);
+                    break;
                 case D2L:
                     new Fcmp(CC.Fcc0, Opfs.Fcmpd, asDoubleReg(dst), asDoubleReg(dst)).emit(masm);
                     new Fbo(false, 4 * 4).emit(masm);
@@ -745,6 +801,8 @@
             case ISHL:
             case ISHR:
             case IUSHR:
+            case IUDIV:
+            case IUREM:
                 rk = result.getKind();
                 xsk = x.getKind().getStackKind();
                 ysk = y.getKind().getStackKind();
@@ -758,6 +816,8 @@
             case LAND:
             case LOR:
             case LXOR:
+            case LUDIV:
+            case LUREM:
                 rk = result.getKind();
                 xk = x.getKind();
                 yk = y.getKind();