revert push16

koron-go · Apr 19, 2024 · 31f4e56 · 31f4e56
1 parent 6474a92
commit 31f4e56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/cpu.go b/cpu.go
@@ -135,13 +135,6 @@ func (cpu *CPU) fetch16() uint16 {
 	return (uint16(h) << 8) | uint16(l)
 }
 
-func (cpu *CPU) push16(v uint16) {
-	cpu.SP--
-	cpu.Memory.Set(cpu.SP, uint8(v>>8))
-	cpu.SP--
-	cpu.Memory.Set(cpu.SP, uint8(v))
-}
-
 func (cpu *CPU) ioIn(addr uint8) uint8 {
 	if cpu.IO == nil {
 		return 0

diff --git a/op_callret.go b/op_callret.go
@@ -1,7 +1,8 @@
 package z80
 
 func oopCALLnn(cpu *CPU) {
-	copCALLnn(cpu, cpu.fetch16())
+	nn := cpu.fetch16()
+	copCALLnn(cpu, nn)
 }
 
 func oopRETI(cpu *CPU) {
@@ -35,7 +36,10 @@ func oopRET(cpu *CPU) {
 // eXpanded OPration codes
 
 func copCALLnn(cpu *CPU, nn uint16) {
-	cpu.push16(cpu.PC)
+	cpu.SP--
+	cpu.Memory.Set(cpu.SP, uint8(cpu.PC>>8))
+	cpu.SP--
+	cpu.Memory.Set(cpu.SP, uint8(cpu.PC))
 	cpu.PC = nn
 }