all repos — mgba @ abf1af30b1e02f21c03c8f6ff01e68b23999f244

mGBA Game Boy Advance Emulator

GBA Memory: Partially revert fec4c0644 (fixes #840)
Vicki Pfau vi@endrift.com
Wed, 17 Jan 2018 23:22:54 -0800
commit

abf1af30b1e02f21c03c8f6ff01e68b23999f244

parent

bf7247ad4c6e30b428d444607f14242f8f4f4a2d

2 files changed, 4 insertions(+), 3 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -41,6 +41,7 @@ - GB MBC: Fix MBC2 saves (fixes mgba.io/i/954)
  - GBA Memory: Fix copy-on-write memory leak
  - Core: Fix ROM patches not being unloaded when disabled (fixes mgba.io/i/962)
  - GBA I/O: Fix writing to DISPCNT CGB flag (fixes mgba.io/i/902)
+ - GBA Memory: Partially revert prefetch changes (fixes mgba.io/i/840)
 Misc:
  - GBA Timer: Use global cycles for timers
  - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)
M src/gba/memory.c → src/gba/memory.c 
@@ -1589,8 +1589,8 @@ previousLoads = dist >> 1;
 		maxLoads -= previousLoads;
 	}
 
-	int32_t s = cpu->memory.activeSeqCycles16;
-	int32_t n2s = cpu->memory.activeNonseqCycles16 - cpu->memory.activeSeqCycles16;
+	int32_t s = cpu->memory.activeSeqCycles16 + 1;
+	int32_t n2s = cpu->memory.activeNonseqCycles16 - cpu->memory.activeSeqCycles16 + 1;
 
 	// Figure out how many sequential loads we can jam in
 	int32_t stall = s;

@@ -1611,7 +1611,7 @@
 	memory->lastPrefetchedPc = cpu->gprs[ARM_PC] + WORD_SIZE_THUMB * (loads + previousLoads - 1);
 
 	// The next |loads|S waitstates disappear entirely, so long as they're all in a row
-	cpu->cycles -= stall;
+	cpu->cycles -= (s - 1) * loads;
 	return wait;
 }