JACOBIN-536 Updating location of increments to f.PC

Thihup · Jun 28, 2024 · 0fdf05c · 0fdf05c
1 parent 01f521e
commit 0fdf05c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/jvm/run.go b/src/jvm/run.go
@@ -242,10 +242,8 @@ frameInterpreter:
 			var idx int
 			if opcode == opcodes.LDC { // LDC uses a 1-byte index into the CP, LDC_W uses a 2-byte index
 				idx = int(f.Meth[f.PC+1])
-				f.PC += 1
 			} else {
 				idx = (int(f.Meth[f.PC+1]) * 256) + int(f.Meth[f.PC+2])
-				f.PC += 2
 			}
 
 			CPe := classloader.FetchCPentry(f.CP.(*classloader.CPool), idx)
@@ -278,6 +276,12 @@ frameInterpreter:
 				push(f, stringAddr)
 			}
 
+			if opcode == opcodes.LDC {
+				f.PC += 1
+			} else {
+				f.PC += 2
+			}
+
 		case opcodes.LDC2_W: // 0x14 	(push long or double from CP indexed by next two bytes)
 			idx := (int(f.Meth[f.PC+1]) * 256) + int(f.Meth[f.PC+2])
 			f.PC += 2