# HG changeset patch # User Lukas Stadler # Date 1326286928 -3600 # Node ID 6043f74b1ca057323c714603e3d13f6082f8dc06 # Parent f461a4a09e539538257a42c174e00bd0518ce7fa fix to float/double to int/long conversion diff -r f461a4a09e53 -r 6043f74b1ca0 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64ConvertFIOpcode.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64ConvertFIOpcode.java Wed Jan 11 13:40:12 2012 +0100 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64ConvertFIOpcode.java Wed Jan 11 14:02:08 2012 +0100 @@ -55,7 +55,7 @@ break; case D2I: masm.cvttsd2sil(asIntReg(result), asDoubleReg(input)); - slowPath = new AMD64ConvertFSlowPath(masm, asIntReg(result), asFloatReg(input), true, false); + slowPath = new AMD64ConvertFSlowPath(masm, asIntReg(result), asDoubleReg(input), true, false); break; default: throw Util.shouldNotReachHere(); diff -r f461a4a09e53 -r 6043f74b1ca0 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64ConvertFLOpcode.java --- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64ConvertFLOpcode.java Wed Jan 11 13:40:12 2012 +0100 +++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/target/amd64/AMD64ConvertFLOpcode.java Wed Jan 11 14:02:08 2012 +0100 @@ -52,11 +52,11 @@ switch (this) { case F2L: masm.cvttss2siq(asLongReg(result), asFloatReg(input)); - slowPath = new AMD64ConvertFSlowPath(masm, asIntReg(result), asFloatReg(input), false, true); + slowPath = new AMD64ConvertFSlowPath(masm, asLongReg(result), asFloatReg(input), false, true); break; case D2L: masm.cvttsd2siq(asLongReg(result), asDoubleReg(input)); - slowPath = new AMD64ConvertFSlowPath(masm, asIntReg(result), asFloatReg(input), true, true); + slowPath = new AMD64ConvertFSlowPath(masm, asLongReg(result), asDoubleReg(input), true, true); break; default: throw Util.shouldNotReachHere();