X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=m68kcpu.h;h=d087d6260c09ce93622c7eedd60522d8d64ec391;hb=0f1660674993f59a6a96e591bfb5a978ad0dd5df;hp=923f143b49d2c64c02dcdee6aff4e1e8a0a81a76;hpb=e48448eff93e43846f73e0a73e02d5dc88a34eac;p=pistorm

diff --git a/m68kcpu.h b/m68kcpu.h
index 923f143..d087d62 100644
--- a/m68kcpu.h
+++ b/m68kcpu.h
@@ -43,6 +43,7 @@ extern "C" {
 #include <endian.h>
 
 #include <setjmp.h>
+#include <stdio.h>
 
 /* ======================================================================== */
 /* ==================== ARCHITECTURE-DEPENDANT DEFINES ==================== */
@@ -667,6 +668,7 @@ extern jmp_buf m68ki_aerr_trap;
 			longjmp(m68ki_aerr_trap, 1); \
 		}
 #endif
+	#define m68ki_bus_error(ADDR,WRITE_MODE) m68ki_aerr_address=ADDR;m68ki_aerr_write_mode=WRITE_MODE;m68ki_exception_bus_error()
 
 	#define m68ki_check_address_error_010_less(ADDR, WRITE_MODE, FC) \
 		if (CPU_TYPE_IS_010_LESS(CPU_TYPE)) \
@@ -682,12 +684,12 @@ extern jmp_buf m68ki_aerr_trap;
 /* Logging */
 #if M68K_LOG_ENABLE
 	#include <stdio.h>
-	extern FILE* M68K_LOG_FILEHANDLE
+//	extern FILE* M68K_LOG_FILEHANDLE;
 	extern const char *const m68ki_cpu_names[];
 
-	#define M68K_DO_LOG(A) if(M68K_LOG_FILEHANDLE) fprintf A
+	#define M68K_DO_LOG(A) do{printf("*************");printf A;}while(0) //if(M68K_LOG_FILEHANDLE) fprintf A
 	#if M68K_LOG_1010_1111
-		#define M68K_DO_LOG_EMU(A) if(M68K_LOG_FILEHANDLE) fprintf A
+		#define M68K_DO_LOG_EMU(A) printf A //if(M68K_LOG_FILEHANDLE) fprintf A
 	#else
 		#define M68K_DO_LOG_EMU(A)
 	#endif
@@ -1152,6 +1154,14 @@ static inline uint32 m68ki_ic_readimm16(uint32 address)
  */
 static inline uint m68ki_read_imm_16(void)
 {
+	uint32_t address = ADDRESS_68K(REG_PC);
+	for (int i = 0; i < read_ranges; i++) {
+		if(address >= read_addr[i] && address < read_upper[i]) {
+			REG_PC += 2;
+			return be16toh(((unsigned short *)(read_data[i] + (address - read_addr[i])))[0]);
+		}
+	}
+
 	m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
 	m68ki_cpu.mmu_tmp_fc = FLAG_S | FUNCTION_CODE_USER_PROGRAM;
 	m68ki_cpu.mmu_tmp_rw = 1;
@@ -1178,16 +1188,8 @@ static inline uint m68ki_read_imm_16(void)
 	return result;
 }
 #else
-
-	uint32_t address = ADDRESS_68K(REG_PC);
 	REG_PC += 2;
 
-	for (int i = 0; i < read_ranges; i++) {
-		if(address >= read_addr[i] && address < read_upper[i]) {
-			return be16toh(((unsigned short *)(read_data[i] + (address - read_addr[i])))[0]);
-		}
-	}
-
 	return m68k_read_immediate_16(address);
 #endif /* M68K_EMULATE_PREFETCH */
 }
@@ -1206,6 +1208,13 @@ static inline uint m68ki_read_imm_32(void)
 //	    address = pmmu_translate_addr(address,1);
 #endif
 #endif
+	uint32_t address = ADDRESS_68K(REG_PC);
+	for (int i = 0; i < read_ranges; i++) {
+		if(address >= read_addr[i] && address < read_upper[i]) {
+			REG_PC += 4;
+			return be32toh(((unsigned int *)(read_data[i] + (address - read_addr[i])))[0]);
+		}
+	}
 
 #if M68K_EMULATE_PREFETCH
 	uint temp_val;
@@ -1233,15 +1242,7 @@ static inline uint m68ki_read_imm_32(void)
 
 	return temp_val;
 #else
-	m68ki_set_fc(FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
-	m68ki_check_address_error(REG_PC, MODE_READ, FLAG_S | FUNCTION_CODE_USER_PROGRAM); /* auto-disable (see m68kcpu.h) */
-	uint32_t address = ADDRESS_68K(REG_PC);
 	REG_PC += 4;
-	for (int i = 0; i < read_ranges; i++) {
-		if(address >= read_addr[i] && address < read_upper[i]) {
-			return be32toh(((unsigned int *)(read_data[i] + (address - read_addr[i])))[0]);
-		}
-	}
 
 	return m68k_read_immediate_32(address);
 #endif /* M68K_EMULATE_PREFETCH */
@@ -2279,13 +2280,32 @@ static inline void m68ki_exception_address_error(void)
 		CPU_STOPPED = STOP_LEVEL_HALT;
 		return;
 	}
-	CPU_RUN_MODE = RUN_MODE_BERR_AERR_RESET;
 
-	/* Note: This is implemented for 68000 only! */
-	m68ki_stack_frame_buserr(sr);
+	CPU_RUN_MODE = RUN_MODE_BERR_AERR_RESET_WSF;
+
+	if (CPU_TYPE_IS_000(CPU_TYPE))
+	{
+		/* Note: This is implemented for 68000 only! */
+		m68ki_stack_frame_buserr(sr);
+	}
+	else if (CPU_TYPE_IS_010(CPU_TYPE))
+	{
+		/* only the 68010 throws this unique type-1000 frame */
+		m68ki_stack_frame_1000(REG_PPC, sr, EXCEPTION_BUS_ERROR);
+	}
+	else if (m68ki_cpu.mmu_tmp_buserror_address == REG_PPC)
+	{
+		m68ki_stack_frame_1010(sr, EXCEPTION_BUS_ERROR, REG_PPC, m68ki_cpu.mmu_tmp_buserror_address);
+	}
+	else
+	{
+		m68ki_stack_frame_1011(sr, EXCEPTION_BUS_ERROR, REG_PPC, m68ki_cpu.mmu_tmp_buserror_address);
+	}
 
 	m68ki_jump_vector(EXCEPTION_ADDRESS_ERROR);
 
+	m68ki_cpu.run_mode = RUN_MODE_BERR_AERR_RESET;
+
 	/* Use up some clock cycles. Note that we don't need to undo the
 	instruction's cycles here as we've longjmp:ed directly from the
 	instruction handler without passing the part of the excecute loop