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

Reverted more post-2.1 changes, in hopes of fixing the GP2X rendering 

bug.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1005 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-02-10 13:14:20 +00:00
parent fcd424adb4
commit 06c7d0b504
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
stella/src/emucore/m6502/src/System.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: System.cxx,v 1.17 2006-02-05 02:49:47 stephena Exp $
// $Id: System.cxx,v 1.18 2006-02-10 13:14:20 stephena Exp $
//============================================================================
#include <assert.h>
@ -28,15 +28,15 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
System::System(uInt16 n, uInt16 m)
: myAddressMask((1 << n) - 1),
myPageShift(m),
myPageMask((1 << m) - 1),
myNumberOfPages(1 << (n - m)),
myNumberOfDevices(0),
myM6502(0),
myTIA(0),
myCycles(0),
myDataBusState(0)
: myAddressMask((1 << n) - 1),
myPageShift(m),
myPageMask((1 << m) - 1),
myNumberOfPages(1 << (n - m)),
myNumberOfDevices(0),
myM6502(0),
myTIA(0),
myCycles(0),
myDataBusState(0)
{
// Make sure the arguments are reasonable
assert((1 <= m) && (m <= n) && (n <= 16));
@ -285,10 +285,10 @@ bool System::loadState(const string& md5sum, Deserializer& in)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
System::System(const System& s)
: myAddressMask(s.myAddressMask),
myPageShift(s.myPageShift),
myPageMask(s.myPageMask),
myNumberOfPages(s.myNumberOfPages)
: myAddressMask(s.myAddressMask),
myPageShift(s.myPageShift),
myPageMask(s.myPageMask),
myNumberOfPages(s.myNumberOfPages)
{
assert(false);
}
@ -320,8 +320,8 @@ uInt8 System::peek(uInt16 addr)
#ifdef DEVELOPER_SUPPORT
if(!myDataBusLocked)
myDataBusState = result;
#endif
myDataBusState = result;
return result;
}
@ -343,8 +343,8 @@ void System::poke(uInt16 addr, uInt8 value)
#ifdef DEVELOPER_SUPPORT
if(!myDataBusLocked)
myDataBusState = value;
#endif
myDataBusState = value;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

8
stella/src/emucore/m6502/src/System.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: System.hxx,v 1.13 2006-02-05 02:49:47 stephena Exp $
// $Id: System.hxx,v 1.14 2006-02-10 13:14:20 stephena Exp $
//============================================================================
#ifndef SYSTEM_HXX
@ -47,7 +47,7 @@ class Deserializer;
dynamic code for that page of memory.
@author Bradford W. Mott
@version $Id: System.hxx,v 1.13 2006-02-05 02:49:47 stephena Exp $
@version $Id: System.hxx,v 1.14 2006-02-10 13:14:20 stephena Exp $
*/
class System
{
@ -207,7 +207,7 @@ class System
@return The number of system cycles which have passed
*/
inline uInt32 cycles() const
uInt32 cycles() const
{
return myCycles;
}
@ -217,7 +217,7 @@ class System
@param amount The amount to add to the system cycles counter
*/
inline void incrementCycles(uInt32 amount)
void incrementCycles(uInt32 amount)
{
myCycles += amount;
}