ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some warnings from the previous BUS commit, and added support for Linux/UNIX.

This commit is contained in:
Stephen Anthony 2022-06-11 20:55:43 -02:30
parent c78f9e26b6
commit 0445a20e13
3 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changes.txt
View File

@ -54,6 +54,10 @@
* Added ARM chip auto detection. * Added ARM chip auto detection.
* Extended support for older BUS (experimental) ROMs that worked
with an older, obsolete version of the BUS scheme; special thanks
to SpiceWare for the code.
* Fixed Stella crash due to invalid ZIP files. * Fixed Stella crash due to invalid ZIP files.
* Fixed TV mode auto detection in some ARM ROMs. * Fixed TV mode auto detection in some ARM ROMs.

3
src/debugger/gui/module.mk
View File

@ -15,11 +15,12 @@ MODULE_OBJS := \
src/debugger/gui/Cart4A50Widget.o \ src/debugger/gui/Cart4A50Widget.o \
src/debugger/gui/Cart4KSCWidget.o \ src/debugger/gui/Cart4KSCWidget.o \
src/debugger/gui/Cart4KWidget.o \ src/debugger/gui/Cart4KWidget.o \
src/debugger/gui/CartARMWidget.o \ src/debugger/gui/CartARMWidget.o \
src/debugger/gui/CartARWidget.o \ src/debugger/gui/CartARWidget.o \
src/debugger/gui/CartBFSCWidget.o \ src/debugger/gui/CartBFSCWidget.o \
src/debugger/gui/CartBFWidget.o \ src/debugger/gui/CartBFWidget.o \
src/debugger/gui/CartBUSWidget.o \ src/debugger/gui/CartBUSWidget.o \
src/debugger/gui/CartBUSInfoWidget.o \
src/debugger/gui/CartCDFWidget.o \ src/debugger/gui/CartCDFWidget.o \
src/debugger/gui/CartCDFInfoWidget.o \ src/debugger/gui/CartCDFInfoWidget.o \
src/debugger/gui/CartCMWidget.o \ src/debugger/gui/CartCMWidget.o \

116
src/emucore/CartBUS.cxx
View File

