Mercurial > repos > blastem

diff m68k_core.h @ 2350:f8b5142c06aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow 68K to return mid-instruction. Adjust how 68K interrupt ack works so int2 busy flag timing is more correct. Fix some other SCD timing issues
author Michael Pavone <pavone@retrodev.com>
date Mon, 16 Oct 2023 23:30:04 -0700
parents 0111c8344477
children 8f3cfb77f1e3
line wrap: on
line diff
--- a/m68k_core.h	Fri Oct 13 22:44:36 2023 -0700
+++ b/m68k_core.h	Mon Oct 16 23:30:04 2023 -0700
@@ -27,6 +27,7 @@
 typedef void (*start_fun)(uint8_t * addr, void * context);
 typedef struct m68k_context m68k_context;
 typedef m68k_context *(*sync_fun)(m68k_context * context, uint32_t address);
+typedef m68k_context *(*int_ack_fun)(m68k_context * context);
 
 typedef struct {
 	code_ptr impl;
@@ -61,7 +62,10 @@
 	code_ptr		set_sr;
 	code_ptr		set_ccr;
 	code_ptr        bp_stub;
+	code_ptr        save_context_scratch;
+	code_ptr        load_context_scratch;
 	sync_fun        sync_components;
+	int_ack_fun     int_ack;
 	code_info       extra_code;
 	movem_fun       *big_movem;
 	uint32_t        num_movem;
@@ -79,7 +83,6 @@
 struct m68k_context {
 	uint8_t         flags[5];
 	uint8_t         status;
-	uint16_t        int_ack;
 	uint32_t        dregs[8];
 	uint32_t        aregs[9];
 	uint32_t		target_cycle; //cycle at which the next synchronization or interrupt occurs
@@ -88,17 +91,22 @@
 	uint32_t        int_cycle;
 	uint32_t        int_num;
 	uint32_t        last_prefetch_address;
+	uint32_t        scratch1;
+	uint32_t        scratch2;
 	uint16_t        *mem_pointers[NUM_MEM_AREAS];
 	code_ptr        resume_pc;
 	code_ptr        reset_handler;
 	m68k_options    *options;
 	void            *system;
+	void            *host_sp_entry;
+	void            *stack_storage[10];
 	m68k_breakpoint *breakpoints;
 	uint32_t        num_breakpoints;
 	uint32_t        bp_storage;
 	uint8_t         int_pending;
 	uint8_t         trace_pending;
 	uint8_t         should_return;
+	uint8_t         stack_storage_count;
 	uint8_t         ram_code_flags[];
 };
 
@@ -108,7 +116,7 @@
 void translate_m68k_stream(uint32_t address, m68k_context * context);
 void start_68k_context(m68k_context * context, uint32_t address);
 void resume_68k(m68k_context *context);
-void init_m68k_opts(m68k_options * opts, memmap_chunk * memmap, uint32_t num_chunks, uint32_t clock_divider, sync_fun sync_components);
+void init_m68k_opts(m68k_options * opts, memmap_chunk * memmap, uint32_t num_chunks, uint32_t clock_divider, sync_fun sync_components, int_ack_fun int_ack);
 m68k_context * init_68k_context(m68k_options * opts, m68k_reset_handler reset_handler);
 void m68k_reset(m68k_context * context);
 void m68k_options_free(m68k_options *opts);