X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.cpp;h=6dbb14edabb0ab0eef87ef78375e2f3cd3fb36a5;hb=a1ad40785ac6d954051e4e5882436da9a58cc3a6;hp=a6582662267b06f29812241949d27843e1d2dff5;hpb=7b8f7a2f13727201b2e6b6bcdbe60e31e56cfcd9;p=virtualjaguar diff --git a/src/jaguar.cpp b/src/jaguar.cpp index a658266..6dbb14e 100644 --- a/src/jaguar.cpp +++ b/src/jaguar.cpp @@ -1,7 +1,7 @@ // // JAGUAR.CPP // -// by cal2 +// by Cal2 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS) // Cleanups and endian wrongness amelioration by James L. Hammons // Note: Endian wrongness probably stems from the MAME origins of this emu and @@ -9,52 +9,132 @@ // #include "jaguar.h" +#include "video.h" +#include "settings.h" //#include "m68kdasmAG.h" -//#define LOG_UNMAPPED_MEMORY_ACCESSES -//#define SOUND_OUTPUT #define CPU_DEBUG -#define JAGUAR_WIP_RELEASE //Do this in makefile??? Yes! Could, but it's easier to define here... -//#define LOG_UNMAPPED_MEMORY_ACCESSES +#define LOG_UNMAPPED_MEMORY_ACCESSES +#define CPU_DEBUG_MEMORY // Private function prototypes -unsigned jaguar_unknown_readbyte(unsigned address); -unsigned jaguar_unknown_readword(unsigned address); -void jaguar_unknown_writebyte(unsigned address, unsigned data); -void jaguar_unknown_writeword(unsigned address, unsigned data); +unsigned jaguar_unknown_readbyte(unsigned address, uint32 who = UNKNOWN); +unsigned jaguar_unknown_readword(unsigned address, uint32 who = UNKNOWN); +void jaguar_unknown_writebyte(unsigned address, unsigned data, uint32 who = UNKNOWN); +void jaguar_unknown_writeword(unsigned address, unsigned data, uint32 who = UNKNOWN); void M68K_show_context(void); // External variables -extern bool hardwareTypeNTSC; // Set to false for PAL +//extern bool hardwareTypeNTSC; // Set to false for PAL +#ifdef CPU_DEBUG_MEMORY +extern bool startMemLog; // Set by "e" key +extern int effect_start; +extern int effect_start2, effect_start3, effect_start4, effect_start5, effect_start6; +#endif + +// Memory debugging identifiers -// These values are overridden by command line switches... +char * whoName[9] = + { "Unknown", "Jaguar", "DSP", "GPU", "TOM", "JERRY", "M68K", "Blitter", "OP" }; -bool dsp_enabled = false; -bool jaguar_use_bios = true; // Default is now to USE the BIOS uint32 jaguar_active_memory_dumps = 0; uint32 jaguar_mainRom_crc32; -static uint32 m68k_cycles_per_scanline; -static uint32 gpu_cycles_per_scanline; -static uint32 dsp_cycles_per_scanline; -static uint32 jaguar_screen_scanlines; - /*static*/ uint8 * jaguar_mainRam = NULL; /*static*/ uint8 * jaguar_bootRom = NULL; /*static*/ uint8 * jaguar_mainRom = NULL; +#ifdef CPU_DEBUG_MEMORY +uint8 writeMemMax[0x400000], writeMemMin[0x400000]; +uint8 readMem[0x400000]; +uint32 returnAddr[4000], raPtr = 0xFFFFFFFF; +#endif + +uint32 pcQueue[0x400]; +uint32 pcQPtr = 0; // // Callback function to detect illegal instructions // +//void GPUDumpDisassembly(void); +//void GPUDumpRegisters(void); void M68KInstructionHook(void) { uint32 m68kPC = m68k_get_reg(NULL, M68K_REG_PC); +// For tracebacks... +// Ideally, we'd save all the registers as well... + pcQueue[pcQPtr++] = m68kPC; + pcQPtr &= 0x3FF; + + if (m68kPC & 0x01) // Oops! We're fetching an odd address! + { + WriteLog("M68K: Attempted to execute from an odd adress!\n\nBacktrace:\n\n"); + + static char buffer[2048]; + for(int i=0; i<0x400; i++) + { + m68k_disassemble(buffer, pcQueue[(pcQPtr + i) & 0x3FF], M68K_CPU_TYPE_68000); + WriteLog("\t%08X: %s\n", pcQueue[(pcQPtr + i) & 0x3FF], buffer); + } + WriteLog("\n"); + + uint32 topOfStack = m68k_get_reg(NULL, M68K_REG_A7); + WriteLog("M68K: Top of stack: %08X. Stack trace:\n", JaguarReadLong(topOfStack)); + for(int i=0; i<10; i++) + WriteLog("%06X: %08X\n", topOfStack - (i * 4), JaguarReadLong(topOfStack - (i * 4))); + WriteLog("Jaguar: VBL interrupt is %s\n", ((tom_irq_enabled(IRQ_VBLANK)) && (jaguar_interrupt_handler_is_valid(64))) ? "enabled" : "disabled"); + M68K_show_context(); + log_done(); + exit(0); + } + +/* if (m68kPC >= 0x807EC4 && m68kPC <= 0x807EDB) + { + static char buffer[2048]; + m68k_disassemble(buffer, m68kPC, M68K_CPU_TYPE_68000); + WriteLog("%08X: %s", m68kPC, buffer); + WriteLog("\t\tA0=%08X, A1=%08X, D0=%08X, D1=%08X\n", + m68k_get_reg(NULL, M68K_REG_A0), m68k_get_reg(NULL, M68K_REG_A1), + m68k_get_reg(NULL, M68K_REG_D0), m68k_get_reg(NULL, M68K_REG_D1)); + }//*/ +/* if (m68kPC == 0x8D0E48 && effect_start5) + { + WriteLog("\nM68K: At collision detection code. Exiting!\n\n"); + GPUDumpRegisters(); + GPUDumpDisassembly(); + log_done(); + exit(0); + }//*/ +/* uint16 opcode = JaguarReadWord(m68kPC); + if (opcode == 0x4E75) // RTS + { + if (startMemLog) +// WriteLog("Jaguar: Returning from subroutine to %08X\n", JaguarReadLong(m68k_get_reg(NULL, M68K_REG_A7))); + { + uint32 addr = JaguarReadLong(m68k_get_reg(NULL, M68K_REG_A7)); + bool found = false; + if (raPtr != 0xFFFFFFFF) + { + for(uint32 i=0; i<=raPtr; i++) + { + if (returnAddr[i] == addr) + { + found = true; + break; + } + } + } + + if (!found) + returnAddr[++raPtr] = addr; + } + }//*/ + /* static char buffer[2048]; m68k_disassemble(buffer, m68kPC, M68K_CPU_TYPE_68000); WriteLog("%08X: %s \t\tD0=%08X, A0=%08X\n", m68kPC, buffer, m68k_get_reg(NULL, M68K_REG_D0), m68k_get_reg(NULL, M68K_REG_A0));//*/ @@ -62,26 +142,26 @@ void M68KInstructionHook(void) /* if (m68kPC == 0x803F16) { WriteLog("M68K: Registers found at $803F16:\n"); - WriteLog( "\t68K PC=%06X\n", m68k_get_reg(NULL, M68K_REG_PC)); + WriteLog("\t68K PC=%06X\n", m68k_get_reg(NULL, M68K_REG_PC)); for(int i=M68K_REG_D0; i<=M68K_REG_D7; i++) - WriteLog( "\tD%i = %08X\n", i-M68K_REG_D0, m68k_get_reg(NULL, (m68k_register_t)i)); - WriteLog( "\n"); + WriteLog("\tD%i = %08X\n", i-M68K_REG_D0, m68k_get_reg(NULL, (m68k_register_t)i)); + WriteLog("\n"); for(int i=M68K_REG_A0; i<=M68K_REG_A7; i++) - WriteLog( "\tA%i = %08X\n", i-M68K_REG_A0, m68k_get_reg(NULL, (m68k_register_t)i)); + WriteLog("\tA%i = %08X\n", i-M68K_REG_A0, m68k_get_reg(NULL, (m68k_register_t)i)); }*/ - if (!m68k_is_valid_instruction(jaguar_word_read(m68kPC), M68K_CPU_TYPE_68000)) + if (!m68k_is_valid_instruction(m68k_read_memory_16(m68kPC), M68K_CPU_TYPE_68000)) { - WriteLog("\nEncountered illegal instruction at %08X!!!\n\nAborting!\n", m68kPC); + WriteLog("\nM68K encountered an illegal instruction at %08X!!!\n\nAborting!\n", m68kPC); uint32 topOfStack = m68k_get_reg(NULL, M68K_REG_A7); - WriteLog("M68K: Top of stack: %08X. Stack trace:\n", jaguar_long_read(topOfStack)); + WriteLog("M68K: Top of stack: %08X. Stack trace:\n", JaguarReadLong(topOfStack)); for(int i=0; i<10; i++) - WriteLog("%06X: %08X\n", topOfStack - (i * 4), jaguar_long_read(topOfStack - (i * 4))); + WriteLog("%06X: %08X\n", topOfStack - (i * 4), JaguarReadLong(topOfStack - (i * 4))); WriteLog("Jaguar: VBL interrupt is %s\n", ((tom_irq_enabled(IRQ_VBLANK)) && (jaguar_interrupt_handler_is_valid(64))) ? "enabled" : "disabled"); M68K_show_context(); log_done(); exit(0); - } + }//*/ } // @@ -105,7 +185,14 @@ int irq_ack_handler(int level) unsigned int m68k_read_memory_8(unsigned int address) { -//WriteLog( "[RM8] Addr: %08X\n", address); +#ifdef CPU_DEBUG_MEMORY + if ((address >= 0x000000) && (address <= 0x3FFFFF)) + { + if (startMemLog) + readMem[address] = 1; + } +#endif +//WriteLog("[RM8] Addr: %08X\n", address); unsigned int retVal = 0; if ((address >= 0x000000) && (address <= 0x3FFFFF)) @@ -115,13 +202,13 @@ unsigned int m68k_read_memory_8(unsigned int address) else if ((address >= 0xE00000) && (address <= 0xE3FFFF)) retVal = jaguar_bootRom[address - 0xE00000]; else if ((address >= 0xDFFF00) && (address <= 0xDFFFFF)) - retVal = cdrom_byte_read(address); + retVal = CDROMReadByte(address); else if ((address >= 0xF00000) && (address <= 0xF0FFFF)) - retVal = tom_byte_read(address); + retVal = TOMReadByte(address, M68K); else if ((address >= 0xF10000) && (address <= 0xF1FFFF)) - retVal = jerry_byte_read(address); + retVal = JERRYReadByte(address, M68K); else - retVal = jaguar_unknown_readbyte(address); + retVal = jaguar_unknown_readbyte(address, M68K); return retVal; } @@ -131,7 +218,38 @@ void gpu_dump_registers(void); unsigned int m68k_read_memory_16(unsigned int address) { -//WriteLog( "[RM16] Addr: %08X\n", address); +#ifdef CPU_DEBUG_MEMORY +/* if ((address >= 0x000000) && (address <= 0x3FFFFE)) + { + if (startMemLog) + readMem[address] = 1, readMem[address + 1] = 1; + }//*/ +/* if (effect_start && (address >= 0x8064FC && address <= 0x806501)) + { + return 0x4E71; // NOP + } + if (effect_start2 && (address >= 0x806502 && address <= 0x806507)) + { + return 0x4E71; // NOP + } + if (effect_start3 && (address >= 0x806512 && address <= 0x806517)) + { + return 0x4E71; // NOP + } + if (effect_start4 && (address >= 0x806524 && address <= 0x806527)) + { + return 0x4E71; // NOP + } + if (effect_start5 && (address >= 0x80653E && address <= 0x806543)) //Collision detection! + { + return 0x4E71; // NOP + } + if (effect_start6 && (address >= 0x806544 && address <= 0x806547)) + { + return 0x4E71; // NOP + }//*/ +#endif +//WriteLog("[RM16] Addr: %08X\n", address); /*if (m68k_get_reg(NULL, M68K_REG_PC) == 0x00005FBA) // for(int i=0; i<10000; i++) WriteLog("[M68K] In routine #6!\n");//*/ @@ -139,13 +257,13 @@ unsigned int m68k_read_memory_16(unsigned int address) //if (m68k_get_reg(NULL, M68K_REG_PC) == 0x00005B3C) // GPU Program #2 /*if (m68k_get_reg(NULL, M68K_REG_PC) == 0x00005BA8) // GPU Program #3 { - WriteLog("[M68K] About to run GPU! (Addr:%08X, data:%04X)\n", address, tom_word_read(address)); + WriteLog("[M68K] About to run GPU! (Addr:%08X, data:%04X)\n", address, TOMReadWord(address)); gpu_dump_registers(); gpu_dump_disassembly(); // for(int i=0; i<10000; i++) -// WriteLog( "[M68K] About to run GPU!\n"); +// WriteLog("[M68K] About to run GPU!\n"); }//*/ -//WriteLog( "[WM8 PC=%08X] Addr: %08X, val: %02X\n", m68k_get_reg(NULL, M68K_REG_PC), address, value); +//WriteLog("[WM8 PC=%08X] Addr: %08X, val: %02X\n", m68k_get_reg(NULL, M68K_REG_PC), address, value); /*if (m68k_get_reg(NULL, M68K_REG_PC) >= 0x00006696 && m68k_get_reg(NULL, M68K_REG_PC) <= 0x000066A8) { if (address == 0x000066A0) @@ -154,7 +272,7 @@ unsigned int m68k_read_memory_16(unsigned int address) gpu_dump_disassembly(); } for(int i=0; i<10000; i++) - WriteLog( "[M68K] About to run GPU! (Addr:%08X, data:%04X)\n", address, tom_word_read(address)); + WriteLog("[M68K] About to run GPU! (Addr:%08X, data:%04X)\n", address, TOMReadWord(address)); }//*/ unsigned int retVal = 0; @@ -165,75 +283,82 @@ unsigned int m68k_read_memory_16(unsigned int address) else if ((address >= 0xE00000) && (address <= 0xE3FFFE)) retVal = (jaguar_bootRom[address - 0xE00000] << 8) | jaguar_bootRom[address - 0xE00000 + 1]; else if ((address >= 0xDFFF00) && (address <= 0xDFFFFE)) - retVal = cdrom_word_read(address); + retVal = CDROMReadWord(address, M68K); else if ((address >= 0xF00000) && (address <= 0xF0FFFE)) - retVal = tom_word_read(address); + retVal = TOMReadWord(address, M68K); else if ((address >= 0xF10000) && (address <= 0xF1FFFE)) - retVal = jerry_word_read(address); + retVal = JERRYReadWord(address, M68K); else -//{ -//WriteLog( "[RM16] Unknown address: %08X\n", address); - retVal = jaguar_unknown_readword(address); -//} + retVal = jaguar_unknown_readword(address, M68K); return retVal; } unsigned int m68k_read_memory_32(unsigned int address) { -//WriteLog( "--> [RM32]\n"); +//WriteLog("--> [RM32]\n"); return (m68k_read_memory_16(address) << 16) | m68k_read_memory_16(address + 2); } void m68k_write_memory_8(unsigned int address, unsigned int value) { +#ifdef CPU_DEBUG_MEMORY + if ((address >= 0x000000) && (address <= 0x3FFFFF)) + { + if (startMemLog) + { + if (value > writeMemMax[address]) + writeMemMax[address] = value; + if (value < writeMemMin[address]) + writeMemMin[address] = value; + } + } +#endif //if ((address >= 0x1FF020 && address <= 0x1FF03F) || (address >= 0x1FF820 && address <= 0x1FF83F)) // WriteLog("M68K: Writing %02X at %08X\n", value, address); -//WriteLog( "[WM8 PC=%08X] Addr: %08X, val: %02X\n", m68k_get_reg(NULL, M68K_REG_PC), address, value); +//WriteLog("[WM8 PC=%08X] Addr: %08X, val: %02X\n", m68k_get_reg(NULL, M68K_REG_PC), address, value); if ((address >= 0x000000) && (address <= 0x3FFFFF)) jaguar_mainRam[address] = value; else if ((address >= 0xDFFF00) && (address <= 0xDFFFFF)) - cdrom_byte_write(address, value); + CDROMWriteByte(address, value, M68K); else if ((address >= 0xF00000) && (address <= 0xF0FFFF)) - tom_byte_write(address, value); + TOMWriteByte(address, value, M68K); else if ((address >= 0xF10000) && (address <= 0xF1FFFF)) - jerry_byte_write(address, value); + JERRYWriteByte(address, value, M68K); else - jaguar_unknown_writebyte(address, value); + jaguar_unknown_writebyte(address, value, M68K); } void m68k_write_memory_16(unsigned int address, unsigned int value) { -extern int dsp_pc;//, dsp_control; -if (address == 0xF1A116 && (value & 0x01)) -{ - WriteLog(" M68K(16): DSP is GO! (DSP_PC: %08X)\n\n", dsp_pc); - -/* static char buffer[512]; - uint32 j = 0xF1B000; - while (j <= 0xF1BFFF) +#ifdef CPU_DEBUG_MEMORY + if ((address >= 0x000000) && (address <= 0x3FFFFE)) { - uint32 oldj = j; - j += dasmjag(JAGUAR_DSP, buffer, j); - WriteLog( "\t%08X: %s\n", oldj, buffer); - } - WriteLog( "\n");//*/ -} -//else -// WriteLog("M68K(16): DSP halted... (Old value: %08X)\n", dsp_control); + if (startMemLog) + { + uint8 hi = value >> 8, lo = value & 0xFF; + if (hi > writeMemMax[address]) + writeMemMax[address] = hi; + if (hi < writeMemMin[address]) + writeMemMin[address] = hi; + + if (lo > writeMemMax[address+1]) + writeMemMax[address+1] = lo; + if (lo < writeMemMin[address+1]) + writeMemMin[address+1] = lo; + } + } +#endif //if ((address >= 0x1FF020 && address <= 0x1FF03F) || (address >= 0x1FF820 && address <= 0x1FF83F)) // WriteLog("M68K: Writing %04X at %08X\n", value, address); -//WriteLog( "[WM16 PC=%08X] Addr: %08X, val: %04X\n", m68k_get_reg(NULL, M68K_REG_PC), address, value); +//WriteLog("[WM16 PC=%08X] Addr: %08X, val: %04X\n", m68k_get_reg(NULL, M68K_REG_PC), address, value); //if (address >= 0xF02200 && address <= 0xF0229F) // WriteLog("M68K: Writing to blitter --> %04X at %08X\n", value, address); //if (address >= 0x0E75D0 && address <= 0x0E75E7) // WriteLog("M68K: Writing %04X at %08X, M68K PC=%08X\n", value, address, m68k_get_reg(NULL, M68K_REG_PC)); /*extern uint32 totalFrames; -extern bool suppressOutput; -if (totalFrames >= 59) - suppressOutput = false;//*/ -/*if (address == 0xF02114) +if (address == 0xF02114) WriteLog("M68K: Writing to GPU_CTRL (frame:%u)... [M68K PC:%08X]\n", totalFrames, m68k_get_reg(NULL, M68K_REG_PC)); if (address == 0xF02110) WriteLog("M68K: Writing to GPU_PC (frame:%u)... [M68K PC:%08X]\n", totalFrames, m68k_get_reg(NULL, M68K_REG_PC));//*/ @@ -242,39 +367,36 @@ if (address == 0xF02110) if ((address >= 0x000000) && (address <= 0x3FFFFE)) { - jaguar_mainRam[address] = value >> 8; - jaguar_mainRam[address + 1] = value & 0xFF; +/* jaguar_mainRam[address] = value >> 8; + jaguar_mainRam[address + 1] = value & 0xFF;*/ + SET16(jaguar_mainRam, address, value); } else if ((address >= 0xDFFF00) && (address <= 0xDFFFFE)) - cdrom_word_write(address, value); + CDROMWriteWord(address, value, M68K); else if ((address >= 0xF00000) && (address <= 0xF0FFFE)) - tom_word_write(address, value); + TOMWriteWord(address, value, M68K); else if ((address >= 0xF10000) && (address <= 0xF1FFFE)) - jerry_word_write(address, value); + JERRYWriteWord(address, value, M68K); else - jaguar_unknown_writeword(address, value); + { + jaguar_unknown_writeword(address, value, M68K); + WriteLog("\tA0=%08X, A1=%08X, D0=%08X, D1=%08X\n", + m68k_get_reg(NULL, M68K_REG_A0), m68k_get_reg(NULL, M68K_REG_A1), + m68k_get_reg(NULL, M68K_REG_D0), m68k_get_reg(NULL, M68K_REG_D1)); + } } void m68k_write_memory_32(unsigned int address, unsigned int value) { -extern int dsp_pc;//, dsp_control; -if (address == 0xF1A114 && (value & 0x01)) - WriteLog("M68K(32): DSP is GO! (DSP_PC: %08X)\n", dsp_pc); -//else -// WriteLog("M68K(32): DSP halted... (Old value: %08X)\n", dsp_control); - -//WriteLog( "--> [WM32]\n"); +//WriteLog("--> [WM32]\n"); m68k_write_memory_16(address, value >> 16); m68k_write_memory_16(address + 2, value & 0xFFFF); } - uint32 jaguar_get_handler(uint32 i) { -// return (jaguar_word_read(i<<2) << 16) | jaguar_word_read((i<<2) + 2); -// return (jaguar_word_read(i*4) << 16) | jaguar_word_read((i*4) + 2); - return jaguar_long_read(i * 4); + return JaguarReadLong(i * 4); } uint32 jaguar_interrupt_handler_is_valid(uint32 i) @@ -288,64 +410,100 @@ uint32 jaguar_interrupt_handler_is_valid(uint32 i) void M68K_show_context(void) { - WriteLog( "\t68K PC=%06X\n", m68k_get_reg(NULL, M68K_REG_PC)); + WriteLog("\t68K PC=%06X\n", m68k_get_reg(NULL, M68K_REG_PC)); for(int i=M68K_REG_D0; i<=M68K_REG_D7; i++) - WriteLog( "\tD%i = %08X\n", i-M68K_REG_D0, m68k_get_reg(NULL, (m68k_register_t)i)); - WriteLog( "\n"); + WriteLog("\tD%i = %08X\n", i-M68K_REG_D0, m68k_get_reg(NULL, (m68k_register_t)i)); + WriteLog("\n"); for(int i=M68K_REG_A0; i<=M68K_REG_A7; i++) - WriteLog( "\tA%i = %08X\n", i-M68K_REG_A0, m68k_get_reg(NULL, (m68k_register_t)i)); + WriteLog("\tA%i = %08X\n", i-M68K_REG_A0, m68k_get_reg(NULL, (m68k_register_t)i)); - WriteLog( "68K disasm\n"); + WriteLog("68K disasm\n"); // jaguar_dasm(s68000readPC()-0x1000,0x20000); jaguar_dasm(m68k_get_reg(NULL, M68K_REG_PC) - 0x80, 0x200); // jaguar_dasm(0x5000, 0x14414); - WriteLog( "..................\n"); + WriteLog("..................\n"); if (tom_irq_enabled(IRQ_VBLANK)) { - WriteLog( "vblank int: enabled\n"); + WriteLog("vblank int: enabled\n"); jaguar_dasm(jaguar_get_handler(64), 0x200); } else - WriteLog( "vblank int: disabled\n"); + WriteLog("vblank int: disabled\n"); - WriteLog( "..................\n"); + WriteLog("..................\n"); for(int i=0; i<256; i++) - WriteLog( "handler %03i at $%08X\n", i, (unsigned int)jaguar_get_handler(i)); + WriteLog("handler %03i at $%08X\n", i, (unsigned int)jaguar_get_handler(i)); } // // Unknown read/write byte/word routines // -void jaguar_unknown_writebyte(unsigned address, unsigned data) +// It's hard to believe that developers would be sloppy with their memory writes, yet in +// some cases the developers screwed up royal. E.g., Club Drive has the following code: +// +// 807EC4: movea.l #$f1b000, A1 +// 807ECA: movea.l #$8129e0, A0 +// 807ED0: move.l A0, D0 +// 807ED2: move.l #$f1bb94, D1 +// 807ED8: sub.l D0, D1 +// 807EDA: lsr.l #2, D1 +// 807EDC: move.l (A0)+, (A1)+ +// 807EDE: dbra D1, 807edc +// +// The problem is at $807ED0--instead of putting A0 into D0, they really meant to put A1 +// in. This mistake causes it to try and overwrite approximately $700000 worth of address +// space! (That is, unless the 68K causes a bus error...) + +void jaguar_unknown_writebyte(unsigned address, unsigned data, uint32 who/*=UNKNOWN*/) { #ifdef LOG_UNMAPPED_MEMORY_ACCESSES - WriteLog( "jaguar: unknown byte %02X write at %08X (PC=%06X)\n", data, address, m68k_get_reg(NULL, M68K_REG_PC)); + WriteLog("Jaguar: Unknown byte %02X written at %08X by %s (M68K PC=%06X)\n", data, address, whoName[who], m68k_get_reg(NULL, M68K_REG_PC)); + extern bool finished; + finished = true; + extern bool doDSPDis; + if (who == DSP) + doDSPDis = true; #endif } -void jaguar_unknown_writeword(unsigned address, unsigned data) +void jaguar_unknown_writeword(unsigned address, unsigned data, uint32 who/*=UNKNOWN*/) { #ifdef LOG_UNMAPPED_MEMORY_ACCESSES - WriteLog( "jaguar: unknown word %04X write at %08X (PC=%06X)\n", data, address, m68k_get_reg(NULL, M68K_REG_PC)); + WriteLog("Jaguar: Unknown word %04X written at %08X by %s (M68K PC=%06X)\n", data, address, whoName[who], m68k_get_reg(NULL, M68K_REG_PC)); + extern bool finished; + finished = true; + extern bool doDSPDis; + if (who == DSP) + doDSPDis = true; #endif } -unsigned jaguar_unknown_readbyte(unsigned address) +unsigned jaguar_unknown_readbyte(unsigned address, uint32 who/*=UNKNOWN*/) { #ifdef LOG_UNMAPPED_MEMORY_ACCESSES - WriteLog( "jaguar: unknown byte read at %08X (PC=%06X)\n", address, m68k_get_reg(NULL, M68K_REG_PC)); + WriteLog("Jaguar: Unknown byte read at %08X by %s (M68K PC=%06X)\n", address, whoName[who], m68k_get_reg(NULL, M68K_REG_PC)); + extern bool finished; + finished = true; + extern bool doDSPDis; + if (who == DSP) + doDSPDis = true; #endif return 0xFF; } -unsigned jaguar_unknown_readword(unsigned address) +unsigned jaguar_unknown_readword(unsigned address, uint32 who/*=UNKNOWN*/) { #ifdef LOG_UNMAPPED_MEMORY_ACCESSES - WriteLog( "Jaguar: Unknown word read at %08X (PC=%06X)\n", address, m68k_get_reg(NULL, M68K_REG_PC)); + WriteLog("Jaguar: Unknown word read at %08X by %s (M68K PC=%06X)\n", address, whoName[who], m68k_get_reg(NULL, M68K_REG_PC)); + extern bool finished; + finished = true; + extern bool doDSPDis; + if (who == DSP) + doDSPDis = true; #endif return 0xFFFF; } @@ -390,160 +548,137 @@ void jaguar_dasm(uint32 offset, uint32 qt) #endif } -unsigned jaguar_byte_read(unsigned int offset) +uint8 JaguarReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) { uint8 data = 0x00; offset &= 0xFFFFFF; if (offset < 0x400000) -// data = (jaguar_mainRam[(offset^0x01) & 0x3FFFFF]); data = jaguar_mainRam[offset & 0x3FFFFF]; else if ((offset >= 0x800000) && (offset < 0xC00000)) -// data = (jaguar_mainRom[(offset^0x01)-0x800000]); data = jaguar_mainRom[offset - 0x800000]; -// else if ((offset >= 0xDFFF00) && (offset < 0xDFFF00)) else if ((offset >= 0xDFFF00) && (offset <= 0xDFFFFF)) - data = cdrom_byte_read(offset); + data = CDROMReadByte(offset, who); else if ((offset >= 0xE00000) && (offset < 0xE40000)) -// data = (jaguar_bootRom[(offset^0x01) & 0x3FFFF]); data = jaguar_bootRom[offset & 0x3FFFF]; else if ((offset >= 0xF00000) && (offset < 0xF10000)) - data = tom_byte_read(offset); + data = TOMReadByte(offset, who); else if ((offset >= 0xF10000) && (offset < 0xF20000)) - data = jerry_byte_read(offset); + data = JERRYReadByte(offset, who); else - data = jaguar_unknown_readbyte(offset); + data = jaguar_unknown_readbyte(offset, who); return data; } -unsigned jaguar_word_read(unsigned int offset) +uint16 JaguarReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) { -//TEMP--Mirror of F03000? -/*if (offset >= 0xF0B000 && offset <= 0xF0BFFF) -WriteLog( "[JWR16] --> Possible GPU RAM mirror access! [%08X]\n", offset);//*/ - offset &= 0xFFFFFF; if (offset <= 0x3FFFFE) { -// return (jaguar_mainRam[(offset+1) & 0x3FFFFF] << 8) | jaguar_mainRam[(offset+0) & 0x3FFFFF]; return (jaguar_mainRam[(offset+0) & 0x3FFFFF] << 8) | jaguar_mainRam[(offset+1) & 0x3FFFFF]; } else if ((offset >= 0x800000) && (offset <= 0xBFFFFE)) { offset -= 0x800000; -// return (jaguar_mainRom[offset+1] << 8) | jaguar_mainRom[offset+0]; return (jaguar_mainRom[offset+0] << 8) | jaguar_mainRom[offset+1]; } // else if ((offset >= 0xDFFF00) && (offset < 0xDFFF00)) else if ((offset >= 0xDFFF00) && (offset <= 0xDFFFFE)) - return cdrom_word_read(offset); + return CDROMReadWord(offset, who); else if ((offset >= 0xE00000) && (offset <= 0xE3FFFE)) -// return *((uint16 *)&jaguar_bootRom[offset & 0x3FFFF]); return (jaguar_bootRom[(offset+0) & 0x3FFFF] << 8) | jaguar_bootRom[(offset+1) & 0x3FFFF]; else if ((offset >= 0xF00000) && (offset <= 0xF0FFFE)) - return tom_word_read(offset); + return TOMReadWord(offset, who); else if ((offset >= 0xF10000) && (offset <= 0xF1FFFE)) -//{ -//WriteLog("Reading from JERRY offset %08X...\n", offset); - return jerry_word_read(offset); -//} + return JERRYReadWord(offset, who); - return jaguar_unknown_readword(offset); + return jaguar_unknown_readword(offset, who); } -void jaguar_byte_write(unsigned offset, unsigned data) +void JaguarWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) { offset &= 0xFFFFFF; if (offset < 0x400000) { -// jaguar_mainRam[(offset^0x01) & 0x3FFFFF] = data; jaguar_mainRam[offset & 0x3FFFFF] = data; return; } -// else if ((offset >= 0xDFFF00) && (offset < 0xDFFF00)) else if ((offset >= 0xDFFF00) && (offset <= 0xDFFFFF)) { - cdrom_byte_write(offset, data); + CDROMWriteByte(offset, data, who); return; } else if ((offset >= 0xF00000) && (offset <= 0xF0FFFF)) { - tom_byte_write(offset, data); + TOMWriteByte(offset, data, who); return; } else if ((offset >= 0xF10000) && (offset <= 0xF1FFFF)) { - jerry_byte_write(offset, data); + JERRYWriteByte(offset, data, who); return; } - jaguar_unknown_writebyte(offset, data); + jaguar_unknown_writebyte(offset, data, who); } -void jaguar_word_write(unsigned offset, unsigned data) +void JaguarWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) { -extern int dsp_pc;//, dsp_control; -if (offset == 0xF1A116 && (data & 0x01)) - WriteLog(" JagWW: DSP is GO! (DSP_PC: %08X)\n", dsp_pc); -//else -// WriteLog("JagWW: DSP halted... (Old value: %08X)\n", dsp_control); - -//extern int blit_start_log; -//if (blit_start_log) -/*{ - if (offset == 0x0674DE) - WriteLog( "[JWW16] Bad write starting @ 0674DE! [%04X]\n", data); -}//*/ -//TEMP--Mirror of F03000? -//if (offset >= 0xF0B000 && offset <= 0xF0BFFF) -//WriteLog( "[JWW16] --> Possible GPU RAM mirror access! [%08X]", offset); -//if ((offset >= 0x1FF020 && offset <= 0x1FF03F) || (offset >= 0x1FF820 && offset <= 0x1FF83F)) -// WriteLog("JagWW: Writing %04X at %08X\n", data, offset); +//TEMP--Mirror of F03000? Yes, but only 32-bit CPUs can do it (i.e., NOT the 68K!) +// PLUS, you would handle this in the GPU/DSP WriteLong code! Not here! offset &= 0xFFFFFF; - + if (offset <= 0x3FFFFE) { -// jaguar_mainRam[(offset+0) & 0x3FFFFF] = data & 0xFF; -// jaguar_mainRam[(offset+1) & 0x3FFFFF] = (data>>8) & 0xFF; +//This MUST be done by the 68K! +/*if (offset == 0x670C) + WriteLog("Jaguar: %s writing to location $670C...\n", whoName[who]);*/ + jaguar_mainRam[(offset+0) & 0x3FFFFF] = (data>>8) & 0xFF; jaguar_mainRam[(offset+1) & 0x3FFFFF] = data & 0xFF; return; } - else if ((offset >= 0xDFFF00) && (offset <= 0xDFFFFE)) + else if (offset >= 0xDFFF00 && offset <= 0xDFFFFE) { - cdrom_word_write(offset, data); + CDROMWriteWord(offset, data, who); return; } - else if ((offset >= 0xF00000) && (offset <= 0xF0FFFE)) + else if (offset >= 0xF00000 && offset <= 0xF0FFFE) { - tom_word_write(offset, data); + TOMWriteWord(offset, data, who); return; } - else if ((offset >= 0xF10000) && (offset <= 0xF1FFFE)) + else if (offset >= 0xF10000 && offset <= 0xF1FFFE) { - jerry_word_write(offset, data); + JERRYWriteWord(offset, data, who); return; } - - jaguar_unknown_writeword(offset, data); + // Don't bomb on attempts to write to ROM + else if (offset >= 0x800000 && offset <= 0xEFFFFF) + return; + + jaguar_unknown_writeword(offset, data, who); } -unsigned jaguar_long_read(unsigned int offset) +// We really should re-do this so that it does *real* 32-bit access... !!! FIX !!! +uint32 JaguarReadLong(uint32 offset, uint32 who/*=UNKNOWN*/) { - return (jaguar_word_read(offset) << 16) | jaguar_word_read(offset+2); + return (JaguarReadWord(offset, who) << 16) | JaguarReadWord(offset+2, who); } -void jaguar_long_write(unsigned offset, unsigned data) +// We really should re-do this so that it does *real* 32-bit access... !!! FIX !!! +void JaguarWriteLong(uint32 offset, uint32 data, uint32 who/*=UNKNOWN*/) { -extern int dsp_pc;//, dsp_control; -if (offset == 0xF1A114 && (data & 0x01)) - WriteLog("JagLW: DSP is GO! (DSP_PC: %08X)\n", dsp_pc); -//else -// WriteLog("JagLW: DSP halted... (Old value: %08X)\n", dsp_control); +/* extern bool doDSPDis; + if (offset < 0x400 && !doDSPDis) + { + WriteLog("JLW: Write to %08X by %s... Starting DSP log!\n\n", offset, whoName[who]); + doDSPDis = true; + }//*/ - jaguar_word_write(offset, data >> 16); - jaguar_word_write(offset+2, data & 0xFFFF); + JaguarWriteWord(offset, data >> 16, who); + JaguarWriteWord(offset+2, data & 0xFFFF, who); } // @@ -551,12 +686,19 @@ if (offset == 0xF1A114 && (data & 0x01)) // void jaguar_init(void) { +#ifdef CPU_DEBUG_MEMORY + memset(readMem, 0x00, 0x400000); + memset(writeMemMin, 0xFF, 0x400000); + memset(writeMemMax, 0x00, 0x400000); +#endif memory_malloc_secure((void **)&jaguar_mainRam, 0x400000, "Jaguar 68K CPU RAM"); memory_malloc_secure((void **)&jaguar_bootRom, 0x040000, "Jaguar 68K CPU BIOS ROM"); memory_malloc_secure((void **)&jaguar_mainRom, 0x600000, "Jaguar 68K CPU ROM"); memset(jaguar_mainRam, 0x00, 0x400000); // memset(jaguar_mainRom, 0xFF, 0x200000); // & set it to all Fs... - memset(jaguar_mainRom, 0x00, 0x200000); // & set it to all 0s... +// memset(jaguar_mainRom, 0x00, 0x200000); // & set it to all 0s... +//NOTE: This *doesn't* fix FlipOut... + memset(jaguar_mainRom, 0x01, 0x600000); // & set it to all 01s... // cd_bios_boot("C:\\ftp\\jaguar\\cd\\Brain Dead 13.cdi"); // cd_bios_boot("C:\\ftp\\jaguar\\cd\\baldies.cdi"); @@ -565,20 +707,9 @@ void jaguar_init(void) // cd_bios_boot("C:\\ftp\\jaguar\\cd\\primalrage.cdi"); // cd_bios_boot("C:\\ftp\\jaguar\\cd\\Dragons Lair.cdi"); - // Should these be hardwired or read from VP? - jaguar_screen_scanlines = (hardwareTypeNTSC ? 524 : 624); -//Should the divisor be 50 for PAL??? Let's try it! - m68k_cycles_per_scanline = (hardwareTypeNTSC ? M68K_CLOCK_RATE_NTSC : M68K_CLOCK_RATE_PAL) / (jaguar_screen_scanlines * (hardwareTypeNTSC ? 60 : 50)); - gpu_cycles_per_scanline = dsp_cycles_per_scanline - = (hardwareTypeNTSC ? RISC_CLOCK_RATE_NTSC : RISC_CLOCK_RATE_PAL) / (jaguar_screen_scanlines * (hardwareTypeNTSC ? 60 : 50)); - -//#ifdef SOUND_OUTPUT -// ws_audio_init(); -//#endif - m68k_set_cpu_type(M68K_CPU_TYPE_68000); gpu_init(); - dsp_init(); + DSPInit(); tom_init(); jerry_init(); cdrom_init(); @@ -586,13 +717,54 @@ void jaguar_init(void) void jaguar_done(void) { +#ifdef CPU_DEBUG_MEMORY +/* WriteLog("\n\nM68000 disassembly at $8D0D44 (collision routine!)...\n"); + jaguar_dasm(0x8D0D44, 5000); + WriteLog("\n");//*/ +/* WriteLog("\n\nM68000 disassembly at $806300 (look @ $806410)...\n"); + jaguar_dasm(0x806300, 5000); + WriteLog("\n");//*/ + +/* WriteLog("\nJaguar: Memory Usage Stats (return addresses)\n\n"); + + for(uint32 i=0; i<=raPtr; i++) + { + WriteLog("\t%08X\n", returnAddr[i]); + WriteLog("M68000 disassembly at $%08X...\n", returnAddr[i] - 16); + jaguar_dasm(returnAddr[i] - 16, 16); + WriteLog("\n"); + } + WriteLog("\n");//*/ + +/* int start = 0, end = 0; + bool endTriggered = false, startTriggered = false; + for(int i=0; i<0x400000; i++) + { + if (readMem[i] && writeMemMin[i] != 0xFF && writeMemMax != 0x00) + { + if (!startTriggered) + startTriggered = true, endTriggered = false, start = i; + + WriteLog("\t\tMin/Max @ %06X: %u/%u\n", i, writeMemMin[i], writeMemMax[i]); + } + else + { + if (!endTriggered) + { + end = i - 1, endTriggered = true, startTriggered = false; + WriteLog("\tMemory range accessed: %06X - %06X\n", start, end); + } + } + } + WriteLog("\n");//*/ +#endif //#ifdef CPU_DEBUG // for(int i=M68K_REG_A0; i<=M68K_REG_A7; i++) // WriteLog("\tA%i = 0x%.8x\n", i-M68K_REG_A0, m68k_get_reg(NULL, (m68k_register_t)i)); int32 topOfStack = m68k_get_reg(NULL, M68K_REG_A7); - WriteLog("M68K: Top of stack: %08X. Stack trace:\n", jaguar_long_read(topOfStack)); + WriteLog("M68K: Top of stack: %08X. Stack trace:\n", JaguarReadLong(topOfStack)); for(int i=-2; i<9; i++) - WriteLog("%06X: %08X\n", topOfStack + (i * 4), jaguar_long_read(topOfStack + (i * 4))); + WriteLog("%06X: %08X\n", topOfStack + (i * 4), JaguarReadLong(topOfStack + (i * 4))); /* WriteLog("\nM68000 disassembly at $802288...\n"); jaguar_dasm(0x802288, 3); @@ -609,18 +781,30 @@ void jaguar_done(void) jaguar_dasm(0x802B00, 500); WriteLog("\n");//*/ -// WriteLog("Jaguar: CD BIOS version %04X\n", jaguar_word_read(0x3004)); - WriteLog("Jaguar: Interrupt enable = %02X\n", tom_byte_read(0xF000E1) & 0x1F); +/* WriteLog("\n\nM68000 disassembly at $809900 (look @ $8099F8)...\n"); + jaguar_dasm(0x809900, 500); + WriteLog("\n");//*/ +//8099F8 +/* WriteLog("\n\nDump of $8093C8:\n\n"); + for(int i=0x8093C8; i<0x809900; i+=4) + WriteLog("%06X: %08X\n", i, JaguarReadLong(i));//*/ +/* WriteLog("\n\nM68000 disassembly at $90006C...\n"); + jaguar_dasm(0x90006C, 500); + WriteLog("\n");//*/ + +// WriteLog("Jaguar: CD BIOS version %04X\n", JaguarReadWord(0x3004)); + WriteLog("Jaguar: Interrupt enable = %02X\n", TOMReadByte(0xF000E1) & 0x1F); WriteLog("Jaguar: VBL interrupt is %s\n", ((tom_irq_enabled(IRQ_VBLANK)) && (jaguar_interrupt_handler_is_valid(64))) ? "enabled" : "disabled"); M68K_show_context(); //#endif -//#ifdef SOUND_OUTPUT -// ws_audio_done(); -//#endif + cd_bios_done(); cdrom_done(); + gpu_done(); + DSPDone(); tom_done(); jerry_done(); + memory_free(jaguar_mainRom); memory_free(jaguar_bootRom); memory_free(jaguar_mainRam); @@ -628,7 +812,7 @@ void jaguar_done(void) void jaguar_reset(void) { - if (jaguar_use_bios) + if (vjs.useJaguarBIOS) memcpy(jaguar_mainRam, jaguar_bootRom, 8); else { @@ -653,72 +837,10 @@ void jaguar_reset(void) tom_reset(); jerry_reset(); gpu_reset(); - dsp_reset(); + DSPReset(); cdrom_reset(); m68k_pulse_reset(); // Reset the 68000 - WriteLog( "\t68K PC=%06X SP=%08X\n", m68k_get_reg(NULL, M68K_REG_PC), m68k_get_reg(NULL, M68K_REG_A7)); -} - -void jaguar_reset_handler(void) -{ -} - -void jaguar_exec(int16 * backbuffer, bool render) -{ - uint32 i, vblank_duration = tom_get_vdb(); - - // vblank - if ((tom_irq_enabled(IRQ_VBLANK)) && (jaguar_interrupt_handler_is_valid(64))) - { - if (jaguar_word_read(0xF0004E) != 0x07FF) // VI (11 bits wide!) - { - tom_set_pending_video_int(); -// s68000interrupt(7, IRQ_VBLANK+64); -// s68000flushInterrupts(); - m68k_set_irq(7); // IRQ_VBLANK+64??? Not autovectored??? No. -// Could set a global variable here, to signal that this is a VBLANK interrupt... -// Then again, since IRQ_VBLANK is set to zero, this would not be necessary in this case. - } - } - - for(i=0; i= vdb && i < vde)//vbb) - { - if (!(i & 0x01)) // Execute OP only on even lines (non-interlaced only!) - { - tom_exec_scanline(backbuffer, i/2, render); // i/2 is a kludge... - backbuffer += TOMGetSDLScreenPitch() / 2; // Convert bytes to words... - } - } +//if (start_logging) +// WriteLog("About to execute TOM's PIT...\n"); + TOMExecPIT(RISCCyclesPerScanline); +//if (start_logging) +// WriteLog("About to execute JERRY's PIT...\n"); + jerry_pit_exec(RISCCyclesPerScanline); +//if (start_logging) +// WriteLog("About to execute JERRY's SSI...\n"); + jerry_i2s_exec(RISCCyclesPerScanline); +//if (start_logging) +// WriteLog("About to execute GPU...\n"); + gpu_exec(RISCCyclesPerScanline); + + if (vjs.DSPEnabled) + if (vjs.usePipelinedDSP) + DSPExecP2(RISCCyclesPerScanline); // Pipelined DSP execution (3 stage)... + else + DSPExec(RISCCyclesPerScanline); // Ordinary non-pipelined DSP +// DSPExecComp(RISCCyclesPerScanline); // Comparison core + +//if (start_logging) +// WriteLog("About to execute OP...\n"); + TOMExecScanline(i, render); } - -//#ifdef SOUND_OUTPUT -// system_sound_update(); -//#endif } // Temp debugging stuff