X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.cpp;h=cfbf3ef134ae8861070b4fc0f88895407108b331;hb=f0a806e6b168b1c9cab5c9d7a27435dc4a76476a;hp=b92b2215e4cdd650b9c48dfedf8a340041a492a7;hpb=25646c0a48be1832e20fd4fcdd2d40ba2174bfa3;p=virtualjaguar

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index b92b221..cfbf3ef 100644
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -45,6 +45,7 @@
 #define CPU_DEBUG_MEMORY
 //#define LOG_CD_BIOS_CALLS
 #define CPU_DEBUG_TRACING
+#define ALPINE_FUNCTIONS
 
 // Private function prototypes
 
@@ -99,6 +100,11 @@ uint32_t d7Queue[0x400];
 uint32_t pcQPtr = 0;
 bool startM68KTracing = false;
 
+// Breakpoint on memory access vars (exported)
+bool bpmActive = false;
+uint32_t bpmAddress1;
+
+
 //
 // Callback function to detect illegal instructions
 //
@@ -860,27 +866,33 @@ WriteLog("JERRY: (68K int en/lat - Unhandled!) Tried to write $%02X to $%08X!\n"
 		;	// Do nothing
 }
 
+
 void WriteWord(uint32_t adddress, uint16_t word)
 {
 }
 
+
 void WriteDWord(uint32_t adddress, uint32_t dword)
 {
 }
 
+
 uint8_t ReadByte(uint32_t adddress)
 {
 }
 
+
 uint16_t ReadWord(uint32_t adddress)
 {
 }
 
+
 uint32_t ReadDWord(uint32_t adddress)
 {
 }
 #endif
 
+
 void ShowM68KContext(void)
 {
 	printf("\t68K PC=%06X\n", m68k_get_reg(NULL, M68K_REG_PC));
@@ -914,6 +926,7 @@ void ShowM68KContext(void)
 	while (disPC < (currpc + 10));
 }
 
+
 //
 // Custom UAE 68000 read/write/IRQ functions
 //
@@ -1005,10 +1018,17 @@ int irq_ack_handler(int level)
 	return M68K_INT_ACK_AUTOVECTOR;
 }
 
+
 //#define USE_NEW_MMU
 
 unsigned int m68k_read_memory_8(unsigned int address)
 {
+#ifdef ALPINE_FUNCTIONS
+	// Check if breakpoint on memory is active, and deal with it
+	if (bpmActive && address == bpmAddress1)
+		M68KSetHalt();
+#endif
+
 	// Musashi does this automagically for you, UAE core does not :-P
 	address &= 0x00FFFFFF;
 #ifdef CPU_DEBUG_MEMORY
@@ -1056,11 +1076,18 @@ unsigned int m68k_read_memory_8(unsigned int address)
 #endif
 }
 
+
 void gpu_dump_disassembly(void);
 void gpu_dump_registers(void);
 
 unsigned int m68k_read_memory_16(unsigned int address)
 {
+#ifdef ALPINE_FUNCTIONS
+	// Check if breakpoint on memory is active, and deal with it
+	if (bpmActive && address == bpmAddress1)
+		M68KSetHalt();
+#endif
+
 	// Musashi does this automagically for you, UAE core does not :-P
 	address &= 0x00FFFFFF;
 #ifdef CPU_DEBUG_MEMORY
@@ -1160,8 +1187,15 @@ unsigned int m68k_read_memory_16(unsigned int address)
 #endif
 }
 
+
 unsigned int m68k_read_memory_32(unsigned int address)
 {
+#ifdef ALPINE_FUNCTIONS
+	// Check if breakpoint on memory is active, and deal with it
+	if (bpmActive && address == bpmAddress1)
+		M68KSetHalt();
+#endif
+
 	// Musashi does this automagically for you, UAE core does not :-P
 	address &= 0x00FFFFFF;
 //; So, it seems that it stores the returned DWORD at $51136 and $FB074.
@@ -1176,8 +1210,15 @@ unsigned int m68k_read_memory_32(unsigned int address)
 #endif
 }
 
+
 void m68k_write_memory_8(unsigned int address, unsigned int value)
 {
+#ifdef ALPINE_FUNCTIONS
+	// Check if breakpoint on memory is active, and deal with it
+	if (bpmActive && address == bpmAddress1)
+		M68KSetHalt();
+#endif
+
 	// Musashi does this automagically for you, UAE core does not :-P
 	address &= 0x00FFFFFF;
 #ifdef CPU_DEBUG_MEMORY
@@ -1226,8 +1267,15 @@ void m68k_write_memory_8(unsigned int address, unsigned int value)
 #endif
 }
 
+
 void m68k_write_memory_16(unsigned int address, unsigned int value)
 {
+#ifdef ALPINE_FUNCTIONS
+	// Check if breakpoint on memory is active, and deal with it
+	if (bpmActive && address == bpmAddress1)
+		M68KSetHalt();
+#endif
+
 	// Musashi does this automagically for you, UAE core does not :-P
 	address &= 0x00FFFFFF;
 #ifdef CPU_DEBUG_MEMORY
@@ -1314,8 +1362,15 @@ if (address == 0xF02110)
 #endif
 }
 
