X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmemory.cpp;h=64921476a00598e9707348ffad971f70054b2bba;hb=178d7f01b40cf8367cfe5b71219e6d20f60f92d4;hp=c1b299a5e2b38b4f18d1ae6cac3e10e2f64cdb2e;hpb=e27b52c2a13e2f7476fbe981e30043fb1b6e592a;p=virtualjaguar diff --git a/src/memory.cpp b/src/memory.cpp index c1b299a..6492147 100644 --- a/src/memory.cpp +++ b/src/memory.cpp @@ -1,9 +1,9 @@ // // Jaguar memory and I/O physical (hosted!) memory // -// by James L. Hammons +// by James Hammons // -// JLH = James L. Hammons +// JLH = James Hammons // // WHO WHEN WHAT // --- ---------- ----------------------------------------------------------- @@ -35,9 +35,14 @@ uint8 * cdRAM = &jagMemSpace[0xDFFF00]; uint8 * gpuRAM = &jagMemSpace[0xF03000]; uint8 * dspRAM = &jagMemSpace[0xF1B000]; -uint8 jaguarBootROM[0x040000]; // 68K CPU BIOS ROM--uses only half of this! -uint8 jaguarCDBootROM[0x040000]; // 68K CPU CD BIOS ROM (256K) +//uint8 jaguarBootROM[0x040000]; // 68K CPU BIOS ROM--uses only half of this! +//uint8 jaguarCDBootROM[0x040000]; // 68K CPU CD BIOS ROM (256K) +//uint8 jaguarDevBootROM1[0x040000]; // 68K CPU Stubulator 1 ROM--uses only half of this! +//uint8 jaguarDevBootROM2[0x040000]; // 68K CPU Stubulator 2 ROM--uses only half of this! +//uint8 jaguarDevCDBootROM[0x040000]; // 68K CPU Dev CD BIOS ROM (256K) +// This is an ORed value showing which BIOSes having been loaded into memory. +//int biosAvailable = 0; #if 0 union Word @@ -148,6 +153,10 @@ uint32 butch, dscntrl, ds_data, i2cntrl, sbcntrl, subdata, subdatb, sb_time, fif //this isn't endian safe... #define BSWAP64(x) ((htonl(x & 0xFFFFFFFF) << 32) | htonl(x >> 32)) // Actually, we use ESAFExx() macros instead of this, and we use GCC to check the endianness... +// Actually, considering that "byteswap.h" doesn't exist elsewhere, the above +// is probably our best bet here. Just need to rename them to ESAFExx(). + +// Look at and see if that header is portable or not. uint16 & memcon1 = *((uint16 *)&jagMemSpace[0xF00000]); uint16 & memcon2 = *((uint16 *)&jagMemSpace[0xF00002]);