X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.cpp;h=2b91abc298432bfc0f8b19e6aa89fa4aac755b25;hb=67a5f1a40072983cf87ae2093ca95c271d14e706;hp=a6582662267b06f29812241949d27843e1d2dff5;hpb=376e1f69fb9e9360d1f796b35a00227111e63fab;p=virtualjaguar diff --git a/src/jaguar.cpp b/src/jaguar.cpp index a658266..2b91abc 100644 --- a/src/jaguar.cpp +++ b/src/jaguar.cpp @@ -11,25 +11,27 @@ #include "jaguar.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 // 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 +// Memory debugging identifiers + +char * whoName[9] = + { "Unknown", "Jaguar", "DSP", "GPU", "TOM", "JERRY", "M68K", "Blitter", "OP" }; + // These values are overridden by command line switches... bool dsp_enabled = false; @@ -62,21 +64,21 @@ 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(JaguarReadWord(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(); @@ -105,7 +107,7 @@ int irq_ack_handler(int level) unsigned int m68k_read_memory_8(unsigned int address) { -//WriteLog( "[RM8] Addr: %08X\n", address); +//WriteLog("[RM8] Addr: %08X\n", address); unsigned int retVal = 0; if ((address >= 0x000000) && (address <= 0x3FFFFF)) @@ -115,13 +117,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 +133,7 @@ void gpu_dump_registers(void); unsigned int m68k_read_memory_16(unsigned int address) { -//WriteLog( "[RM16] Addr: %08X\n", address); +//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 +141,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 +156,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,23 +167,20 @@ 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); } @@ -189,42 +188,24 @@ void m68k_write_memory_8(unsigned int address, unsigned int value) { //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) - { - 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 ((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) @@ -242,39 +223,31 @@ 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); } 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 +261,84 @@ 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) +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 +383,126 @@ 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? +//TEMP--Mirror of F03000? Yes, but only 32-bit CPUs can do it (i.e., NOT the 68K!) //if (offset >= 0xF0B000 && offset <= 0xF0BFFF) -//WriteLog( "[JWW16] --> Possible GPU RAM mirror access! [%08X]", offset); +//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); offset &= 0xFFFFFF; if (offset <= 0x3FFFFE) { -// jaguar_mainRam[(offset+0) & 0x3FFFFF] = data & 0xFF; -// jaguar_mainRam[(offset+1) & 0x3FFFFF] = (data>>8) & 0xFF; jaguar_mainRam[(offset+0) & 0x3FFFFF] = (data>>8) & 0xFF; jaguar_mainRam[(offset+1) & 0x3FFFFF] = data & 0xFF; return; } else if ((offset >= 0xDFFF00) && (offset <= 0xDFFFFE)) { - cdrom_word_write(offset, data); + CDROMWriteWord(offset, data, who); return; } else if ((offset >= 0xF00000) && (offset <= 0xF0FFFE)) { - tom_word_write(offset, data); + TOMWriteWord(offset, data, who); return; } else if ((offset >= 0xF10000) && (offset <= 0xF1FFFE)) { - jerry_word_write(offset, data); + JERRYWriteWord(offset, data, who); return; } - jaguar_unknown_writeword(offset, data); + 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); - - jaguar_word_write(offset, data >> 16); - jaguar_word_write(offset+2, data & 0xFFFF); + JaguarWriteWord(offset, data >> 16, who); + JaguarWriteWord(offset+2, data & 0xFFFF, who); } // @@ -578,7 +537,7 @@ void jaguar_init(void) m68k_set_cpu_type(M68K_CPU_TYPE_68000); gpu_init(); - dsp_init(); + DSPInit(); tom_init(); jerry_init(); cdrom_init(); @@ -590,9 +549,9 @@ void jaguar_done(void) // 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,8 +568,8 @@ 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("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 @@ -619,8 +578,11 @@ void jaguar_done(void) //#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); @@ -653,10 +615,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)); + 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) @@ -668,9 +630,9 @@ 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 (tom_irq_enabled(IRQ_VBLANK) && jaguar_interrupt_handler_is_valid(64)) { - if (jaguar_word_read(0xF0004E) != 0x07FF) // VI (11 bits wide!) + if (JaguarReadWord(0xF0004E) != 0x07FF) // VI (11 bits wide!) { tom_set_pending_video_int(); // s68000interrupt(7, IRQ_VBLANK+64); @@ -696,7 +658,7 @@ void jaguar_exec(int16 * backbuffer, bool render) jerry_i2s_exec(m68k_cycles_per_scanline); gpu_exec(gpu_cycles_per_scanline); if (dsp_enabled) - dsp_exec(dsp_cycles_per_scanline); + DSPExec(dsp_cycles_per_scanline); } for (; i= vdb && i < vde)//vbb)