X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=m68kcpu.c;h=ce9958e04cbca5d7416429dd06a225fd170dd81f;hb=5a120a647d9befd58710b38b65a13e06826ff6e8;hp=293f937175d4aaaa4530fd938f0ed7991c05ed34;hpb=6c9276f882444e8f164bed4e642fbf3cbb259971;p=pistorm

diff --git a/m68kcpu.c b/m68kcpu.c
index 293f937..ce9958e 100644
--- a/m68kcpu.c
+++ b/m68kcpu.c
@@ -40,7 +40,7 @@
 
 extern void m68040_fpu_op0(void);
 extern void m68040_fpu_op1(void);
-extern void m68881_mmu_ops();
+extern void m68851_mmu_ops();
 extern unsigned char m68ki_cycles[][0x10000];
 extern void (*m68ki_instruction_jump_table[0x10000])(void); /* opcode handler jump table */
 extern void m68ki_build_opcode_table(void);
@@ -145,8 +145,8 @@ const uint8 m68ki_exception_cycle_table[5][256] =
 		 34, /*  7: TRAPV                                              */
 		 34, /*  8: Privilege Violation                                */
 		 34, /*  9: Trace                                              */
-		 34, /* 10: 1010                                               */
-		 34, /* 11: 1111                                               */
+		  4, /* 10: 1010                                               */
+		  4, /* 11: 1111                                               */
 		  4, /* 12: RESERVED                                           */
 		  4, /* 13: Coprocessor Protocol Violation        (unemulated) */
 		  4, /* 14: Format Error                                       */
@@ -635,11 +635,11 @@ unsigned int m68k_get_reg(void* context, m68k_register_t regnum)
 		case M68K_REG_A6:	return cpu->dar[14];
 		case M68K_REG_A7:	return cpu->dar[15];
 		case M68K_REG_PC:	return MASK_OUT_ABOVE_32(cpu->pc);
-		case M68K_REG_SR:	return	cpu->t1_flag						|
-									cpu->t0_flag						|
+		case M68K_REG_SR:	return	cpu->t1_flag					|
+									cpu->t0_flag							|
 									(cpu->s_flag << 11)					|
 									(cpu->m_flag << 11)					|
-									cpu->int_mask						|
+									cpu->int_mask							|
 									((cpu->x_flag & XFLAG_SET) >> 4)	|
 									((cpu->n_flag & NFLAG_SET) >> 4)	|
 									((!cpu->not_z_flag) << 2)			|
@@ -663,8 +663,12 @@ unsigned int m68k_get_reg(void* context, m68k_register_t regnum)
 			{
 				case CPU_TYPE_000:		return (unsigned int)M68K_CPU_TYPE_68000;
 				case CPU_TYPE_010:		return (unsigned int)M68K_CPU_TYPE_68010;
-				case CPU_TYPE_EC020:	return (unsigned int)M68K_CPU_TYPE_68EC020;
+				case CPU_TYPE_EC020:		return (unsigned int)M68K_CPU_TYPE_68EC020;
 				case CPU_TYPE_020:		return (unsigned int)M68K_CPU_TYPE_68020;
+				case CPU_TYPE_EC030:		return (unsigned int)M68K_CPU_TYPE_68EC030;
+				case CPU_TYPE_030:		return (unsigned int)M68K_CPU_TYPE_68030;
+				case CPU_TYPE_EC040:		return (unsigned int)M68K_CPU_TYPE_68EC040;
+				case CPU_TYPE_LC040:		return (unsigned int)M68K_CPU_TYPE_68LC040;
 				case CPU_TYPE_040:		return (unsigned int)M68K_CPU_TYPE_68040;
 			}
 			return M68K_CPU_TYPE_INVALID;
@@ -986,9 +990,6 @@ int m68k_execute(int num_cycles)
 		/* Main loop.  Keep going until we run out of clock cycles */
 		do
 		{
-#ifdef M68K_BUSERR_THING
-			int i;
-#endif
 			/* Set tracing accodring to T1. (T0 is done inside instruction) */
 			m68ki_trace_t1(); /* auto-disable (see m68kcpu.h) */
 
@@ -1002,8 +1003,9 @@ int m68k_execute(int num_cycles)
 			REG_PPC = REG_PC;
 
 			/* Record previous D/A register state (in case of bus error) */
+//#define M68K_BUSERR_THING
 #ifdef M68K_BUSERR_THING
-			for (i = 15; i >= 0; i--){
+			for (int i = 15; i >= 0; i--){
 				REG_DA_SAVE[i] = REG_DA[i];
 			}
 #endif
@@ -1096,7 +1098,7 @@ void m68k_init(void)
 
 	/* The first call to this function initializes the opcode handler jump table */
 	if(!emulation_initialized)
-		{
+	{
 		m68ki_build_opcode_table();
 		emulation_initialized = 1;
 	}
@@ -1122,8 +1124,13 @@ void m68k_pulse_bus_error(void)
 /* Pulse the RESET line on the CPU */
 void m68k_pulse_reset(void)
 {
-	/* Disable the PMMU on reset */
+	/* Disable the PMMU/HMMU on reset, if any */
 	m68ki_cpu.pmmu_enabled = 0;
+//	m68ki_cpu.hmmu_enabled = 0;
+
+	m68ki_cpu.mmu_tc = 0;
+	m68ki_cpu.mmu_tt0 = 0;
+	m68ki_cpu.mmu_tt1 = 0;
 
 	/* Clear all stop levels and eat up all remaining cycles */
 	CPU_STOPPED = 0;
@@ -1152,13 +1159,19 @@ void m68k_pulse_reset(void)
 
 	/* Read the initial stack pointer and program counter */
 	m68ki_jump(0);
-	REG_SP = m68ki_read_imm_32();
-	REG_PC = m68ki_read_imm_32();
-	m68ki_jump(REG_PC);
 
 	CPU_RUN_MODE = RUN_MODE_NORMAL;
 
 	RESET_CYCLES = CYC_EXCEPTION[EXCEPTION_RESET];
+
+	/* flush the MMU's cache */
+	pmmu_atc_flush();
+
+	if(CPU_TYPE_IS_EC020_PLUS(CPU_TYPE))
+	{
+		// clear instruction cache
+		m68ki_ic_clear();
+	}
 }
 
 /* Pulse the HALT line on the CPU */
@@ -1320,6 +1333,21 @@ void m68k_add_rom_range(uint32_t addr, uint32_t upper, unsigned char *ptr)
 	}
 }
 
+void m68k_clear_ranges()
+{
+	printf("[MUSASHI] Clearing all reads/write memory ranges.\n");
+	for (int i = 0; i < 8; i++) {
+		read_upper[i] = 0;
+		read_addr[i] = 0;
+		read_data[i] = NULL;
+		write_upper[i] = 0;
+		write_addr[i] = 0;
+		write_data[i] = NULL;
+	}
+	write_ranges = 0;
+	read_ranges = 0;
+}
+
 /* ======================================================================== */
 /* ============================== MAME STUFF ============================== */
 /* ======================================================================== */