Fix: halt cycle bug

akatsuki105 · May 12, 2021 · be767aa · be767aa
1 parent 367d4ae
commit be767aa
Show file tree

Hide file tree

Showing 12 changed files with 236 additions and 354 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -120,7 +120,7 @@ type Emulator struct {
 }
 
 func (e *Emulator) Update() error {
-	defer e.gba.PanicHandler(true)
+	defer e.gba.PanicHandler("core", true)
 	e.gba.Update()
 	if e.gba.DoSav && e.gba.Frame%60 == 0 {
 		e.writeSav()
@@ -129,6 +129,7 @@ func (e *Emulator) Update() error {
 }
 
 func (e *Emulator) Draw(screen *ebiten.Image) {
+	defer e.gba.PanicHandler("gpu", true)
 	screen.ReplacePixels(e.gba.Draw().Pix)
 }
 

diff --git a/pkg/gba/apu.go b/pkg/gba/apu.go
@@ -73,7 +73,7 @@ func newAPU() *APU {
 	return &APU{
 		context: context,
 		player:  player,
-		chans:   [4]*SoundChan{&SoundChan{}, &SoundChan{}, &SoundChan{}, &SoundChan{}},
+		chans:   [4]*SoundChan{{}, {}, {}, {}},
 	}
 }
 
@@ -491,7 +491,7 @@ func clip(val int32) int16 {
 }
 
 func (g *GBA) soundClock(cycles uint32) {
-	defer g.PanicHandler(true)
+	defer g.PanicHandler("apu", true)
 	sndCycles += cycles
 
 	sampPcmL, sampPcmR := int16(0), int16(0)