//
#include "jaguar.h"
+#include "video.h"
+#include "settings.h"
//#include "m68kdasmAG.h"
#define CPU_DEBUG
// 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 bool startMemLog; // Set by "e" key
extern int effect_start;
extern int effect_start2, effect_start3, effect_start4, effect_start5, effect_start6;
#endif
// These values are overridden by command line switches...
-bool dsp_enabled = false;
-bool jaguar_use_bios = true; // Default is now to USE the BIOS
+//extern bool dsp_enabled;
+//extern bool jaguar_use_bios; // Default is now to USE the BIOS
uint32 jaguar_active_memory_dumps = 0;
uint32 jaguar_mainRom_crc32;
void M68KInstructionHook(void)
{
uint32 m68kPC = m68k_get_reg(NULL, M68K_REG_PC);
+/* 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");
M68K_show_context();
log_done();
exit(0);
- }
+ }//*/
}
//
else if ((address >= 0xF10000) && (address <= 0xF1FFFE))
JERRYWriteWord(address, value, M68K);
else
+ {
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)
// Unknown read/write byte/word routines
//
+// 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
void JaguarWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/)
{
//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);
-//if ((offset >= 0x1FF020 && offset <= 0x1FF03F) || (offset >= 0x1FF820 && offset <= 0x1FF83F))
-// WriteLog("JagWW: Writing %04X at %08X\n", data, offset);
+// PLUS, you would handle this in the GPU/DSP WriteLong code! Not here!
offset &= 0xFFFFFF;
-
+
if (offset <= 0x3FFFFE)
{
+//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)
{
CDROMWriteWord(offset, data, who);
return;
}
- else if ((offset >= 0xF00000) && (offset <= 0xF0FFFE))
+ else if (offset >= 0xF00000 && offset <= 0xF0FFFE)
{
TOMWriteWord(offset, data, who);
return;
}
- else if ((offset >= 0xF10000) && (offset <= 0xF1FFFE))
+ else if (offset >= 0xF10000 && offset <= 0xF1FFFE)
{
JERRYWriteWord(offset, data, who);
return;
}
-
+ // Don't bomb on attempts to write to ROM
+ else if (offset >= 0x800000 && offset <= 0xEFFFFF)
+ return;
+
jaguar_unknown_writeword(offset, data, who);
}
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");
jaguar_dasm(0x802B00, 500);
WriteLog("\n");//*/
-/* WriteLog("\n\nM68000 disassembly at $8099F8...\n");
+/* 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);
void jaguar_reset(void)
{
- if (jaguar_use_bios)
+ if (vjs.useJaguarBIOS)
memcpy(jaguar_mainRam, jaguar_bootRom, 8);
else
{
{
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...
- uint16 vdb = TOMReadWord(0xF00046);
+// uint16 vdb = TOMReadWord(0xF00046);
//Note: This is the *definite* end of the display, though VDE *might* be less than this...
// uint16 vbb = TOMReadWord(0xF00040);
//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);
+// uint16 vde = TOMReadWord(0xF00048);
- uint16 refreshRate = (hardwareTypeNTSC ? 60 : 50);
+ uint16 refreshRate = (vjs.hardwareTypeNTSC ? 60 : 50);
// Should these be hardwired or read from VP? Yes, from VP!
uint32 M68KCyclesPerScanline
- = (hardwareTypeNTSC ? M68K_CLOCK_RATE_NTSC : M68K_CLOCK_RATE_PAL) / (vp * refreshRate);
+ = (vjs.hardwareTypeNTSC ? M68K_CLOCK_RATE_NTSC : M68K_CLOCK_RATE_PAL) / (vp * refreshRate);
uint32 RISCCyclesPerScanline
- = (hardwareTypeNTSC ? RISC_CLOCK_RATE_NTSC : RISC_CLOCK_RATE_PAL) / (vp * refreshRate);
+ = (vjs.hardwareTypeNTSC ? RISC_CLOCK_RATE_NTSC : RISC_CLOCK_RATE_PAL) / (vp * refreshRate);
+ TOMResetBackbuffer(backbuffer);
/*extern int effect_start;
if (effect_start)
{
m68k_set_irq(7);
}
}
-
+
// uint32 invalid_instruction_address = s68000exec(M68KCyclesPerScanline);
// if (invalid_instruction_address != 0x80000000)
// cd_bios_process(invalid_instruction_address);
m68k_execute(M68KCyclesPerScanline);
// No CD handling... !!! FIX !!!
cd_bios_exec(i); // NOTE: Ignores parameter...
- tom_pit_exec(RISCCyclesPerScanline);
+ TOMExecPIT(RISCCyclesPerScanline);
jerry_pit_exec(RISCCyclesPerScanline);
jerry_i2s_exec(RISCCyclesPerScanline);
gpu_exec(RISCCyclesPerScanline);
- if (dsp_enabled)
- DSPExec(RISCCyclesPerScanline);
-//Interlacing is still not handled correctly here... !!! FIX !!!
- if (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 (vjs.DSPEnabled)
+// DSPExec(RISCCyclesPerScanline);
+// Do pipelined DSP execution (3 stage)...
+ DSPExecP2(RISCCyclesPerScanline);
+
+ TOMExecScanline(i, render);
}
}