You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by va...@apache.org on 2007/10/08 08:41:31 UTC
svn commit: r582725 - in /harmony/enhanced/drlvm/trunk:
src/test/regression/H4675/DivLongTest.java
src/test/regression/H4675/run.test.xml vm/jitrino/src/jet/arith_rt.cpp
Author: varlax
Date: Sun Oct 7 23:41:29 2007
New Revision: 582725
URL: http://svn.apache.org/viewvc?rev=582725&view=rev
Log:
Fixed HARMONY-4898 [drlvm][jit][jet] crash due to IntegerOverflow
Modified:
harmony/enhanced/drlvm/trunk/src/test/regression/H4675/DivLongTest.java
harmony/enhanced/drlvm/trunk/src/test/regression/H4675/run.test.xml
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/arith_rt.cpp
Modified: harmony/enhanced/drlvm/trunk/src/test/regression/H4675/DivLongTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/src/test/regression/H4675/DivLongTest.java?rev=582725&r1=582724&r2=582725&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/src/test/regression/H4675/DivLongTest.java (original)
+++ harmony/enhanced/drlvm/trunk/src/test/regression/H4675/DivLongTest.java Sun Oct 7 23:41:29 2007
@@ -11,7 +11,7 @@
assertEquals(1, res);
}
- /* crash on x86_64 - to be fixed
+ /** HARMONY-4898 */
public void testLDIV_min() {
long l_min = Long.MIN_VALUE;
long l_1 = -1;
@@ -26,5 +26,5 @@
long res = l_min % l_1;
assertEquals(0, res);
- } */
+ }
}
Modified: harmony/enhanced/drlvm/trunk/src/test/regression/H4675/run.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/src/test/regression/H4675/run.test.xml?rev=582725&r1=582724&r2=582725&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/src/test/regression/H4675/run.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/src/test/regression/H4675/run.test.xml Sun Oct 7 23:41:29 2007
@@ -1,4 +1,4 @@
-<project name="RUN HARMONY-4675 Regression Test">
+<project name="RUN HARMONY-4675,HARMONY-4898 Regression Test">
<target name="run-test">
<run-junit-test
test="org.apache.harmony.drlvm.tests.regression.h4675.DivLongTest"
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/arith_rt.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/arith_rt.cpp?rev=582725&r1=582724&r2=582725&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/arith_rt.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/arith_rt.cpp Sun Oct 7 23:41:29 2007
@@ -208,9 +208,9 @@
return v1 * v2;
// special cases according to JVM Spec
case OPCODE_IDIV:
- return (v2 == -1 && v1 == LONG_MIN) ? v1 : v1 / v2;
+ return (v2 == -1 && v1 == jLONG_MIN) ? v1 : v1 / v2;
case OPCODE_IREM:
- return (v2 == -1 && v1 == LONG_MIN) ? 0 : v1 % v2;
+ return (v2 == -1 && v1 == jLONG_MIN) ? 0 : v1 % v2;
default:
break;
}