Saving progress

Author: colecrouter

cmd/package/main.go

@@ -12,9 +12,9 @@ import (
 func main() {
 	gb := system.NewGameBoy()
 
-	// romData, err := os.ReadFile("tetris.gb")
+	romData, err := os.ReadFile("tetris.gb")
 	// romData, err := os.ReadFile("./tests/blargg/cpu_instrs/cpu_instrs.gb")
-	romData, err := os.ReadFile("./tests/blargg/instr_timing/instr_timing.gb")
+	// romData, err := os.ReadFile("./tests/blargg/instr_timing/instr_timing.gb")
 	// romData, err := os.ReadFile("./tests/blargg/interrupt_time/interrupt_time.gb")
 	if err != nil {
 		log.Fatalln(err)

private/processor/cpu/lr35902/lr35902.go

@@ -94,7 +94,13 @@ func (c *LR35902) MClock() {
 
 	c.lastPC = c.registers.PC
 
-	if c.registers.PC == 0x29e2 {
+	if c.registers.PC == 0x29d0 {
+		if c.registers.A&0b1111 != 0b1111 {
+			fmt.Printf("")
+		}
+	}
+
+	if c.registers.PC == 0x03a0 {
 		fmt.Printf("")
 	}
 

private/processor/cpu/lr35902/lr35902_test.go

@@ -2,6 +2,8 @@ package lr35902
 
 import (
 	"testing"
+
+	"github.com/colecrouter/gameboy-go/private/processor/cpu"
 )
 
 func TestByteLengths(t *testing.T) {
@@ -115,3 +117,22 @@ func TestCyclesCB(t *testing.T) {
 		})
 	}
 }
+
+func TestJPHL(t *testing.T) {
+	c, mem, _ := newTestCPU()
+	jumpTarget := uint16(0x1234)
+	c.registers.H, c.registers.L = cpu.FromRegisterPair(jumpTarget)
+	mem.Write(0, 0xE9) // JP (HL) opcode
+
+	// Preload clock with enough ticks (assume 1 tick is sufficient)
+	manualClock := make(chan struct{}, 1)
+	manualClock <- struct{}{}
+	close(manualClock)
+	c.clock = manualClock
+
+	c.MClock()
+
+	if c.registers.PC != jumpTarget {
+		t.Errorf("JP (HL) failed: got PC %d, want %d", c.registers.PC, jumpTarget)
+	}
+}

private/system/broadcaster.go

@@ -30,7 +30,7 @@ func (b *Broadcaster) Subscribe(c ClockType) <-chan struct{} {
 	return ch
 }
 
-func (b *Broadcaster) Broadcast(c ClockType) {
+func (b *Broadcaster) broadcast(c ClockType) {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 
@@ -46,14 +46,14 @@ func (b *Broadcaster) Broadcast(c ClockType) {
 
 func (b *Broadcaster) TClock() {
 	if b.count%4 == 0 {
-		b.Broadcast(MRisingEdge)
-		b.Broadcast(TRisingEdge)
+		b.broadcast(MRisingEdge)
+		b.broadcast(TRisingEdge)
 
-		b.Broadcast(MFallingEdge)
-		b.Broadcast(TFallingEdge)
+		b.broadcast(MFallingEdge)
+		b.broadcast(TFallingEdge)
 	} else {
-		b.Broadcast(TRisingEdge)
-		b.Broadcast(TFallingEdge)
+		b.broadcast(TRisingEdge)
+		b.broadcast(TFallingEdge)
 	}
 
 	b.count++