X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmemory.cpp;h=64921476a00598e9707348ffad971f70054b2bba;hb=685bb45b7766e8a12cd0de8ee486b9a61183c425;hp=0343f612755aa5c5bc262a6a6aebf7923ea1b51c;hpb=4c951d1b043c8ee14603ffdc6704962280df40d6;p=virtualjaguar diff --git a/src/memory.cpp b/src/memory.cpp index 0343f61..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,9 +153,11 @@ 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... -// Acutally, considering that "byteswap.h" doesn't exist elsewhere, the above +// 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]); uint16 & hc = *((uint16 *)&jagMemSpace[0xF00004]);