X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.cpp;h=e3477e41967fd4bd89d4d58aaad2631a1e7c3b79;hb=9c014bb62181357f3be18050b55fa69636147ab8;hp=af4718a69d2ce3f597830c549ac5e050b5eb43ce;hpb=59ca39a29be645918de45bd144865ba6487f4009;p=virtualjaguar diff --git a/src/jaguar.cpp b/src/jaguar.cpp index af4718a..e3477e4 100644 --- a/src/jaguar.cpp +++ b/src/jaguar.cpp @@ -15,8 +15,10 @@ #define CPU_DEBUG //Do this in makefile??? Yes! Could, but it's easier to define here... -#define LOG_UNMAPPED_MEMORY_ACCESSES +//#define LOG_UNMAPPED_MEMORY_ACCESSES //#define ABORT_ON_UNMAPPED_MEMORY_ACCESS +#define ABORT_ON_ILLEGAL_INSTRUCTIONS +//#define ABORT_ON_OFFICIAL_ILLEGAL_INSTRUCTION #define CPU_DEBUG_MEMORY // Private function prototypes @@ -46,8 +48,9 @@ uint32 jaguar_active_memory_dumps = 0; uint32 jaguar_mainRom_crc32, jaguarRomSize, jaguarRunAddress; /*static*/ uint8 * jaguar_mainRam = NULL; -/*static*/ uint8 * jaguar_bootRom = NULL; /*static*/ uint8 * jaguar_mainRom = NULL; +/*static*/ uint8 * jaguar_bootRom = NULL; +/*static*/ uint8 * jaguar_CDBootROM = NULL; #ifdef CPU_DEBUG_MEMORY uint8 writeMemMax[0x400000], writeMemMin[0x400000]; @@ -61,8 +64,9 @@ uint32 pcQPtr = 0; // // Callback function to detect illegal instructions // -//void GPUDumpDisassembly(void); -//void GPUDumpRegisters(void); +void GPUDumpDisassembly(void); +void GPUDumpRegisters(void); + static bool start = false; void M68KInstructionHook(void) { uint32 m68kPC = m68k_get_reg(NULL, M68K_REG_PC); @@ -136,9 +140,43 @@ void M68KInstructionHook(void) } }//*/ +//Flip Out! debugging... +//805F46, 806486 +/* +00805FDC: movea.l #$9c6f8, A0 D0=00100010, A0=00100000 +00805FE2: move.w #$10, (A0)+ D0=00100010, A0=0009C6F8 +00805FE6: cmpa.l #$c96f8, A0 D0=00100010, A0=0009C6FA +00805FEC: bne 805fe2 D0=00100010, A0=0009C6FA + +0080603A: move.l #$11ed7c, $100.w D0=61700080, A0=000C96F8, D1=00000000, A1=000040D8 + +0012314C: move.l (A0)+, (A1)+ D0=61700080, A0=00124174, D1=00000000, A1=00F03FFC +0012314E: cmpa.l #$f04000, A1 D0=61700080, A0=00124178, D1=00000000, A1=00F04000 +00123154: blt 12314c D0=61700080, A0=00124178, D1=00000000, A1=00F04000 +00123156: move.l #$0, $f035d0.l D0=61700080, A0=00124178, D1=00000000, A1=00F04000 +00123160: move.l #$f03000, $f02110.l D0=61700080, A0=00124178, D1=00000000, A1=00F04000 +0012316A: move.l #$1, $f02114.l D0=61700080, A0=00124178, D1=00000000, A1=00F04000 +00123174: rts D0=61700080, A0=00124178, D1=00000000, A1=00F04000 +*/ /* static char buffer[2048]; +//if (m68kPC > 0x805F48) start = true; +//if (m68kPC > 0x806486) start = true; +//if (m68kPC == 0x805FEE) start = true; +//if (m68kPC == 0x80600C)// start = true; +if (m68kPC == 0x802058) start = true; +//{ +// GPUDumpRegisters(); +// GPUDumpDisassembly(); +// +// M68K_show_context(); +// log_done(); +// exit(0); +//} + if (start) + { 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));//*/ + WriteLog("%08X: %s \t\tD0=%08X, A0=%08X, D1=%08X, A1=%08X\n", m68kPC, buffer, m68k_get_reg(NULL, M68K_REG_D0), m68k_get_reg(NULL, M68K_REG_A0), m68k_get_reg(NULL, M68K_REG_D1), m68k_get_reg(NULL, M68K_REG_A1)); + }//*/ /* if (m68kPC == 0x803F16) { @@ -150,9 +188,129 @@ void M68KInstructionHook(void) 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)); }*/ - +//Looks like the DSP is supposed to return $12345678 when it finishes its validation routine... +// !!! Investigate !!! +/*extern bool doDSPDis; + static bool disgo = false; + if (m68kPC == 0x50222) + { + // CD BIOS hacking +// WriteLog("M68K: About to stuff $12345678 into $F1B000 (=%08X)...\n", DSPReadLong(0xF1B000, M68K)); +// DSPWriteLong(0xF1B000, 0x12345678, M68K); +// disgo = true; + } + if (m68kPC == 0x5000) +// doDSPDis = true; + disgo = true; + if (disgo) + { + 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, D2=%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), m68k_get_reg(NULL, M68K_REG_D2)); + }//*/ + if (m68kPC == 0x82E1A) + { + static char buffer[2048]; + m68k_disassemble(buffer, m68kPC, M68K_CPU_TYPE_68000); + WriteLog("--> [Routine start] %08X: %s", m68kPC, buffer); + WriteLog("\t\tA0=%08X, A1=%08X, D0=%08X(cmd), D1=%08X(# bytes), D2=%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), m68k_get_reg(NULL, M68K_REG_D2)); + }//*/ + if (m68kPC == 0x82E58) + WriteLog("--> [Routine end]\n"); + if (m68kPC == 0x80004) + { + WriteLog("--> [Calling BusWrite2] D2: %08X\n", m68k_get_reg(NULL, M68K_REG_D2)); +// m68k_set_reg(M68K_REG_D2, 0x12345678); + }//*/ +/* +CD_init:: -> $3000 +BIOS_VER:: -> $3004 +CD_mode:: -> $3006 +CD_ack:: -> $300C +CD_jeri:: -> $3012 +CD_spin:: -> $3018 +CD_stop:: -> $301E +CD_mute:: -> $3024 +CD_umute:: -> $302A +CD_paus:: -> $3030 +CD_upaus:: -> $3036 +CD_read:: -> $303C +CD_uread:: -> $3042 +CD_setup:: -> $3048 +CD_ptr:: -> $304E +CD_osamp:: -> $3054 +CD_getoc:: -> $305A +CD_initm:: -> $3060 +CD_initf:: -> $3066 +CD_switch:: -> $306C +*/ + if (m68kPC == 0x3000) + WriteLog("M68K: CD_init\n"); + else if (m68kPC == 0x3006 + (6 * 0)) + WriteLog("M68K: CD_mode\n"); + else if (m68kPC == 0x3006 + (6 * 1)) + WriteLog("M68K: CD_ack\n"); + else if (m68kPC == 0x3006 + (6 * 2)) + WriteLog("M68K: CD_jeri\n"); + else if (m68kPC == 0x3006 + (6 * 3)) + WriteLog("M68K: CD_spin\n"); + else if (m68kPC == 0x3006 + (6 * 4)) + WriteLog("M68K: CD_stop\n"); + else if (m68kPC == 0x3006 + (6 * 5)) + WriteLog("M68K: CD_mute\n"); + else if (m68kPC == 0x3006 + (6 * 6)) + WriteLog("M68K: CD_umute\n"); + else if (m68kPC == 0x3006 + (6 * 7)) + WriteLog("M68K: CD_paus\n"); + else if (m68kPC == 0x3006 + (6 * 8)) + WriteLog("M68K: CD_upaus\n"); + else if (m68kPC == 0x3006 + (6 * 9)) + WriteLog("M68K: CD_read\n"); + else if (m68kPC == 0x3006 + (6 * 10)) + WriteLog("M68K: CD_uread\n"); + else if (m68kPC == 0x3006 + (6 * 11)) + WriteLog("M68K: CD_setup\n"); + else if (m68kPC == 0x3006 + (6 * 12)) + WriteLog("M68K: CD_ptr\n"); + else if (m68kPC == 0x3006 + (6 * 13)) + WriteLog("M68K: CD_osamp\n"); + else if (m68kPC == 0x3006 + (6 * 14)) + WriteLog("M68K: CD_getoc\n"); + else if (m68kPC == 0x3006 + (6 * 15)) + WriteLog("M68K: CD_initm\n"); + else if (m68kPC == 0x3006 + (6 * 16)) + WriteLog("M68K: CD_initf\n"); + else if (m68kPC == 0x3006 + (6 * 17)) + WriteLog("M68K: CD_switch\n"); + + if (m68kPC >= 0x3000 && m68kPC <= 0x306C) + WriteLog("\t\tA0=%08X, A1=%08X, D0=%08X, D1=%08X, D2=%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), m68k_get_reg(NULL, M68K_REG_D2)); +//*/ +#ifdef ABORT_ON_ILLEGAL_INSTRUCTIONS if (!m68k_is_valid_instruction(m68k_read_memory_16(m68kPC), M68K_CPU_TYPE_68000)) { +#ifndef ABORT_ON_OFFICIAL_ILLEGAL_INSTRUCTION + if (m68k_read_memory_16(m68kPC) == 0x4AFC) + { + // This is a kludge to let homebrew programs work properly (i.e., let the other processors + // keep going even when the 68K dumped back to the debugger or what have you). +//dis no wok right! +// m68k_set_reg(M68K_REG_PC, m68kPC - 2); +// Try setting the vector to the illegal instruction... +//This doesn't work right either! Do something else! Quick! +// SET32(jaguar_mainRam, 0x10, m68kPC); + + return; + } +#endif + 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", JaguarReadLong(topOfStack)); @@ -160,9 +318,17 @@ void M68KInstructionHook(void) 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(); + +//temp +// WriteLog("\n\n68K disasm\n\n"); +// jaguar_dasm(0x802000, 0x50C); +// WriteLog("\n\n"); +//endoftemp + log_done(); exit(0); }//*/ +#endif } // @@ -194,11 +360,16 @@ unsigned int m68k_read_memory_8(unsigned int address) } #endif //WriteLog("[RM8] Addr: %08X\n", address); +//; So, it seems that it stores the returned DWORD at $51136 and $FB074. +/* if (address == 0x51136 || address == 0x51138 || address == 0xFB074 || address == 0xFB076 + || address == 0x1AF05E) + WriteLog("[RM8 PC=%08X] Addr: %08X, val: %02X\n", m68k_get_reg(NULL, M68K_REG_PC), address, jaguar_mainRam[address]);//*/ unsigned int retVal = 0; if ((address >= 0x000000) && (address <= 0x3FFFFF)) retVal = jaguar_mainRam[address]; - else if ((address >= 0x800000) && (address <= 0xDFFFFF)) +// else if ((address >= 0x800000) && (address <= 0xDFFFFF)) + else if ((address >= 0x800000) && (address <= 0xDFFEFF)) retVal = jaguar_mainRom[address - 0x800000]; else if ((address >= 0xE00000) && (address <= 0xE3FFFF)) retVal = jaguar_bootRom[address - 0xE00000]; @@ -211,6 +382,10 @@ unsigned int m68k_read_memory_8(unsigned int address) else retVal = jaguar_unknown_readbyte(address, M68K); +//if (address >= 0x2800 && address <= 0x281F) +// WriteLog("M68K: Read byte $%02X at $%08X [PC=%08X]\n", retVal, address, m68k_get_reg(NULL, M68K_REG_PC)); +//if (address >= 0x8B5E4 && address <= 0x8B5E4 + 16) +// WriteLog("M68K: Read byte $%02X at $%08X [PC=%08X]\n", retVal, address, m68k_get_reg(NULL, M68K_REG_PC)); return retVal; } @@ -275,11 +450,17 @@ unsigned int m68k_read_memory_16(unsigned int address) for(int i=0; i<10000; i++) WriteLog("[M68K] About to run GPU! (Addr:%08X, data:%04X)\n", address, TOMReadWord(address)); }//*/ +//; So, it seems that it stores the returned DWORD at $51136 and $FB074. +/* if (address == 0x51136 || address == 0x51138 || address == 0xFB074 || address == 0xFB076 + || address == 0x1AF05E) + WriteLog("[RM16 PC=%08X] Addr: %08X, val: %04X\n", m68k_get_reg(NULL, M68K_REG_PC), address, GET16(jaguar_mainRam, address));//*/ unsigned int retVal = 0; if ((address >= 0x000000) && (address <= 0x3FFFFE)) - retVal = (jaguar_mainRam[address] << 8) | jaguar_mainRam[address+1]; - else if ((address >= 0x800000) && (address <= 0xDFFFFE)) +// retVal = (jaguar_mainRam[address] << 8) | jaguar_mainRam[address+1]; + retVal = GET16(jaguar_mainRam, address); +// else if ((address >= 0x800000) && (address <= 0xDFFFFE)) + else if ((address >= 0x800000) && (address <= 0xDFFEFE)) retVal = (jaguar_mainRom[address - 0x800000] << 8) | jaguar_mainRom[address - 0x800000 + 1]; else if ((address >= 0xE00000) && (address <= 0xE3FFFE)) retVal = (jaguar_bootRom[address - 0xE00000] << 8) | jaguar_bootRom[address - 0xE00000 + 1]; @@ -292,11 +473,23 @@ unsigned int m68k_read_memory_16(unsigned int address) else retVal = jaguar_unknown_readword(address, M68K); +//if (address >= 0xF1B000 && address <= 0xF1CFFF) +// WriteLog("M68K: Read word $%04X at $%08X [PC=%08X]\n", retVal, address, m68k_get_reg(NULL, M68K_REG_PC)); +//if (address >= 0x2800 && address <= 0x281F) +// WriteLog("M68K: Read word $%04X at $%08X [PC=%08X]\n", retVal, address, m68k_get_reg(NULL, M68K_REG_PC)); +//$8B3AE -> Transferred from $F1C010 +//$8B5E4 -> Only +1 read at $808AA +//if (address >= 0x8B5E4 && address <= 0x8B5E4 + 16) +// WriteLog("M68K: Read word $%04X at $%08X [PC=%08X]\n", retVal, address, m68k_get_reg(NULL, M68K_REG_PC)); return retVal; } unsigned int m68k_read_memory_32(unsigned int address) { +//; So, it seems that it stores the returned DWORD at $51136 and $FB074. +/* if (address == 0x51136 || address == 0xFB074 || address == 0x1AF05E) + WriteLog("[RM32 PC=%08X] Addr: %08X, val: %08X\n", m68k_get_reg(NULL, M68K_REG_PC), address, (m68k_read_memory_16(address) << 16) | m68k_read_memory_16(address + 2));//*/ + //WriteLog("--> [RM32]\n"); return (m68k_read_memory_16(address) << 16) | m68k_read_memory_16(address + 2); } @@ -318,6 +511,10 @@ 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); +/*if (effect_start) + if (address >= 0x18FA70 && address < (0x18FA70 + 8000)) + WriteLog("M68K: Byte %02X written at %08X by 68K\n", value, address);//*/ + if ((address >= 0x000000) && (address <= 0x3FFFFF)) jaguar_mainRam[address] = value; else if ((address >= 0xDFFF00) && (address <= 0xDFFFFF)) @@ -366,6 +563,15 @@ if (address == 0xF02110) //if (address >= 0xF03B00 && address <= 0xF03DFF) // WriteLog("M68K: Writing %04X to %08X...\n", value, address); +/*if (address == 0x0100)//64*4) + WriteLog("M68K: Wrote word to VI vector value %04X...\n", value);//*/ +/*if (effect_start) + if (address >= 0x18FA70 && address < (0x18FA70 + 8000)) + WriteLog("M68K: Word %04X written at %08X by 68K\n", value, address);//*/ +/* if (address == 0x51136 || address == 0x51138 || address == 0xFB074 || address == 0xFB076 + || address == 0x1AF05E) + WriteLog("[WM16 PC=%08X] Addr: %08X, val: %04X\n", m68k_get_reg(NULL, M68K_REG_PC), address, value);//*/ + if ((address >= 0x000000) && (address <= 0x3FFFFE)) { /* jaguar_mainRam[address] = value >> 8; @@ -381,15 +587,29 @@ if (address == 0xF02110) else { jaguar_unknown_writeword(address, value, M68K); +#ifdef LOG_UNMAPPED_MEMORY_ACCESSES 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)); +#endif } } void m68k_write_memory_32(unsigned int address, unsigned int value) { //WriteLog("--> [WM32]\n"); +/*if (address == 0x0100)//64*4) + WriteLog("M68K: Wrote dword to VI vector value %08X...\n", value);//*/ +/*if (address >= 0xF03214 && address < 0xF0321F) + WriteLog("M68K: Writing DWORD (%08X) to GPU RAM (%08X)...\n", value, address);//*/ +//M68K: Writing DWORD (88E30047) to GPU RAM (00F03214)... +/*extern bool doGPUDis; +if (address == 0xF03214 && value == 0x88E30047) +// start = true; + doGPUDis = true;//*/ +/* if (address == 0x51136 || address == 0xFB074) + WriteLog("[WM32 PC=%08X] Addr: %08X, val: %02X\n", m68k_get_reg(NULL, M68K_REG_PC), address, value);//*/ + m68k_write_memory_16(address, value >> 16); m68k_write_memory_16(address + 2, value & 0xFFFF); } @@ -423,6 +643,9 @@ void M68K_show_context(void) jaguar_dasm(m68k_get_reg(NULL, M68K_REG_PC) - 0x80, 0x200); // jaguar_dasm(0x5000, 0x14414); +// WriteLog("\n.......[Cart start]...........\n\n"); +// jaguar_dasm(0x192000, 0x1000);//0x200); + WriteLog("..................\n"); if (tom_irq_enabled(IRQ_VBLANK)) @@ -607,6 +830,11 @@ uint16 JaguarReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) void JaguarWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) { +//Need to check for writes in the range of $18FA70 + 8000... +/*if (effect_start) + if (offset >= 0x18FA70 && offset < (0x18FA70 + 8000)) + WriteLog("JWB: Byte %02X written at %08X by %s\n", data, offset, whoName[who]);//*/ + offset &= 0xFFFFFF; if (offset < 0x400000) { @@ -632,19 +860,113 @@ void JaguarWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) jaguar_unknown_writebyte(offset, data, who); } +uint32 starCount; void JaguarWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/) { +/*if (offset == 0x0100)//64*4) + WriteLog("M68K: %s wrote word to VI vector value %04X...\n", whoName[who], data); +if (offset == 0x0102)//64*4) + WriteLog("M68K: %s wrote word to VI vector+2 value %04X...\n", whoName[who], data);//*/ //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! +//Need to check for writes in the range of $18FA70 + 8000... +/*if (effect_start) + if (offset >= 0x18FA70 && offset < (0x18FA70 + 8000)) + WriteLog("JWW: Word %04X written at %08X by %s\n", data, offset, whoName[who]);//*/ +/*if (offset >= 0x2C00 && offset <= 0x2CFF) + WriteLog("Jaguar: Word %04X written to TOC+%02X by %s\n", data, offset-0x2C00, whoName[who]);//*/ + offset &= 0xFFFFFF; if (offset <= 0x3FFFFE) { +/* +GPU Table (CD BIOS) + +1A 69 F0 ($0000) -> Starfield +1A 73 C8 ($0001) -> Final clearing blit & bitmap blit? +1A 79 F0 ($0002) +1A 88 C0 ($0003) +1A 8F E8 ($0004) -> "Jaguar" small color logo? +1A 95 20 ($0005) +1A 9F 08 ($0006) +1A A1 38 ($0007) +1A AB 38 ($0008) +1A B3 C8 ($0009) +1A B9 C0 ($000A) +*/ + //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; +/*extern bool doGPUDis; +//if ((offset == 0x100000 + 75522) && who == GPU) // 76,226 -> 75522 +if ((offset == 0x100000 + 128470) && who == GPU) // 107,167 -> 128470 (384 x 250 screen size 16BPP) +//if ((offset >= 0x100000 && offset <= 0x12C087) && who == GPU) + doGPUDis = true;//*/ +/*if (offset == 0x100000 + 128470) // 107,167 -> 128470 (384 x 250 screen size 16BPP) + WriteLog("JWW: Writing value %04X at %08X by %s...\n", data, offset, whoName[who]); +if ((data & 0xFF00) != 0x7700) + WriteLog("JWW: Writing value %04X at %08X by %s...\n", data, offset, whoName[who]);//*/ +/*if ((offset >= 0x100000 && offset <= 0x147FFF) && who == GPU) + return;//*/ +/*if ((data & 0xFF00) != 0x7700 && who == GPU) + WriteLog("JWW: Writing value %04X at %08X by %s...\n", data, offset, whoName[who]);//*/ +/*if ((offset >= 0x100000 + 0x48000 && offset <= 0x12C087 + 0x48000) && who == GPU) + return;//*/ +/*extern bool doGPUDis; +if (offset == 0x120216 && who == GPU) + doGPUDis = true;//*/ +/*extern uint32 gpu_pc; +if (who == GPU && (gpu_pc == 0xF03604 || gpu_pc == 0xF03638)) +{ + uint32 base = offset - (offset > 0x148000 ? 0x148000 : 0x100000); + uint32 y = base / 0x300; + uint32 x = (base - (y * 0x300)) / 2; + WriteLog("JWW: Writing starfield star %04X at %08X (%u/%u) [%s]\n", data, offset, x, y, (gpu_pc == 0xF03604 ? "s" : "L")); +}//*/ +/* +JWW: Writing starfield star 775E at 0011F650 (555984/1447) +*/ +//if (offset == (0x001E17F8 + 0x34)) +/*if (who == GPU && offset == (0x001E17F8 + 0x34)) + data = 0xFE3C;//*/ +// WriteLog("JWW: Write at %08X written to by %s.\n", 0x001E17F8 + 0x34, whoName[who]);//*/ +/*extern uint32 gpu_pc; +if (who == GPU && (gpu_pc == 0xF03604 || gpu_pc == 0xF03638)) +{ + extern int objectPtr; +// if (offset > 0x148000) +// return; + starCount++; + if (starCount > objectPtr) + return; + +// if (starCount == 1) +// WriteLog("--> Drawing 1st star...\n"); +// +// uint32 base = offset - (offset > 0x148000 ? 0x148000 : 0x100000); +// uint32 y = base / 0x300; +// uint32 x = (base - (y * 0x300)) / 2; +// WriteLog("JWW: Writing starfield star %04X at %08X (%u/%u) [%s]\n", data, offset, x, y, (gpu_pc == 0xF03604 ? "s" : "L")); + +//A star of interest... +//-->JWW: Writing starfield star 77C9 at 0011D31A (269/155) [s] +//1st trail +3(x), -1(y) -> 272, 154 -> 0011D020 +//JWW: Blitter writing echo 77B3 at 0011D022... +}//*/ +//extern bool doGPUDis; +/*if (offset == 0x11D022 + 0x48000 || offset == 0x11D022)// && who == GPU) +{ +// doGPUDis = true; + WriteLog("JWW: %s writing echo %04X at %08X...\n", whoName[who], data, offset); +// LogBlit(); +} +if (offset == 0x11D31A + 0x48000 || offset == 0x11D31A) + WriteLog("JWW: %s writing star %04X at %08X...\n", whoName[who], data, offset);//*/ + + jaguar_mainRam[(offset+0) & 0x3FFFFF] = data >> 8; jaguar_mainRam[(offset+1) & 0x3FFFFF] = data & 0xFF; return; } @@ -685,6 +1007,8 @@ void JaguarWriteLong(uint32 offset, uint32 data, uint32 who/*=UNKNOWN*/) WriteLog("JLW: Write to %08X by %s... Starting DSP log!\n\n", offset, whoName[who]); doDSPDis = true; }//*/ +/*if (offset == 0x0100)//64*4) + WriteLog("M68K: %s wrote dword to VI vector value %08X...\n", whoName[who], data);//*/ JaguarWriteWord(offset, data >> 16, who); JaguarWriteWord(offset+2, data & 0xFFFF, who); @@ -701,39 +1025,46 @@ void jaguar_init(void) 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"); + memory_malloc_secure((void **)&jaguar_bootRom, 0x040000, "Jaguar 68K CPU BIOS ROM"); // Only uses half of this! + memory_malloc_secure((void **)&jaguar_CDBootROM, 0x040000, "Jaguar 68K CPU CD BIOS 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... //NOTE: This *doesn't* fix FlipOut... +//Or does it? Hmm... +//Seems to want $01010101... Dunno why. Investigate! 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"); -// cd_bios_boot("C:\\ftp\\jaguar\\cd\\mystdemo.cdi"); -// cd_bios_boot("C:\\ftp\\jaguar\\cd\\battlemorph.cdi"); -// cd_bios_boot("C:\\ftp\\jaguar\\cd\\primalrage.cdi"); -// cd_bios_boot("C:\\ftp\\jaguar\\cd\\Dragons Lair.cdi"); +// memset(jaguar_mainRom, 0xFF, 0x600000); // & set it to all Fs... m68k_set_cpu_type(M68K_CPU_TYPE_68000); gpu_init(); DSPInit(); tom_init(); jerry_init(); - cdrom_init(); + CDROMInit(); +} + +void jaguar_reset(void) +{ + if (vjs.useJaguarBIOS) + memcpy(jaguar_mainRam, jaguar_bootRom, 8); + else + SET32(jaguar_mainRam, 4, jaguarRunAddress); + +// WriteLog("jaguar_reset():\n"); + tom_reset(); + jerry_reset(); + gpu_reset(); + DSPReset(); + CDROMReset(); + m68k_pulse_reset(); // Reset the 68000 + WriteLog("Jaguar: 68K reset. PC=%06X SP=%08X\n", m68k_get_reg(NULL, M68K_REG_PC), m68k_get_reg(NULL, M68K_REG_A7)); } 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++) @@ -800,6 +1131,9 @@ void jaguar_done(void) /* WriteLog("\n\nM68000 disassembly at $90006C...\n"); jaguar_dasm(0x90006C, 500); WriteLog("\n");//*/ +/* WriteLog("\n\nM68000 disassembly at $1AC000...\n"); + jaguar_dasm(0x1AC000, 6000); + WriteLog("\n");//*/ // WriteLog("Jaguar: CD BIOS version %04X\n", JaguarReadWord(0x3004)); WriteLog("Jaguar: Interrupt enable = %02X\n", TOMReadByte(0xF000E1) & 0x1F); @@ -807,59 +1141,16 @@ void jaguar_done(void) M68K_show_context(); //#endif - cd_bios_done(); - cdrom_done(); + CDROMDone(); gpu_done(); DSPDone(); tom_done(); jerry_done(); memory_free(jaguar_mainRom); - memory_free(jaguar_bootRom); memory_free(jaguar_mainRam); -} - -void jaguar_reset(void) -{ - if (vjs.useJaguarBIOS) - memcpy(jaguar_mainRam, jaguar_bootRom, 8); - else - { -// Should also make a run address global as well, for when we reset the jag (PD mainly) -/* SET32(jaguar_mainRam, 4, 0x00802000); - // Handle PD stuff... - // This should definitely go elsewhere (like in the cart load section)! -//NOTE: The bytes 'JAGR' should also be at position $1C... - if (jaguar_mainRom[0] == 0x60 && jaguar_mainRom[1] == 0x1A) - { - uint32 loadAddress = GET32(jaguar_mainRom, 0x22), runAddress = GET32(jaguar_mainRom, 0x2A); -//This is not always right! Especially when converted via bin2jag1!!! -//We should have access to the length of the furshlumiger file that was loaded anyway! -//Now, we do! ;-) -// uint32 progLength = GET32(jaguar_mainRom, 0x02); -//jaguarRomSize -//jaguarRunAddress -// WriteLog("Jaguar: Setting up PD ROM... Run address: %08X, length: %08X\n", runAddress, progLength); -// memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0x2E, progLength); - WriteLog("Jaguar: Setting up PD ROM... Run address: %08X, length: %08X\n", runAddress, jaguarRomSize - 0x2E); - memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0x2E, jaguarRomSize - 0x2E); - SET32(jaguar_mainRam, 4, runAddress); - }//*/ - SET32(jaguar_mainRam, 4, jaguarRunAddress); - } - -// WriteLog("jaguar_reset():\n"); -//#ifdef SOUND_OUTPUT -// ws_audio_reset(); -//#endif - cd_bios_reset(); - tom_reset(); - jerry_reset(); - gpu_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)); + memory_free(jaguar_bootRom); + memory_free(jaguar_CDBootROM); } // @@ -869,6 +1160,8 @@ void JaguarExecute(int16 * backbuffer, bool render) { uint16 vp = TOMReadWord(0xF0003E) + 1;//Hmm. This is a WO register. Will work? Looks like. But wrong behavior! uint16 vi = TOMReadWord(0xF0004E);//Another WO register... +//Using WO registers is OK, since we're the ones controlling access--there's nothing wrong here! ;-) + // uint16 vdb = TOMReadWord(0xF00046); //Note: This is the *definite* end of the display, though VDE *might* be less than this... // uint16 vbb = TOMReadWord(0xF00040); @@ -887,58 +1180,53 @@ void JaguarExecute(int16 * backbuffer, bool render) TOMResetBackbuffer(backbuffer); /*extern int effect_start; if (effect_start) -{ - WriteLog("JagExe: VP=%u, VI=%u, VDB=%u, VBB=%u CPU CPS=%u, GPU CPS=%u\n", vp, vi, vdb, vbb, M68KCyclesPerScanline, RISCCyclesPerScanline); -}//*/ + WriteLog("JagExe: VP=%u, VI=%u, CPU CPS=%u, GPU CPS=%u\n", vp, vi, M68KCyclesPerScanline, RISCCyclesPerScanline);//*/ //extern int start_logging; for(uint16 i=0; i 0 && tom_irq_enabled(IRQ_VBLANK)) // Time for Vertical Interrupt? { - if (tom_irq_enabled(IRQ_VBLANK))// && jaguar_interrupt_handler_is_valid(64)) - { - // We don't have to worry about autovectors & whatnot because the Jaguar - // tells you through its HW registers who sent the interrupt... - tom_set_pending_video_int(); - m68k_set_irq(7); - } + // We don't have to worry about autovectors & whatnot because the Jaguar + // tells you through its HW registers who sent the interrupt... + tom_set_pending_video_int(); + m68k_set_irq(7); } -// uint32 invalid_instruction_address = s68000exec(M68KCyclesPerScanline); -// if (invalid_instruction_address != 0x80000000) -// cd_bios_process(invalid_instruction_address); //if (start_logging) // WriteLog("About to execute M68K (%u)...\n", i); m68k_execute(M68KCyclesPerScanline); - // No CD handling... !!! FIX !!! -//if (start_logging) -// WriteLog("About to execute CD BIOS (%u)...\n", i); - cd_bios_exec(i); // NOTE: Ignores parameter... //if (start_logging) // WriteLog("About to execute TOM's PIT (%u)...\n", i); TOMExecPIT(RISCCyclesPerScanline); //if (start_logging) // WriteLog("About to execute JERRY's PIT (%u)...\n", i); - jerry_pit_exec(RISCCyclesPerScanline); + JERRYExecPIT(RISCCyclesPerScanline); //if (start_logging) // WriteLog("About to execute JERRY's SSI (%u)...\n", i); jerry_i2s_exec(RISCCyclesPerScanline); + BUTCHExec(RISCCyclesPerScanline); //if (start_logging) // WriteLog("About to execute GPU (%u)...\n", i); 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 (%u)...\n", i);