+
 void m68k_write_memory_32(unsigned int address, unsigned int value)
 {
+#ifdef ALPINE_FUNCTIONS
+	// Check if breakpoint on memory is active, and deal with it
+	if (bpmActive && address == bpmAddress1)
+		M68KSetHalt();
+#endif
+
 	// Musashi does this automagically for you, UAE core does not :-P
 	address &= 0x00FFFFFF;
 /*if (address == 0x4E00)
@@ -1354,12 +1409,14 @@ uint32_t JaguarGetHandler(uint32_t i)
 	return JaguarReadLong(i * 4);
 }
 
+
 bool JaguarInterruptHandlerIsValid(uint32_t i) // Debug use only...
 {
 	uint32_t handler = JaguarGetHandler(i);
 	return (handler && (handler != 0xFFFFFFFF) ? true : false);
 }
 
+
 void M68K_show_context(void)
 {
 	WriteLog("68K PC=%06X\n", m68k_get_reg(NULL, M68K_REG_PC));
@@ -1412,6 +1469,7 @@ void M68K_show_context(void)
 	}
 }
 
+
 //
 // Unknown read/write byte/word routines
 //
@@ -1446,6 +1504,7 @@ void jaguar_unknown_writebyte(unsigned address, unsigned data, uint32_t who/*=UN
 #endif
 }
 
+
 void jaguar_unknown_writeword(unsigned address, unsigned data, uint32_t who/*=UNKNOWN*/)
 {
 #ifdef LOG_UNMAPPED_MEMORY_ACCESSES
@@ -1460,6 +1519,7 @@ void jaguar_unknown_writeword(unsigned address, unsigned data, uint32_t who/*=UN
 #endif
 }
 
+
 unsigned jaguar_unknown_readbyte(unsigned address, uint32_t who/*=UNKNOWN*/)
 {
 #ifdef LOG_UNMAPPED_MEMORY_ACCESSES
@@ -1475,6 +1535,7 @@ unsigned jaguar_unknown_readbyte(unsigned address, uint32_t who/*=UNKNOWN*/)
     return 0xFF;
 }
 
+
 unsigned jaguar_unknown_readword(unsigned address, uint32_t who/*=UNKNOWN*/)
 {
 #ifdef LOG_UNMAPPED_MEMORY_ACCESSES
@@ -1490,6 +1551,7 @@ unsigned jaguar_unknown_readword(unsigned address, uint32_t who/*=UNKNOWN*/)
     return 0xFFFF;
 }
 
+
 //
 // Disassemble M68K instructions at the given offset
 //
@@ -1499,16 +1561,19 @@ unsigned int m68k_read_disassembler_8(unsigned int address)
 	return m68k_read_memory_8(address);
 }
 
+
 unsigned int m68k_read_disassembler_16(unsigned int address)
 {
 	return m68k_read_memory_16(address);
 }
 
+
 unsigned int m68k_read_disassembler_32(unsigned int address)
 {
 	return m68k_read_memory_32(address);
 }
 
+
 void JaguarDasm(uint32_t offset, uint32_t qt)
 {
 #ifdef CPU_DEBUG
@@ -1530,6 +1595,7 @@ void JaguarDasm(uint32_t offset, uint32_t qt)
 #endif
 }
 
+
 uint8_t JaguarReadByte(uint32_t offset, uint32_t who/*=UNKNOWN*/)
 {
 	uint8_t data = 0x00;
@@ -1556,6 +1622,7 @@ uint8_t JaguarReadByte(uint32_t offset, uint32_t who/*=UNKNOWN*/)
 	return data;
 }
 
+
 uint16_t JaguarReadWord(uint32_t offset, uint32_t who/*=UNKNOWN*/)
 {
 	offset &= 0xFFFFFF;
@@ -1585,6 +1652,7 @@ uint16_t JaguarReadWord(uint32_t offset, uint32_t who/*=UNKNOWN*/)
 	return jaguar_unknown_readword(offset, who);
 }
 
+
 void JaguarWriteByte(uint32_t offset, uint8_t data, uint32_t who/*=UNKNOWN*/)
 {
 /*	if (offset >= 0x4E00 && offset < 0x4E04)
@@ -1621,6 +1689,7 @@ void JaguarWriteByte(uint32_t offset, uint8_t data, uint32_t who/*=UNKNOWN*/)
 	jaguar_unknown_writebyte(offset, data, who);
 }
 
+
 uint32_t starCount;
 void JaguarWriteWord(uint32_t offset, uint16_t data, uint32_t who/*=UNKNOWN*/)
 {
@@ -1756,12 +1825,14 @@ if (offset == 0x11D31A + 0x48000 || offset == 0x11D31A)
 	jaguar_unknown_writeword(offset, data, who);
 }
 
+
 // We really should re-do this so that it does *real* 32-bit access... !!! FIX !!!
 uint32_t JaguarReadLong(uint32_t offset, uint32_t who/*=UNKNOWN*/)
 {
 	return (JaguarReadWord(offset, who) << 16) | JaguarReadWord(offset+2, who);
 }
 
+
 // We really should re-do this so that it does *real* 32-bit access... !!! FIX !!!
 void JaguarWriteLong(uint32_t offset, uint32_t data, uint32_t who/*=UNKNOWN*/)
 {
@@ -1778,18 +1849,21 @@ void JaguarWriteLong(uint32_t offset, uint32_t data, uint32_t who/*=UNKNOWN*/)
 	JaguarWriteWord(offset+2, data & 0xFFFF, who);
 }
 
+
 void JaguarSetScreenBuffer(uint32_t * buffer)
 {
 	// This is in TOM, but we set it here...
 	screenBuffer = buffer;
 }
 
+
 void JaguarSetScreenPitch(uint32_t pitch)
 {
 	// This is in TOM, but we set it here...
 	screenPitch = pitch;
 }
 
+
 //
 // Jaguar console initialization
 //