JACOBIN-592 Ported last of interpreter unit tests to new interpreter

platypusguy · Nov 4, 2024 · ec7cd0f · ec7cd0f
1 parent f1083c9
commit ec7cd0f
Show file tree

Hide file tree

Showing 3 changed files with 1,442 additions and 3 deletions.
diff --git a/src/config/buildno.go b/src/config/buildno.go
@@ -8,4 +8,4 @@
 
 package config
 
-var BuildNo = 3190
+var BuildNo = 3191
diff --git a/src/jvm/interpreter.go b/src/jvm/interpreter.go
@@ -587,7 +587,7 @@ func doIstore(fr *frames.Frame, _ int64) int {
 	}
 
 	popped := pop(fr)
-	fr.Locals[index] = convertInterfaceToInt64(popped) // TODO: conversion needed?
+	fr.Locals[index] = convertInterfaceToInt64(popped)
 	return PCadvance + 1
 }
 
@@ -1164,7 +1164,7 @@ func doIinc(fr *frames.Frame, _ int64) int {
 	var PCtoSkip int
 	if fr.WideInEffect { // if wide is in effect, index  and increment are two bytes wide, otherwise one byte each
 		index = (int(fr.Meth[fr.PC+1]) * 256) + int(fr.Meth[fr.PC+2])
-		increment = int64(fr.Meth[fr.PC+1])*256 + int64(fr.Meth[fr.PC+2])
+		increment = int64(fr.Meth[fr.PC+3])*256 + int64(fr.Meth[fr.PC+4])
 		PCtoSkip = 4
 		fr.WideInEffect = false
 	} else {