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

Merge remote-tracking branch 'origin/master' into feature/full-on-sqlite

This commit is contained in:
Christian Speckner 2021-01-03 22:46:26 +01:00
parent 8204d0fb6e c4aae87f08
commit 29a48ee63d
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/index.html
View File

@ -4702,8 +4702,8 @@ Ms Pac-Man (Stella extended codes):
<tr><td>DPC </td><td>Pitfall II </td><td>.DPC </td></tr> <tr><td>DPC </td><td>Pitfall II </td><td>.DPC </td></tr>
<tr><td>DPC+</td><td>Enhanced DPC </td><td>.DPP, .DPC+ </td></tr> <tr><td>DPC+</td><td>Enhanced DPC </td><td>.DPP, .DPC+ </td></tr>
<tr><td>E0 </td><td>8K Parker Bros </td><td>.E0 </td></tr> <tr><td>E0 </td><td>8K Parker Bros </td><td>.E0 </td></tr>
<tr><td>E7 </td><td>16K M-network </td><td>.E7 </td></tr> <tr><td>E7 </td><td>16K M Network </td><td>.E7 </td></tr>
<tr><td>E78K </td><td>8K M-network </td><td>.E78, .E78K </td></tr> <tr><td>E78K </td><td>8K M Network </td><td>.E78, .E78K </td></tr>
<tr><td>EF </td><td>64K Homestar Runner </td><td>.EF </td></tr> <tr><td>EF </td><td>64K Homestar Runner </td><td>.EF </td></tr>
<tr><td>EFSC </td><td>64K Homestar Runner + RAM</td><td>.EFS, .EFSC </td></tr> <tr><td>EFSC </td><td>64K Homestar Runner + RAM</td><td>.EFS, .EFSC </td></tr>
<tr><td>F0 </td><td>Dynacom Megaboy </td><td>.F0 </td></tr> <tr><td>F0 </td><td>Dynacom Megaboy </td><td>.F0 </td></tr>

12
src/debugger/CartDebug.cxx
View File

@ -302,12 +302,16 @@ bool CartDebug::disassemble(int bank, uInt16 PC, bool force)
AddressList::const_iterator i; AddressList::const_iterator i;
for(i = addresses.cbegin(); i != addresses.cend(); ++i) for(i = addresses.cbegin(); i != addresses.cend(); ++i)
{ {
if (PC == *i) // already present if(PC == *i) // already present
break; break;
} }
// Otherwise, add the item at the end // Otherwise, add the item at the end
if (i == addresses.end()) if(i == addresses.end())
{
addresses.push_back(PC); addresses.push_back(PC);
if(!DiStella::settings.resolveCode)
addDirective(Device::AccessType::CODE, PC, PC, bank);
}
} }
// Always attempt to resolve code sections unless it's been // Always attempt to resolve code sections unless it's been
@ -347,8 +351,8 @@ bool CartDebug::fillDisassemblyList(BankInfo& info, uInt16 search)
const DisassemblyTag& tag = myDisassembly.list[i]; const DisassemblyTag& tag = myDisassembly.list[i];
const uInt16 address = tag.address & 0xFFF; const uInt16 address = tag.address & 0xFFF;
// Exclude 'Device::ROW'; they don't have a valid address // Exclude 'Device::ROW|NONE'; they don't have a valid address
if(tag.type != Device::ROW) if(tag.type != Device::ROW && tag.type != Device::NONE)
{ {
// Create a mapping from addresses to line numbers // Create a mapping from addresses to line numbers
myAddrToLineList.emplace(address, i); myAddrToLineList.emplace(address, i);

2
src/debugger/gui/CartMNetworkWidget.cxx
View File

@ -37,7 +37,7 @@ void CartridgeMNetworkWidget::initialize(GuiObject* boss,
uInt32 size = cart.romBankCount() * cart.BANK_SIZE; uInt32 size = cart.romBankCount() * cart.BANK_SIZE;
int xpos = 2, int xpos = 2,
ypos = addBaseInformation(size, "M-Network", info.str(), 15) + ypos = addBaseInformation(size, "M Network", info.str(), 15) +
myLineHeight; myLineHeight;
VariantList items0, items1; VariantList items0, items1;

1
src/debugger/gui/RomWidget.cxx
View File

@ -75,6 +75,7 @@ void RomWidget::loadConfig()
// Update romlist to point to current PC (if it has changed) // Update romlist to point to current PC (if it has changed)
int pcline = cart.addressToLine(dbg.cpuDebug().pc()); int pcline = cart.addressToLine(dbg.cpuDebug().pc());
if(pcline >= 0 && pcline != myRomList->getHighlighted()) if(pcline >= 0 && pcline != myRomList->getHighlighted())
myRomList->setHighlighted(pcline); myRomList->setHighlighted(pcline);

4
src/emucore/Bankswitch.cxx
View File

@ -124,8 +124,8 @@ Bankswitch::BSList = {{
{ "DPC" , "DPC (Pitfall II)" }, { "DPC" , "DPC (Pitfall II)" },
{ "DPC+" , "DPC+ (Enhanced DPC)" }, { "DPC+" , "DPC+ (Enhanced DPC)" },
{ "E0" , "E0 (8K Parker Bros)" }, { "E0" , "E0 (8K Parker Bros)" },
{ "E7" , "E7 (16K M-network)" }, { "E7" , "E7 (16K M Network)" },
{ "E78K" , "E78K (8K M-network)" }, { "E78K" , "E78K (8K M Network)" },
{ "EF" , "EF (64K H. Runner)" }, { "EF" , "EF (64K H. Runner)" },
{ "EFSC" , "EFSC (64K H. Runner + RAM)" }, { "EFSC" , "EFSC (64K H. Runner + RAM)" },
{ "F0" , "F0 (Dynacom Megaboy)" }, { "F0" , "F0 (Dynacom Megaboy)" },