diff --git a/CHANGES b/CHANGES index 6fe49fa21..db5d5b457 100644 --- a/CHANGES +++ b/CHANGES @@ -130,6 +130,7 @@ Misc: - Core: List memory segments in the core - Core: Move savestate creation time to extdata - Debugger: Add mDebuggerRunFrame convenience function + - GBA Memory: Remove unused prefetch cruft 0.5.2: (2016-12-31) Bugfixes: diff --git a/include/mgba/internal/gba/memory.h b/include/mgba/internal/gba/memory.h index 9507f0e29..1e5c89890 100644 --- a/include/mgba/internal/gba/memory.h +++ b/include/mgba/internal/gba/memory.h @@ -132,10 +132,6 @@ struct GBAMemory { char waitstatesSeq16[256]; char waitstatesNonseq32[256]; char waitstatesNonseq16[256]; - char waitstatesPrefetchSeq32[16]; - char waitstatesPrefetchSeq16[16]; - char waitstatesPrefetchNonseq32[16]; - char waitstatesPrefetchNonseq16[16]; int activeRegion; bool prefetch; uint32_t lastPrefetchedPc; diff --git a/src/gba/memory.c b/src/gba/memory.c index 755a538a0..be35f4104 100644 --- a/src/gba/memory.c +++ b/src/gba/memory.c @@ -59,12 +59,8 @@ void GBAMemoryInit(struct GBA* gba) { for (i = 0; i < 16; ++i) { gba->memory.waitstatesNonseq16[i] = GBA_BASE_WAITSTATES[i]; gba->memory.waitstatesSeq16[i] = GBA_BASE_WAITSTATES_SEQ[i]; - gba->memory.waitstatesPrefetchNonseq16[i] = GBA_BASE_WAITSTATES[i]; - gba->memory.waitstatesPrefetchSeq16[i] = GBA_BASE_WAITSTATES_SEQ[i]; gba->memory.waitstatesNonseq32[i] = GBA_BASE_WAITSTATES_32[i]; gba->memory.waitstatesSeq32[i] = GBA_BASE_WAITSTATES_SEQ_32[i]; - gba->memory.waitstatesPrefetchNonseq32[i] = GBA_BASE_WAITSTATES_32[i]; - gba->memory.waitstatesPrefetchSeq32[i] = GBA_BASE_WAITSTATES_SEQ_32[i]; } for (; i < 256; ++i) { gba->memory.waitstatesNonseq16[i] = 0;