Mercurial > repos > blastem

changeset 997:560da2e455c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
YOUR EMULATOR SUX is dead. Needs logic analyzer testing to check exact delay though.
author Michael Pavone <pavone@retrodev.com>
date Sat, 30 Apr 2016 10:47:29 -0700
parents 784bc1e45e80
children bf63cbf1d7bb
files blastem.c
diffstat 1 files changed, 25 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/blastem.c	Sat Apr 30 09:45:53 2016 -0700
+++ b/blastem.c	Sat Apr 30 10:47:29 2016 -0700
@@ -366,7 +366,12 @@
 				while(v_context->flags & FLAG_DMA_RUN) {
 					vdp_run_dma_done(v_context, gen->frame_end);
 					if (v_context->cycles >= gen->frame_end) {
-						context->current_cycle = v_context->cycles;
+						uint32_t cycle_diff = v_context->cycles - context->current_cycle;
+						uint32_t m68k_cycle_diff = (cycle_diff / MCLKS_PER_68K) * MCLKS_PER_68K;
+						if (m68k_cycle_diff < cycle_diff) {
+							m68k_cycle_diff += MCLKS_PER_68K;
+						}
+						context->current_cycle += m68k_cycle_diff;
 						gen->bus_busy = 1;
 						sync_components(context, 0);
 						gen->bus_busy = 0;
@@ -381,12 +386,24 @@
 					while(v_context->flags & FLAG_DMA_RUN) {
 						vdp_run_dma_done(v_context, gen->frame_end);
 						if (v_context->cycles >= gen->frame_end) {
-							context->current_cycle = v_context->cycles;
+							uint32_t cycle_diff = v_context->cycles - context->current_cycle;
+							uint32_t m68k_cycle_diff = (cycle_diff / MCLKS_PER_68K) * MCLKS_PER_68K;
+							if (m68k_cycle_diff < cycle_diff) {
+								m68k_cycle_diff += MCLKS_PER_68K;
+							}
+							context->current_cycle += m68k_cycle_diff;
 							gen->bus_busy = 1;
 							sync_components(context, 0);
 							gen->bus_busy = 0;
 						}
+						if (!(v_context->flags & FLAG_DMA_RUN)) {
+							//two more slots of delay are needed to kill sufficient sprite capacity in Overdrive
+							//TODO: Measure exact value with logic analyzer
+							vdp_run_context(v_context, v_context->cycles + 1);
+							vdp_run_context(v_context, v_context->cycles + 1);
+						}
 					}
+					
 					if (blocked < 0) {
 						blocked = vdp_control_port_write(v_context, value);
 					} else {
@@ -403,7 +420,12 @@
 		}
 		if (v_context->cycles != before_cycle) {
 			//printf("68K paused for %d (%d) cycles at cycle %d (%d) for write\n", v_context->cycles - context->current_cycle, v_context->cycles - before_cycle, context->current_cycle, before_cycle);
-			context->current_cycle = v_context->cycles;
+			uint32_t cycle_diff = v_context->cycles - context->current_cycle;
+			uint32_t m68k_cycle_diff = (cycle_diff / MCLKS_PER_68K) * MCLKS_PER_68K;
+			if (m68k_cycle_diff < cycle_diff) {
+				m68k_cycle_diff += MCLKS_PER_68K;
+			}
+			context->current_cycle += m68k_cycle_diff;
 #ifdef REFRESH_EMULATION
 			last_sync_cycle = context->current_cycle;
 #endif