From 261d02255c6ff3a55b528fbb10e7b33d2efff511 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Tue, 11 Oct 2016 22:02:02 -0700
Subject: [PATCH] GBA BIOS: Fix invalid CpuSet not setting BIOS prefetch

---
 CHANGES        | 1 +
 src/gba/bios.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index eecd7ed76..09dc94684 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 Bugfixes:
  - GBA Memory: Fix misaligned BIOS reads
  - GBA BIOS: Fix MidiKey2Freq BIOS reads
+ - GBA BIOS: Fix invalid CpuSet not setting BIOS prefetch
 
 0.5.1: (2016-10-05)
 Bugfixes:
diff --git a/src/gba/bios.c b/src/gba/bios.c
index f0fd4b451..831eee9a6 100644
--- a/src/gba/bios.c
+++ b/src/gba/bios.c
@@ -364,7 +364,7 @@ void GBASwi16(struct ARMCore* cpu, int immediate) {
 	case 0xC:
 		if (cpu->gprs[0] >> BASE_OFFSET < REGION_WORKING_RAM) {
 			mLOG(GBA_BIOS, GAME_ERROR, "Cannot CpuSet from BIOS");
-			return;
+			break;
 		}
 		if (cpu->gprs[0] & (cpu->gprs[2] & (1 << 26) ? 3 : 1)) {
 			mLOG(GBA_BIOS, GAME_ERROR, "Misaligned CpuSet source");