X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.cpp;h=cff72cce4d3d0d8f72bda271a458fecb217b2532;hb=6f25f63a18153bc2adc49c5f9a3862c2760716df;hp=b6c9f194ce4d80410e5732882db70d2ba53a6a6c;hpb=f30bf746981a99079e766b0d4e9de5391a4175ff;p=virtualjaguar diff --git a/src/jaguar.cpp b/src/jaguar.cpp index b6c9f19..cff72cc 100644 --- a/src/jaguar.cpp +++ b/src/jaguar.cpp @@ -28,7 +28,7 @@ #include "jerry.h" #include "joystick.h" #include "log.h" -#include "m68k.h" +#include "m68000/m68kinterface.h" //#include "memory.h" #include "mmu.h" #include "settings.h" @@ -133,7 +133,7 @@ if (inRoutine) static char buffer[2048]; for(int i=0; i<0x400; i++) { - m68k_disassemble(buffer, pcQueue[(pcQPtr + i) & 0x3FF], M68K_CPU_TYPE_68000); + m68k_disassemble(buffer, pcQueue[(pcQPtr + i) & 0x3FF], 0);//M68K_CPU_TYPE_68000); WriteLog("\t%08X: %s\n", pcQueue[(pcQPtr + i) & 0x3FF], buffer); } WriteLog("\n"); @@ -273,7 +273,7 @@ if (m68kPC == 0x802058) start = true; if (m68kPC == 0x82E1A) { static char buffer[2048]; - m68k_disassemble(buffer, m68kPC, M68K_CPU_TYPE_68000); + m68k_disassemble(buffer, m68kPC, 0);//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), @@ -356,7 +356,7 @@ CD_switch:: -> $306C #endif #ifdef ABORT_ON_ILLEGAL_INSTRUCTIONS - if (!m68k_is_valid_instruction(m68k_read_memory_16(m68kPC), M68K_CPU_TYPE_68000)) + if (!m68k_is_valid_instruction(m68k_read_memory_16(m68kPC), 0))//M68K_CPU_TYPE_68000)) { #ifndef ABORT_ON_OFFICIAL_ILLEGAL_INSTRUCTION if (m68k_read_memory_16(m68kPC) == 0x4AFC) @@ -852,7 +852,7 @@ void ShowM68KContext(void) } // -// Musashi 68000 read/write/IRQ functions +// Custom UAE 68000 read/write/IRQ functions // #if 0 @@ -942,7 +942,8 @@ unsigned int m68k_read_memory_8(unsigned int address) // Musashi does this automagically for you, UAE core does not :-P address &= 0x00FFFFFF; #ifdef CPU_DEBUG_MEMORY - if ((address >= 0x000000) && (address <= 0x3FFFFF)) + // Note that the Jaguar only has 2M of RAM, not 4! + if ((address >= 0x000000) && (address <= 0x1FFFFF)) { if (startMemLog) readMem[address] = 1; @@ -956,7 +957,8 @@ unsigned int m68k_read_memory_8(unsigned int address) #ifndef USE_NEW_MMU unsigned int retVal = 0; - if ((address >= 0x000000) && (address <= 0x3FFFFF)) + // Note that the Jaguar only has 2M of RAM, not 4! + if ((address >= 0x000000) && (address <= 0x1FFFFF)) retVal = jaguarMainRAM[address]; // else if ((address >= 0x800000) && (address <= 0xDFFFFF)) else if ((address >= 0x800000) && (address <= 0xDFFEFF)) @@ -1054,7 +1056,8 @@ unsigned int m68k_read_memory_16(unsigned int address) #ifndef USE_NEW_MMU unsigned int retVal = 0; - if ((address >= 0x000000) && (address <= 0x3FFFFE)) + // Note that the Jaguar only has 2M of RAM, not 4! + if ((address >= 0x000000) && (address <= 0x1FFFFE)) // retVal = (jaguar_mainRam[address] << 8) | jaguar_mainRam[address+1]; retVal = GET16(jaguarMainRAM, address); // else if ((address >= 0x800000) && (address <= 0xDFFFFE)) @@ -1108,7 +1111,8 @@ void m68k_write_memory_8(unsigned int address, unsigned int value) // Musashi does this automagically for you, UAE core does not :-P address &= 0x00FFFFFF; #ifdef CPU_DEBUG_MEMORY - if ((address >= 0x000000) && (address <= 0x3FFFFF)) + // Note that the Jaguar only has 2M of RAM, not 4! + if ((address >= 0x000000) && (address <= 0x1FFFFF)) { if (startMemLog) { @@ -1136,7 +1140,8 @@ void m68k_write_memory_8(unsigned int address, unsigned int value) printf("M68K: (8) Tripwire hit...\n");//*/ #ifndef USE_NEW_MMU - if ((address >= 0x000000) && (address <= 0x3FFFFF)) + // Note that the Jaguar only has 2M of RAM, not 4! + if ((address >= 0x000000) && (address <= 0x1FFFFF)) jaguarMainRAM[address] = value; else if ((address >= 0xDFFF00) && (address <= 0xDFFFFF)) CDROMWriteByte(address, value, M68K); @@ -1156,7 +1161,8 @@ void m68k_write_memory_16(unsigned int address, unsigned int value) // Musashi does this automagically for you, UAE core does not :-P address &= 0x00FFFFFF; #ifdef CPU_DEBUG_MEMORY - if ((address >= 0x000000) && (address <= 0x3FFFFE)) + // Note that the Jaguar only has 2M of RAM, not 4! + if ((address >= 0x000000) && (address <= 0x1FFFFE)) { if (startMemLog) { @@ -1211,7 +1217,8 @@ if (address == 0xF02110) }//*/ #ifndef USE_NEW_MMU - if ((address >= 0x000000) && (address <= 0x3FFFFE)) + // Note that the Jaguar only has 2M of RAM, not 4! + if ((address >= 0x000000) && (address <= 0x1FFFFE)) { /* jaguar_mainRam[address] = value >> 8; jaguar_mainRam[address + 1] = value & 0xFF;*/ @@ -1447,7 +1454,7 @@ void JaguarDasm(uint32 offset, uint32 qt) pc += Dasm68000((char *)mem, buffer, 0); WriteLog("%08X: %s\n", oldpc, buffer);//*/ oldpc = pc; - pc += m68k_disassemble(buffer, pc, M68K_CPU_TYPE_68000); + pc += m68k_disassemble(buffer, pc, 0);//M68K_CPU_TYPE_68000); WriteLog("%08X: %s\n", oldpc, buffer);//*/ } #endif @@ -1458,7 +1465,7 @@ uint8 JaguarReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) uint8 data = 0x00; offset &= 0xFFFFFF; - if (offset < 0x400000) + if (offset < 0x200000) data = jaguarMainRAM[offset & 0x3FFFFF]; else if ((offset >= 0x800000) && (offset < 0xC00000)) data = jaguarMainROM[offset - 0x800000]; @@ -1481,9 +1488,9 @@ uint8 JaguarReadByte(uint32 offset, uint32 who/*=UNKNOWN*/) uint16 JaguarReadWord(uint32 offset, uint32 who/*=UNKNOWN*/) { offset &= 0xFFFFFF; - if (offset <= 0x3FFFFE) + if (offset <= 0x1FFFFE) { - return (jaguarMainRAM[(offset+0) & 0x3FFFFF] << 8) | jaguarMainRAM[(offset+1) & 0x3FFFFF]; + return (jaguarMainRAM[(offset+0) & 0x1FFFFF] << 8) | jaguarMainRAM[(offset+1) & 0x1FFFFF]; } else if ((offset >= 0x800000) && (offset <= 0xBFFFFE)) { @@ -1515,9 +1522,9 @@ void JaguarWriteByte(uint32 offset, uint8 data, uint32 who/*=UNKNOWN*/) WriteLog("JWB: Byte %02X written at %08X by %s\n", data, offset, whoName[who]);//*/ offset &= 0xFFFFFF; - if (offset < 0x400000) + if (offset < 0x200000) { - jaguarMainRAM[offset & 0x3FFFFF] = data; + jaguarMainRAM[offset & 0x1FFFFF] = data; return; } else if ((offset >= 0xDFFF00) && (offset <= 0xDFFFFF)) @@ -1559,7 +1566,7 @@ if (offset == 0x0102)//64*4) offset &= 0xFFFFFF; - if (offset <= 0x3FFFFE) + if (offset <= 0x1FFFFE) { /* GPU Table (CD BIOS) @@ -1647,8 +1654,8 @@ if (who == GPU && (gpu_pc == 0xF03604 || gpu_pc == 0xF03638)) if (offset == 0x11D31A + 0x48000 || offset == 0x11D31A) WriteLog("JWW: %s writing star %04X at %08X...\n", whoName[who], data, offset);//*/ - jaguarMainRAM[(offset+0) & 0x3FFFFF] = data >> 8; - jaguarMainRAM[(offset+1) & 0x3FFFFF] = data & 0xFF; + jaguarMainRAM[(offset+0) & 0x1FFFFF] = data >> 8; + jaguarMainRAM[(offset+1) & 0x1FFFFF] = data & 0xFF; return; } else if (offset >= 0xDFFF00 && offset <= 0xDFFFFE) @@ -1717,7 +1724,7 @@ void JaguarInit(void) memset(writeMemMin, 0xFF, 0x400000); memset(writeMemMax, 0x00, 0x400000); #endif - memset(jaguarMainRAM, 0x00, 0x400000); + memset(jaguarMainRAM, 0x00, 0x200000); // 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... @@ -1726,8 +1733,10 @@ void JaguarInit(void) memset(jaguarMainROM, 0x01, 0x600000); // & set it to all 01s... // memset(jaguar_mainRom, 0xFF, 0x600000); // & set it to all Fs... lowerField = false; // Reset the lower field flag +//temp, for crappy crap that sux +memset(jaguarMainRAM + 0x804, 0xFF, 4); - m68k_set_cpu_type(M68K_CPU_TYPE_68000); +// m68k_set_cpu_type(M68K_CPU_TYPE_68000); m68k_pulse_reset(); // Need to do this so UAE disasm doesn't segfault on exit GPUInit(); DSPInit(); @@ -1741,6 +1750,8 @@ void HalflineCallback(void); void RenderCallback(void); void JaguarReset(void) { + // New timer base code stuffola... + InitializeEventList(); //Need to change this so it uses the single RAM space and load the BIOS //into it somewhere... //Also, have to change this here and in JaguarReadXX() currently @@ -1761,8 +1772,6 @@ void JaguarReset(void) WriteLog("Jaguar: 68K reset. PC=%06X SP=%08X\n", m68k_get_reg(NULL, M68K_REG_PC), m68k_get_reg(NULL, M68K_REG_A7)); lowerField = false; // Reset the lower field flag - // New timer base code stuffola... - InitializeEventList(); // SetCallbackTime(ScanlineCallback, 63.5555); // SetCallbackTime(ScanlineCallback, 31.77775); SetCallbackTime(HalflineCallback, (vjs.hardwareTypeNTSC ? 31.777777777 : 32.0)); @@ -1891,100 +1900,17 @@ void JaguarDone(void) JaguarDasm(0x802000, 6000); WriteLog("\n");//*/ #endif -/* WriteLog("\n\nM68000 disassembly at $4000...\n"); - JaguarDasm(0x4000, 10000); +/* WriteLog("\n\nM68000 disassembly at $6004...\n"); + JaguarDasm(0x6004, 10000); WriteLog("\n");//*/ // WriteLog("\n\nM68000 disassembly at $802000...\n"); -// JaguarDasm(0x800830, 0x1000); +// JaguarDasm(0x802000, 0x1000); // WriteLog("\n\nM68000 disassembly at $4100...\n"); // JaguarDasm(0x4100, 200); // WriteLog("\n\nM68000 disassembly at $800800...\n"); // JaguarDasm(0x800800, 0x1000); } -// -// Main Jaguar execution loop (1 frame) -// -void JaguarExecute(uint32 * backbuffer, bool render) -{ - uint16 vp = TOMReadWord(0xF0003E, JAGUAR) + 1; - uint16 vi = TOMReadWord(0xF0004E, JAGUAR); -//Using WO registers is OK, since we're the ones controlling access--there's nothing wrong here! ;-) -//Though we shouldn't be able to do it using TOMReadWord... !!! FIX !!! - -// uint16 vdb = TOMReadWord(0xF00046, JAGUAR); -//Note: This is the *definite* end of the display, though VDE *might* be less than this... -// uint16 vbb = TOMReadWord(0xF00040, JAGUAR); -//It seems that they mean it when they say that VDE is the end of object processing. -//However, we need to be able to tell the OP (or TOM) that we've reached the end of the -//buffer and not to write any more pixels... !!! FIX !!! -// uint16 vde = TOMReadWord(0xF00048, JAGUAR); - - uint16 refreshRate = (vjs.hardwareTypeNTSC ? 60 : 50); - uint32 m68kClockRate = (vjs.hardwareTypeNTSC ? M68K_CLOCK_RATE_NTSC : M68K_CLOCK_RATE_PAL); -//Not sure the above is correct, since the number of lines and timings given in the JTRM -//seem to indicate the refresh rate is *half* the above... -// uint16 refreshRate = (vjs.hardwareTypeNTSC ? 30 : 25); - // Should these be hardwired or read from VP? Yes, from VP! - // Err, actually, they should be hardwired, and hardwired to a set # of - // lines as well... - uint32 M68KCyclesPerScanline = m68kClockRate / (vp * refreshRate); - uint32 RISCCyclesPerScanline = m68kClockRate / (vp * refreshRate); - -/*extern int effect_start; -if (effect_start) - 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 && TOMIRQEnabled(IRQ_VIDEO)) // Time for Vertical Interrupt? - { - // We don't have to worry about autovectors & whatnot because the Jaguar - // tells you through its HW registers who sent the interrupt... - TOMSetPendingVideoInt(); - m68k_set_irq(2); - } - -//if (start_logging) -// WriteLog("About to execute M68K (%u)...\n", i); - m68k_execute(M68KCyclesPerScanline); -//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); - JERRYExecPIT(RISCCyclesPerScanline); -//if (start_logging) -// WriteLog("About to execute JERRY's SSI (%u)...\n", i); - JERRYI2SExec(RISCCyclesPerScanline); - BUTCHExec(RISCCyclesPerScanline); -//if (start_logging) -// WriteLog("About to execute GPU (%u)...\n", i); - if (vjs.GPUEnabled) - GPUExec(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); - TOMExecHalfline(i, render); - } -} // Temp debugging stuff @@ -1999,11 +1925,13 @@ void DumpMainMemory(void) fclose(fp); } + uint8 * GetRamPtr(void) { return jaguarMainRAM; } + // // New Jaguar execution stack // This executes 1 frame's worth of code. @@ -2023,19 +1951,12 @@ void JaguarExecuteNew(void) if (vjs.GPUEnabled) GPUExec(USEC_TO_RISC_CYCLES(timeToNextEvent)); - if (vjs.DSPEnabled) - { - if (vjs.usePipelinedDSP) - DSPExecP2(USEC_TO_RISC_CYCLES(timeToNextEvent)); // Pipelined DSP execution (3 stage)... - else - DSPExec(USEC_TO_RISC_CYCLES(timeToNextEvent)); // Ordinary non-pipelined DSP - } - HandleNextEvent(); } while (!frameDone); } + #define USE_CORRECT_PAL_TIMINGS // A lot of confusion comes from here... // The thing to keep in mind is that the VC is advanced every HALF line, regardless @@ -2120,6 +2041,7 @@ void HalflineCallback(void) #endif } + // This isn't currently used, but maybe it should be... /* Nah, the scanline based code is good enough, and runs in 1 frame. The GUI