JACOBIN-592 Cleaned up suspect code in run.go

platypusguy · Oct 30, 2024 · 1d0ff87 · 1d0ff87
1 parent e665f0b
commit 1d0ff87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/config/buildno.go b/src/config/buildno.go
@@ -8,4 +8,4 @@
 
 package config
 
-var BuildNo = 3160
+var BuildNo = 3163
diff --git a/src/jvm/run.go b/src/jvm/run.go
@@ -1320,13 +1320,16 @@ frameInterpreter:
 			floatVal := pop(f).(float64)
 			push(f, floatVal)
 			push(f, floatVal)
-		case opcodes.D2I: // 0xBE
+		case opcodes.D2I: // 0x8E
+			doubleVal := pop(f).(float64)
 			pop(f)
-			fallthrough
+			push(f, int64(math.Trunc(doubleVal)))
 		case opcodes.D2L: // 	0x8F convert double to long
+			doubleVal := pop(f).(float64)
 			pop(f)
-			fallthrough
-
+			l := int64(math.Trunc(doubleVal))
+			push(f, l)
+			push(f, l)
 		case opcodes.D2F: // 	0x90 Double to float
 			floatVal := float32(pop(f).(float64))
 			pop(f)