X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.cpp;h=e80b356b199edbe6567e83da278923c957c429bb;hb=cdc64706c10d3fe005fecff5d000fe60b3980a3b;hp=bb940718ba9122a4fbbc2358f0cf8f4f6c4654a0;hpb=4906545f5d77d6d7a006fa0d765dc0ae522e477f;p=virtualjaguar diff --git a/src/jaguar.cpp b/src/jaguar.cpp index bb94071..e80b356 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) @@ -376,8 +376,21 @@ CD_switch:: -> $306C 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)); + uint32 address = topOfStack - (8 * 4 * 3); + for(int i=0; i<10; i++) - WriteLog("%06X: %08X\n", topOfStack - (i * 4), JaguarReadLong(topOfStack - (i * 4))); + { + WriteLog("%06X:", address); + + for(int j=0; j<8; j++) + { + WriteLog(" %08X", JaguarReadLong(address); + address += 4; + } + + WriteLog("\n"); + } + WriteLog("Jaguar: VBL interrupt is %s\n", ((TOMIRQEnabled(IRQ_VIDEO)) && (JaguarInterruptHandlerIsValid(64))) ? "enabled" : "disabled"); M68K_show_context(); @@ -852,7 +865,7 @@ void ShowM68KContext(void) } // -// Musashi 68000 read/write/IRQ functions +// Custom UAE 68000 read/write/IRQ functions // #if 0 @@ -1454,7 +1467,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 @@ -1736,7 +1749,7 @@ void JaguarInit(void) //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(); @@ -1750,6 +1763,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 @@ -1770,8 +1785,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)); @@ -1900,8 +1913,8 @@ 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(0x802000, 0x1000); @@ -1911,89 +1924,6 @@ void JaguarDone(void) // 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 @@ -2008,11 +1938,13 @@ void DumpMainMemory(void) fclose(fp); } + uint8 * GetRamPtr(void) { return jaguarMainRAM; } + // // New Jaguar execution stack // This executes 1 frame's worth of code. @@ -2032,19 +1964,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 @@ -2065,7 +1990,7 @@ void JaguarExecuteNew(void) // it will be half this number for a half frame. BUT, since we're counting // HALF lines, we double this number and we're back at 525 for NTSC, 625 for PAL. // -// Scanline times are 63.5555... µs in NTSC and 64 µs in PAL +// Scanline times are 63.5555... s in NTSC and 64 s in PAL // Half line times are, naturally, half of this. :-P void HalflineCallback(void) { @@ -2129,6 +2054,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