@ -55,12 +55,12 @@ CartridgeBUS::CartridgeBUS(const ByteBuffer& image, size_t size,
// Detect cart version // Detect cart version
setupVersion(); setupVersion();
// Pointer to BUS driver in RAM // Pointer to BUS driver in RAM
myDriverImage = myRAM.data(); myDriverImage = myRAM.data();
bool devSettings = settings.getBool("dev.settings"); bool devSettings = settings.getBool("dev.settings");
if (myBUSSubtype == BUSSubtype::BUS0) if (myBUSSubtype == BUSSubtype::BUS0)
{ {
// BUS0 driver is 3K, so configuration is different from others // BUS0 driver is 3K, so configuration is different from others
@ -68,10 +68,10 @@ CartridgeBUS::CartridgeBUS(const ByteBuffer& image, size_t size,
// Pointer to the program ROM (28K @ 0 byte offset) // Pointer to the program ROM (28K @ 0 byte offset)
myProgramImage = myImage.get() + 3_KB; myProgramImage = myImage.get() + 3_KB;
// Pointer to the display RAM // Pointer to the display RAM
myDisplayImage = myRAM.data() + 0x0C00; myDisplayImage = myRAM.data() + 0x0C00;
// Create Thumbulator ARM emulator // Create Thumbulator ARM emulator
myThumbEmulator = make_unique<Thumbulator>( myThumbEmulator = make_unique<Thumbulator>(
reinterpret_cast<uInt16*>(myImage.get()), reinterpret_cast<uInt16*>(myImage.get()),
@ -90,10 +90,10 @@ CartridgeBUS::CartridgeBUS(const ByteBuffer& image, size_t size,
{ {
// BUS1+ drivers are 2K // BUS1+ drivers are 2K
createRomAccessArrays(28_KB); createRomAccessArrays(28_KB);
// Pointer to the program ROM (28K @ 0 byte offset) // Pointer to the program ROM (28K @ 0 byte offset)
myProgramImage = myImage.get() + 4_KB; myProgramImage = myImage.get() + 4_KB;
// Pointer to the display RAM // Pointer to the display RAM
myDisplayImage = myRAM.data() + 0x0800; myDisplayImage = myRAM.data() + 0x0800;
@ -300,16 +300,16 @@ uInt8 CartridgeBUS::peek(uInt16 address)
myBusOverdriveAddress = peekvalue; myBusOverdriveAddress = peekvalue;
mySTYZeroPageAddress = 0; mySTYZeroPageAddress = 0;
if (address < 0x20 && if (address < 0x20 &&
(myBUSSubtype == BUSSubtype::BUS1 || myBUSSubtype == BUSSubtype::BUS2)) (myBUSSubtype == BUSSubtype::BUS1 || myBUSSubtype == BUSSubtype::BUS2))
{ {
uInt8 result = 0; uInt8 result = 0;
// Get the index of the data fetcher that's being accessed // Get the index of the data fetcher that's being accessed
uInt32 index = address & 0x0f; uInt32 index = address & 0x0f;
uInt32 function = (address >> 4) & 0x01; uInt32 function = (address >> 4) & 0x01;
switch(function) switch(function)
{ {
case 0x00: // read from a datastream case 0x00: // read from a datastream
@ -333,24 +333,24 @@ uInt8 CartridgeBUS::peek(uInt16 address)
case 0x09: // 0x19 STUFFMODE case 0x09: // 0x19 STUFFMODE
case 0x0a: // 0x1A CALLFN case 0x0a: // 0x1A CALLFN
break; break;
case 0x08: // 0x18 = AMPLITUDE case 0x08: // 0x18 = AMPLITUDE
// Update the music data fetchers (counter & flag) // Update the music data fetchers (counter & flag)
updateMusicModeDataFetchers(); updateMusicModeDataFetchers();
// using myDisplayImage[] instead of myProgramImage[] because waveforms // using myDisplayImage[] instead of myProgramImage[] because waveforms
// can be modified during runtime. // can be modified during runtime.
uInt32 i = myDisplayImage[(getWaveform(0) ) + (myMusicCounters[0] >> myMusicWaveformSize[0])] + uInt32 i = myDisplayImage[(getWaveform(0) ) + (myMusicCounters[0] >> myMusicWaveformSize[0])] +
myDisplayImage[(getWaveform(1) ) + (myMusicCounters[1] >> myMusicWaveformSize[1])] + myDisplayImage[(getWaveform(1) ) + (myMusicCounters[1] >> myMusicWaveformSize[1])] +
myDisplayImage[(getWaveform(2) ) + (myMusicCounters[2] >> myMusicWaveformSize[2])]; myDisplayImage[(getWaveform(2) ) + (myMusicCounters[2] >> myMusicWaveformSize[2])];
result = uInt8(i); result = uInt8(i);
break; break;
} }
break; break;
} }
} }
return result; return result;
} }
else if (address >= 0xFEE && address <= 0xFF3 && myBUSSubtype == BUSSubtype::BUS3) else if (address >= 0xFEE && address <= 0xFF3 && myBUSSubtype == BUSSubtype::BUS3)
@ -408,10 +408,13 @@ uInt8 CartridgeBUS::peek(uInt16 address)
{ {
switch(address) switch(address)
{ {
case 0x00 ... 0x0f: case 0x00: case 0x01: case 0x02: case 0x03:
case 0x04: case 0x05: case 0x06: case 0x07:
case 0x08: case 0x09: case 0x0a: case 0x0b:
case 0x0c: case 0x0d: case 0x0e: case 0x0f:
peekvalue = readFromDatastream(address); peekvalue = readFromDatastream(address);
break; break;
case 0xFF6: case 0xFF6:
// Set the current bank to the first 4k bank // Set the current bank to the first 4k bank
bank(0); bank(0);
@ -521,15 +524,13 @@ bool CartridgeBUS::poke(uInt16 address, uInt8 value)
} }
else else
{ {
uInt32 pointer = 0;
address &= 0x0FFF; address &= 0x0FFF;
if (myBUSSubtype == BUSSubtype::BUS0) if (myBUSSubtype == BUSSubtype::BUS0)
{ {
uInt32 index = address & 0x0f; uInt32 index = address & 0x0f;
uInt32 pointer, increment; uInt32 pointer = 0, increment = 0;
switch(address) switch(address)
{ {
case 0x10: // DS0WRITE case 0x10: // DS0WRITE
@ -541,25 +542,28 @@ bool CartridgeBUS::poke(uInt16 address, uInt8 value)
// //
// P = Pointer // P = Pointer
// F = Fractional // F = Fractional
pointer = getDatastreamPointer(index); pointer = getDatastreamPointer(index);
myDisplayImage[ pointer >> 20 ] = value; myDisplayImage[ pointer >> 20 ] = value;
pointer += 0x100000; // always increment by 1 when writing pointer += 0x100000; // always increment by 1 when writing
setDatastreamPointer(index, pointer); setDatastreamPointer(index, pointer);
break; break;
case 0x1B: // CALLFN case 0x1B: // CALLFN
callFunction(value); callFunction(value);
break; break;
case 0x1c: // BUSSTUFF case 0x1c: // BUSSTUFF
if (value==0) if (value==0)
myMode = 0; // lower nybble 0 = STUFFON in BUS3 myMode = 0; // lower nybble 0 = STUFFON in BUS3
else else
myMode = 0x0f; // lower nybble f = STUFFOFF in BUS3 myMode = 0x0f; // lower nybble f = STUFFOFF in BUS3
break; break;
case 0x20 ... 0x2f: case 0x20: case 0x21: case 0x22: case 0x23:
case 0x24: case 0x25: case 0x26: case 0x27:
case 0x28: case 0x29: case 0x2a: case 0x2b:
case 0x2c: case 0x2d: case 0x2e: case 0x2f:
// Pointers are stored as: // Pointers are stored as:
// PPPFF--- // PPPFF---
// //
@ -571,8 +575,11 @@ bool CartridgeBUS::poke(uInt16 address, uInt8 value)
pointer |= (value << 20); pointer |= (value << 20);
setDatastreamPointer(index, pointer); setDatastreamPointer(index, pointer);
break; break;
case 0x30 ... 0x3f: // DSxINC case 0x30: case 0x31: case 0x32: case 0x33: // DSxINC
case 0x34: case 0x35: case 0x36: case 0x37:
case 0x38: case 0x39: case 0x3a: case 0x3b:
case 0x3c: case 0x3d: case 0x3e: case 0x3f:
// Increments are stored as // Increments are stored as
// ----IIFF // ----IIFF
// //
@ -584,38 +591,38 @@ bool CartridgeBUS::poke(uInt16 address, uInt8 value)
index &= 0xffff; index &= 0xffff;
setDatastreamIncrement(index, increment); setDatastreamIncrement(index, increment);
break; break;
case 0xFF6: case 0xFF6:
// Set the current bank to the first 4k bank // Set the current bank to the first 4k bank
bank(0); bank(0);
break; break;
case 0x0FF7: case 0x0FF7:
// Set the current bank to the second 4k bank // Set the current bank to the second 4k bank
bank(1); bank(1);
break; break;
case 0x0FF8: case 0x0FF8:
// Set the current bank to the third 4k bank // Set the current bank to the third 4k bank
bank(2); bank(2);
break; break;
case 0x0FF9: case 0x0FF9:
// Set the current bank to the fourth 4k bank // Set the current bank to the fourth 4k bank
bank(3); bank(3);
break; break;
case 0x0FFA: case 0x0FFA:
// Set the current bank to the fifth 4k bank // Set the current bank to the fifth 4k bank
bank(4); bank(4);
break; break;
case 0x0FFB: case 0x0FFB:
// Set the current bank to the sixth 4k bank // Set the current bank to the sixth 4k bank
bank(5); bank(5);
break; break;
default: default:
break; break;
} }
@ -629,43 +636,44 @@ bool CartridgeBUS::poke(uInt16 address, uInt8 value)
// Set the current bank to the first 4k bank // Set the current bank to the first 4k bank
bank(0); bank(0);
break; break;
case 0x0FF6: case 0x0FF6:
// Set the current bank to the second 4k bank // Set the current bank to the second 4k bank
bank(1); bank(1);
break; break;
case 0x0FF7: case 0x0FF7:
// Set the current bank to the third 4k bank // Set the current bank to the third 4k bank
bank(2); bank(2);
break; break;
case 0x0FF8: case 0x0FF8:
// Set the current bank to the fourth 4k bank // Set the current bank to the fourth 4k bank
bank(3); bank(3);
break; break;
case 0x0FF9: case 0x0FF9:
// Set the current bank to the fifth 4k bank // Set the current bank to the fifth 4k bank
bank(4); bank(4);
break; break;
case 0x0FFA: case 0x0FFA:
// Set the current bank to the sixth 4k bank // Set the current bank to the sixth 4k bank
bank(5); bank(5);
break; break;
case 0x0FFB: case 0x0FFB:
// Set the current bank to the last 4k bank // Set the current bank to the last 4k bank
bank(6); bank(6);
break; break;
default: default:
break; break;
} }
} }
else if (myBUSSubtype == BUSSubtype::BUS3) else if (myBUSSubtype == BUSSubtype::BUS3)
{ {
uInt32 pointer = 0;
switch(address) switch(address)
{ {
case 0xFEE: // AMPLITUDE case 0xFEE: // AMPLITUDE
@ -706,8 +714,8 @@ bool CartridgeBUS::poke(uInt16 address, uInt8 value)
{ {
// Get the index of the data fetcher that's being accessed // Get the index of the data fetcher that's being accessed
uInt32 index = address & 0x0f; uInt32 index = address & 0x0f;
uInt32 pointer; uInt32 pointer = 0;
switch (index) switch (index)
{ {
case 0x00: // DS0WRITE case 0x00: // DS0WRITE
@ -719,13 +727,13 @@ bool CartridgeBUS::poke(uInt16 address, uInt8 value)
// //
// P = Pointer // P = Pointer
// F = Fractional // F = Fractional
pointer = getDatastreamPointer(index); pointer = getDatastreamPointer(index);
myDisplayImage[ pointer >> 20 ] = value; myDisplayImage[ pointer >> 20 ] = value;
pointer += 0x100000; // always increment by 1 when writing pointer += 0x100000; // always increment by 1 when writing
setDatastreamPointer(index, pointer); setDatastreamPointer(index, pointer);
break; break;
case 0x04: // 0x14 DS0PTR case 0x04: // 0x14 DS0PTR
case 0x05: // 0x15 DS1PTR case 0x05: // 0x15 DS1PTR
case 0x06: // 0x16 DS2PTR case 0x06: // 0x16 DS2PTR
@ -735,7 +743,7 @@ bool CartridgeBUS::poke(uInt16 address, uInt8 value)
// //
// P = Pointer // P = Pointer
// F = Fractional // F = Fractional
index &= 0x03; index &= 0x03;
pointer = getDatastreamPointer(index); pointer = getDatastreamPointer(index);
pointer <<=8; pointer <<=8;
@ -743,14 +751,14 @@ bool CartridgeBUS::poke(uInt16 address, uInt8 value)
pointer |= (value << 20); pointer |= (value << 20);
setDatastreamPointer(index, pointer); setDatastreamPointer(index, pointer);
break; break;
case 0x09: // 0x19 turn on STY ZP bus stuffing if value is 0 case 0x09: // 0x19 turn on STY ZP bus stuffing if value is 0
if (value==0) if (value==0)
myMode = 0; // lower nybble 0 = STUFFON in BUS3 myMode = 0; // lower nybble 0 = STUFFON in BUS3
else else
myMode = 0x0f; // lower nybble f = STUFFOFF in BUS3 myMode = 0x0f; // lower nybble f = STUFFOFF in BUS3
break; break;
case 0x0A: // 0x1A CALLFUNCTION case 0x0A: // 0x1A CALLFUNCTION
callFunction(value); callFunction(value);
break; break;
@ -1133,11 +1141,11 @@ void CartridgeBUS::setupVersion()
{ {
// 3 versions of the BUS driver have been found. Location of the BUS // 3 versions of the BUS driver have been found. Location of the BUS
// strings are in a different location for each. // strings are in a different location for each.
// get offset of BUS ID // get offset of BUS ID
uInt32 busOffset = scanBUSDriver(0x00535542); uInt32 busOffset = scanBUSDriver(0x00535542);
switch(busOffset) switch(busOffset)
{ {
case 0x7f4: // draconian_20161102.bin case 0x7f4: // draconian_20161102.bin
@ -1155,7 +1163,7 @@ void CartridgeBUS::setupVersion()
myDatastreamMapBase = 0x0760; myDatastreamMapBase = 0x0760;
myWaveformBase = 0x07F4; myWaveformBase = 0x07F4;
break; break;
case 0x770: // rpg_20170616_NTSC.bin newest case 0x770: // rpg_20170616_NTSC.bin newest
myBUSSubtype = BUSSubtype::BUS3; myBUSSubtype = BUSSubtype::BUS3;
myDatastreamBase = 0x06D8; myDatastreamBase = 0x06D8;
@ -1163,7 +1171,7 @@ void CartridgeBUS::setupVersion()
myDatastreamMapBase = 0x0760; myDatastreamMapBase = 0x0760;
myWaveformBase = 0x07F4; myWaveformBase = 0x07F4;
break; break;
default: // case 0xbf8: // original BUS driver was 3K in size default: // case 0xbf8: // original BUS driver was 3K in size
myBUSSubtype = BUSSubtype::BUS0; myBUSSubtype = BUSSubtype::BUS0;
// unsupported // unsupported