[PATCH 14/20] Glue the Jaguar code to the WinUAE m68k CPU emulation

[Thomas Huth <huth@xxxxxxxxxxxxx>]

---
 src/jaguar/jaguar.c |  11 +++--
 src/jaguar/m68k.h   | 108 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 src/jaguar/m68k.h

diff --git a/src/jaguar/jaguar.c b/src/jaguar/jaguar.c
index 06621ae5..f6427b5b 100644
--- a/src/jaguar/jaguar.c
+++ b/src/jaguar/jaguar.c
@@ -37,7 +37,7 @@
 //Do this in makefile??? Yes! Could, but it's easier to define here...
 //#define LOG_UNMAPPED_MEMORY_ACCESSES
 //#define ABORT_ON_UNMAPPED_MEMORY_ACCESS
-#define ABORT_ON_ILLEGAL_INSTRUCTIONS
+//#define ABORT_ON_ILLEGAL_INSTRUCTIONS
 //#define ABORT_ON_OFFICIAL_ILLEGAL_INSTRUCTION
 #define CPU_DEBUG_MEMORY
 
@@ -1207,7 +1207,7 @@ unsigned jaguar_unknown_readword(unsigned address, uint32 who/*=UNKNOWN*/)
 //
 // Disassemble M68K instructions at the given offset
 //
-
+#ifdef USE_MUSASHI
 unsigned int m68k_read_disassembler_8(unsigned int address)
 {
 	return m68k_read_memory_8(address);
@@ -1222,6 +1222,7 @@ unsigned int m68k_read_disassembler_32(unsigned int address)
 {
 	return m68k_read_memory_32(address);
 }
+#endif
 
 void JaguarDasm(uint32 offset, uint32 qt)
 {
@@ -1497,6 +1498,10 @@ void JaguarInit(void)
 	memset(jaguarMainROM, 0x01, 0x600000);	// & set it to all 01s...
 //	memset(jaguar_mainRom, 0xFF, 0x600000);	// & set it to all Fs...
 
+#ifndef USE_MUSASHI
+	jag_memory_handler_init();
+	init_m68k();
+#endif
 	m68k_set_cpu_type(M68K_CPU_TYPE_68000);
 	GPUInit();
 	DSPInit();
@@ -1523,7 +1528,7 @@ void JaguarReset(void)
 	GPUReset();
 	DSPReset();
 	CDROMReset();
-    m68k_pulse_reset();								// Reset the 68000
+	m68k_pulse_reset();				// Reset the 68000
 	WriteLog("Jaguar: 68K reset. PC=%06X SP=%08X\n", m68k_get_reg(NULL, M68K_REG_PC), m68k_get_reg(NULL, M68K_REG_A7));
 
 	// New timer base code stuffola...
diff --git a/src/jaguar/m68k.h b/src/jaguar/m68k.h
new file mode 100644
index 00000000..b9bc8f4b
--- /dev/null
+++ b/src/jaguar/m68k.h
@@ -0,0 +1,108 @@
+/*
+  Hatari - m68k.h
+
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
+
+  Glue code for connecting the Jaguar code with the UAE CPU core
+*/
+
+#ifndef JAG_M68K_H
+#define JAG_M68K_H
+
+#include "../cpu/sysdeps.h"
+#include "../cpu/newcpu.h"
+#include "../cpu/disasm.h"
+#include "../cpu/options_cpu.h"
+#include "../cpu/hatari-glue.h"
+#include "../includes/m68000.h"
+#include "../includes/configuration.h"
+
+#define M68K_CPU_TYPE_68000 68000
+
+typedef enum
+{
+	M68K_REG_D0,
+	M68K_REG_D1,
+	M68K_REG_D2,
+	M68K_REG_D3,
+	M68K_REG_D4,
+	M68K_REG_D5,
+	M68K_REG_D6,
+	M68K_REG_D7,
+	M68K_REG_A0,
+	M68K_REG_A1,
+	M68K_REG_A2,
+	M68K_REG_A3,
+	M68K_REG_A4,
+	M68K_REG_A5,
+	M68K_REG_A6,
+	M68K_REG_A7,
+	M68K_REG_PC,
+} m68k_register_t;
+
+static inline unsigned int m68k_get_reg(void* context, int reg)
+{
+	switch (reg)
+	{
+	 case M68K_REG_D0 ... M68K_REG_A7:
+		return regs.regs[reg];
+	 case M68K_REG_PC:
+		return m68k_getpc() & 0xffffff;
+	 default:
+		fprintf(stderr, "m68k_get_reg() failed: %i\n", reg);
+		return -1U;
+	}
+}
+
+static inline unsigned int m68k_disassemble(char *buf, unsigned int pc, int cpu_type)
+{
+	uaecptr nextpc;
+	m68k_disasm_2(buf, 128, pc, NULL, 0, &nextpc, 1, NULL, NULL, 0xffffffff, 0);
+	return nextpc - pc;
+}
+
+static inline void m68k_set_irq(unsigned int int_level)
+{
+	/* Jaguar only has one autovector 68k interrupt */
+	if (int_level)
+		pendingInterrupts |= PENDING_IRQ_JAGUAR;
+	else
+		pendingInterrupts &= PENDING_IRQ_JAGUAR;
+
+	doint();
+}
+
+static inline void m68k_set_cpu_type(unsigned int cpu_type)
+{
+	changed_prefs.cpu_model = cpu_type;
+
+	changed_prefs.cpu_compatible = ConfigureParams.System.bCompatibleCpu = true;
+	changed_prefs.cpu_cycle_exact = ConfigureParams.System.bCycleExactCpu = false;
+	changed_prefs.cpu_memory_cycle_exact = ConfigureParams.System.bCycleExactCpu = false;
+	changed_prefs.address_space_24 = ConfigureParams.System.bAddressSpace24 = true;
+	changed_prefs.fpu_model = 0;
+
+	check_prefs_changed_cpu();
+}
+
+static inline void m68k_execute(int num_cycles)
+{
+	M68000_UnsetSpecial(SPCFLAG_BRK);
+	if (quit_program == UAE_QUIT)
+		quit_program = 0;
+	CycInt_AddAbsoluteInterrupt(num_cycles, INT_CPU_CYCLE, INTERRUPT_M68K_GO);
+	m68k_go(true);
+}
+
+#define m68k_pulse_reset() M68000_Reset(true)
+#define m68k_end_timeslice() M68000_EndTimeSlice()
+
+unsigned int  m68k_read_memory_8(unsigned int address);
+unsigned int  m68k_read_memory_16(unsigned int address);
+unsigned int  m68k_read_memory_32(unsigned int address);
+void m68k_write_memory_8(unsigned int address, unsigned int value);
+void m68k_write_memory_16(unsigned int address, unsigned int value);
+void m68k_write_memory_32(unsigned int address, unsigned int value);
+
+#endif
-- 
2.48.1


--MP_/VkVZp1l8MIESxWVe2vPSxV2
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename=0015-Add-a-main-loop-for-running-the-Jaguar-emulation.patch