From 5cfe5f6b3052fc76ef16c15ad11a177c479c1920 Mon Sep 17 00:00:00 2001
From: Cyrille Artho <artho@kth.se>
Date: Fri, 23 Nov 2018 13:50:45 +0100
Subject: [PATCH] Fixed behavior of division by 0 on doubles (should be
 Infinity), added tests.

---
 src/main/gov/nasa/jpf/jvm/bytecode/DDIV.java  |  5 ---
 .../nasa/jpf/test/java/lang/DoubleTest.java   | 38 +++++++++++++++++++
 .../nasa/jpf/test/java/lang/FloatTest.java    | 38 +++++++++++++++++++
 3 files changed, 76 insertions(+), 5 deletions(-)
 create mode 100644 src/tests/gov/nasa/jpf/test/java/lang/DoubleTest.java
 create mode 100644 src/tests/gov/nasa/jpf/test/java/lang/FloatTest.java

diff --git a/src/main/gov/nasa/jpf/jvm/bytecode/DDIV.java b/src/main/gov/nasa/jpf/jvm/bytecode/DDIV.java
index c14099b..10397d8 100644
--- a/src/main/gov/nasa/jpf/jvm/bytecode/DDIV.java
+++ b/src/main/gov/nasa/jpf/jvm/bytecode/DDIV.java
@@ -34,11 +34,6 @@ public class DDIV extends Instruction implements JVMInstruction {
 
     double v1 = frame.popDouble();
     double v2 = frame.popDouble();
-    
-    if (v1 == 0) {
-        return ti.createAndThrowException("java.lang.ArithmeticException",
-                                          "division by zero");
-    }
 
     double r = v2 / v1;
     
diff --git a/src/tests/gov/nasa/jpf/test/java/lang/DoubleTest.java b/src/tests/gov/nasa/jpf/test/java/lang/DoubleTest.java
new file mode 100644
index 0000000..9930f81
--- /dev/null
+++ b/src/tests/gov/nasa/jpf/test/java/lang/DoubleTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2018, United States Government, as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All rights reserved.
+ *
+ * The Java Pathfinder core (jpf-core) platform is licensed under the
+ * Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * 
+ *        http://www.apache.org/licenses/LICENSE-2.0. 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package gov.nasa.jpf.test.java.lang;
+
+import gov.nasa.jpf.util.test.TestJPF;
+
+import org.junit.Test;
+
+/**
+ * double related tests
+ */
+public class DoubleTest extends TestJPF {
+
+  @Test
+  public void testDivision() {
+    if (verifyNoPropertyViolation()) {
+      double i = 0;
+      double j = 10 / i;
+      assert(Double.valueOf(j).isInfinite());
+    }
+  }
+}
diff --git a/src/tests/gov/nasa/jpf/test/java/lang/FloatTest.java b/src/tests/gov/nasa/jpf/test/java/lang/FloatTest.java
new file mode 100644
index 0000000..194e236
--- /dev/null
+++ b/src/tests/gov/nasa/jpf/test/java/lang/FloatTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2018, United States Government, as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All rights reserved.
+ *
+ * The Java Pathfinder core (jpf-core) platform is licensed under the
+ * Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * 
+ *        http://www.apache.org/licenses/LICENSE-2.0. 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package gov.nasa.jpf.test.java.lang;
+
+import gov.nasa.jpf.util.test.TestJPF;
+
+import org.junit.Test;
+
+/**
+ * float related tests
+ */
+public class FloatTest extends TestJPF {
+
+  @Test
+  public void testDivision() {
+    if (verifyNoPropertyViolation()) {
+      float i = 0;
+      float j = 10 / i;
+      assert(Float.valueOf(j).isInfinite());
+    }
+  }
+}
-- 
2.34.1