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

Merge branch 'master' of https://github.com/stella-emu/stella 

# Conflicts:
#	src/debugger/Debugger.cxx
This commit is contained in:
thrust26 2017-10-09 23:56:39 +02:00
parent f59ad788d7 aa755c7270
commit 7c679fda31
6 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/debugger/Debugger.cxx
View File

@ -423,12 +423,14 @@ bool Debugger::writeTrap(uInt16 t)
uInt32 Debugger::getBaseAddress(uInt32 addr, bool read)
{
if((addr & 0x1080) == 0x0000) // (addr & 0b 0001 0000 1000 0000) == 0b 0000 0000 0000 0000
{
if(read)
// ADDR_TIA read (%xxx0 xxxx 0xxx ????)
return addr & 0x000f; // 0b 0000 0000 0000 1111
else
// ADDR_TIA write (%xxx0 xxxx 0x?? ????)
return addr & 0x003f; // 0b 0000 0000 0011 1111
}
// ADDR_ZPRAM (%xxx0 xx0x 1??? ????)
if((addr & 0x1280) == 0x0080) // (addr & 0b 0001 0010 1000 0000) == 0b 0000 0000 1000 0000

5
src/debugger/DebuggerParser.cxx
View File

@ -1617,9 +1617,10 @@ void DebuggerParser::executeTrapwriteif()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Wrapper function for trap(if)s
void DebuggerParser::executeTraps(bool read, bool write, const string& command, bool hasCond)
void DebuggerParser::executeTraps(bool read, bool write, const string& command,
bool hasCond)
{
int ofs = hasCond ? 1 : 0;
uInt32 ofs = hasCond ? 1 : 0;
uInt32 begin = args[ofs];
uInt32 end = argCount == 2 + ofs ? args[1 + ofs] : begin;

3
src/emucore/Control.hxx
View File

@ -210,7 +210,8 @@ class Controller : public Serializable
*/
virtual string about(bool swappedPorts) const
{
return name() + " in " + (myJack == Left ^ swappedPorts ? "left port" : "right port");
return name() + " in " + ((myJack == Left) ^ swappedPorts ?
"left port" : "right port");
}
/**