2001-12-27 19:54:36 +00:00
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// MM MM 6666 555555 0000 2222
|
|
|
|
// MMMM MMMM 66 66 55 00 00 22 22
|
|
|
|
// MM MMM MM 66 55 00 00 22
|
|
|
|
// MM M MM 66666 55555 00 00 22222 -- "A 6502 Microprocessor Emulator"
|
|
|
|
// MM MM 66 66 55 00 00 22
|
|
|
|
// MM MM 66 66 55 55 00 00 22
|
|
|
|
// MM MM 6666 5555 0000 222222
|
|
|
|
//
|
2010-01-10 03:23:32 +00:00
|
|
|
// Copyright (c) 1995-2010 by Bradford W. Mott and the Stella Team
|
2001-12-27 19:54:36 +00:00
|
|
|
//
|
2010-01-10 03:23:32 +00:00
|
|
|
// See the file "License.txt" for information on usage and redistribution of
|
2001-12-27 19:54:36 +00:00
|
|
|
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
|
|
|
|
//
|
2009-05-13 13:55:40 +00:00
|
|
|
// $Id$
|
2001-12-27 19:54:36 +00:00
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
#include <assert.h>
|
2002-05-13 19:10:25 +00:00
|
|
|
#include <iostream>
|
|
|
|
|
2001-12-27 19:54:36 +00:00
|
|
|
#include "Device.hxx"
|
|
|
|
#include "M6502.hxx"
|
2008-02-19 12:33:07 +00:00
|
|
|
#include "M6532.hxx"
|
2005-07-09 12:52:46 +00:00
|
|
|
#include "TIA.hxx"
|
2001-12-27 19:54:36 +00:00
|
|
|
#include "System.hxx"
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
System::System(uInt16 n, uInt16 m)
|
2006-02-10 13:14:20 +00:00
|
|
|
: myAddressMask((1 << n) - 1),
|
|
|
|
myPageShift(m),
|
|
|
|
myPageMask((1 << m) - 1),
|
|
|
|
myNumberOfPages(1 << (n - m)),
|
|
|
|
myNumberOfDevices(0),
|
|
|
|
myM6502(0),
|
|
|
|
myTIA(0),
|
|
|
|
myCycles(0),
|
2008-03-28 23:29:14 +00:00
|
|
|
myDataBusState(0),
|
|
|
|
myDataBusLocked(false)
|
2001-12-27 19:54:36 +00:00
|
|
|
{
|
|
|
|
// Make sure the arguments are reasonable
|
|
|
|
assert((1 <= m) && (m <= n) && (n <= 16));
|
|
|
|
|
2009-11-08 01:39:05 +00:00
|
|
|
// Create a new random number generator
|
|
|
|
myRandom = new Random();
|
|
|
|
|
2010-03-26 00:59:56 +00:00
|
|
|
// Allocate page table and dirty list
|
2001-12-27 19:54:36 +00:00
|
|
|
myPageAccessTable = new PageAccess[myNumberOfPages];
|
2010-03-26 00:59:56 +00:00
|
|
|
myPageIsDirtyTable = new bool[myNumberOfPages];
|
2001-12-27 19:54:36 +00:00
|
|
|
|
|
|
|
// Initialize page access table
|
|
|
|
PageAccess access;
|
|
|
|
access.directPeekBase = 0;
|
|
|
|
access.directPokeBase = 0;
|
|
|
|
access.device = &myNullDevice;
|
|
|
|
for(int page = 0; page < myNumberOfPages; ++page)
|
|
|
|
{
|
|
|
|
setPageAccess(page, access);
|
|
|
|
}
|
2002-05-13 19:10:25 +00:00
|
|
|
|
2005-07-09 23:44:08 +00:00
|
|
|
// Bus starts out unlocked (in other words, peek() changes myDataBusState)
|
|
|
|
myDataBusLocked = false;
|
2001-12-27 19:54:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
System::~System()
|
|
|
|
{
|
|
|
|
// Free the devices attached to me, since I own them
|
|
|
|
for(uInt32 i = 0; i < myNumberOfDevices; ++i)
|
|
|
|
{
|
|
|
|
delete myDevices[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
// Free the M6502 that I own
|
|
|
|
delete myM6502;
|
|
|
|
|
2010-03-26 00:59:56 +00:00
|
|
|
// Free my page access table and dirty list
|
2001-12-27 19:54:36 +00:00
|
|
|
delete[] myPageAccessTable;
|
2010-03-26 00:59:56 +00:00
|
|
|
delete[] myPageIsDirtyTable;
|
2009-11-08 01:39:05 +00:00
|
|
|
|
|
|
|
// Free the random number generator
|
|
|
|
delete myRandom;
|
2001-12-27 19:54:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void System::reset()
|
|
|
|
{
|
|
|
|
// Reset system cycle counter
|
|
|
|
resetCycles();
|
|
|
|
|
2002-05-13 19:10:25 +00:00
|
|
|
// First we reset the devices attached to myself
|
2001-12-27 19:54:36 +00:00
|
|
|
for(uInt32 i = 0; i < myNumberOfDevices; ++i)
|
|
|
|
{
|
|
|
|
myDevices[i]->reset();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now we reset the processor if it exists
|
|
|
|
if(myM6502 != 0)
|
|
|
|
{
|
|
|
|
myM6502->reset();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void System::attach(Device* device)
|
|
|
|
{
|
|
|
|
assert(myNumberOfDevices < 100);
|
|
|
|
|
|
|
|
// Add device to my collection of devices
|
|
|
|
myDevices[myNumberOfDevices++] = device;
|
|
|
|
|
|
|
|
// Ask the device to install itself
|
|
|
|
device->install(*this);
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void System::attach(M6502* m6502)
|
|
|
|
{
|
|
|
|
// Remember the processor
|
|
|
|
myM6502 = m6502;
|
|
|
|
|
|
|
|
// Ask the processor to install itself
|
|
|
|
myM6502->install(*this);
|
|
|
|
}
|
|
|
|
|
2005-07-09 12:52:46 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2008-02-19 12:33:07 +00:00
|
|
|
void System::attach(M6532* m6532)
|
|
|
|
{
|
|
|
|
// Remember the processor
|
|
|
|
myM6532 = m6532;
|
|
|
|
|
|
|
|
// Attach it as a normal device
|
|
|
|
attach((Device*) m6532);
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2005-07-09 12:52:46 +00:00
|
|
|
void System::attach(TIA* tia)
|
|
|
|
{
|
|
|
|
myTIA = tia;
|
|
|
|
attach((Device*) tia);
|
|
|
|
}
|
|
|
|
|
2001-12-27 19:54:36 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void System::resetCycles()
|
|
|
|
{
|
2002-05-13 19:10:25 +00:00
|
|
|
// First we let all of the device attached to me know about the reset
|
2001-12-27 19:54:36 +00:00
|
|
|
for(uInt32 i = 0; i < myNumberOfDevices; ++i)
|
|
|
|
{
|
|
|
|
myDevices[i]->systemCyclesReset();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now, we reset cycle count to zero
|
|
|
|
myCycles = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void System::setPageAccess(uInt16 page, const PageAccess& access)
|
|
|
|
{
|
|
|
|
// Make sure the page is within range
|
|
|
|
assert(page <= myNumberOfPages);
|
|
|
|
|
|
|
|
// Make sure the access methods make sense
|
|
|
|
assert(access.device != 0);
|
|
|
|
|
|
|
|
myPageAccessTable[page] = access;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2010-03-26 01:33:40 +00:00
|
|
|
const System::PageAccess& System::getPageAccess(uInt16 page) const
|
2001-12-27 19:54:36 +00:00
|
|
|
{
|
|
|
|
// Make sure the page is within range
|
|
|
|
assert(page <= myNumberOfPages);
|
|
|
|
|
|
|
|
return myPageAccessTable[page];
|
|
|
|
}
|
|
|
|
|
2010-03-26 00:59:56 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2010-03-26 01:33:40 +00:00
|
|
|
void System::setDirtyPage(uInt16 addr)
|
2010-03-26 00:59:56 +00:00
|
|
|
{
|
|
|
|
myPageIsDirtyTable[(addr & myAddressMask) >> myPageShift] = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2010-03-26 01:33:40 +00:00
|
|
|
bool System::isPageDirty(uInt16 start_addr, uInt16 end_addr) const
|
2010-03-26 00:59:56 +00:00
|
|
|
{
|
|
|
|
uInt16 start_page = (start_addr & myAddressMask) >> myPageShift;
|
|
|
|
uInt16 end_page = (end_addr & myAddressMask) >> myPageShift;
|
|
|
|
|
|
|
|
for(uInt16 page = start_page; page <= end_page; ++page)
|
|
|
|
if(myPageIsDirtyTable[page])
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2010-03-26 01:33:40 +00:00
|
|
|
void System::clearDirtyPages()
|
2010-03-26 00:59:56 +00:00
|
|
|
{
|
|
|
|
for(uInt32 i = 0; i < myNumberOfPages; ++i)
|
|
|
|
myPageIsDirtyTable[i] = false;
|
|
|
|
}
|
|
|
|
|
2001-12-27 19:54:36 +00:00
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
System::System(const System& s)
|
2006-02-10 13:14:20 +00:00
|
|
|
: myAddressMask(s.myAddressMask),
|
|
|
|
myPageShift(s.myPageShift),
|
|
|
|
myPageMask(s.myPageMask),
|
|
|
|
myNumberOfPages(s.myNumberOfPages)
|
2001-12-27 19:54:36 +00:00
|
|
|
{
|
|
|
|
assert(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
System& System::operator = (const System&)
|
|
|
|
{
|
|
|
|
assert(false);
|
|
|
|
|
|
|
|
return *this;
|
|
|
|
}
|
Added initial trap support. It doesn't quite work yet: when I hit a
trap, the PC keeps getting reset to the start of the frame. FYI,
traps are like breakpoints, only they trigger on any access of the
trap location (e.g. loading data from it, rather than executing it
as a breakpoint).
Fixed two nasty bugs:
1. Debugger::disassemble() was printing hex bytes from the wrong address.
This is because I used readRAM(), which wants a parameter of 0-127, and
reads only from RAM. I *should* have been using peek(), which takes a
16-bit address. In fact, readRAM() is only for the GUI.
2. D6502::disassemble() was printing wrong operands in zero,x and
zero,y addressing modes, due to me passing a wrong number of places
(and thus creating a wrong format string).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@537 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-06-21 04:30:49 +00:00
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
uInt8 System::peek(uInt16 addr)
|
|
|
|
{
|
|
|
|
PageAccess& access = myPageAccessTable[(addr & myAddressMask) >> myPageShift];
|
|
|
|
|
|
|
|
uInt8 result;
|
|
|
|
|
|
|
|
// See if this page uses direct accessing or not
|
|
|
|
if(access.directPeekBase != 0)
|
|
|
|
{
|
|
|
|
result = *(access.directPeekBase + (addr & myPageMask));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
result = access.device->peek(addr);
|
|
|
|
}
|
|
|
|
|
2006-12-15 16:43:12 +00:00
|
|
|
#ifdef DEBUGGER_SUPPORT
|
2005-07-09 23:44:08 +00:00
|
|
|
if(!myDataBusLocked)
|
2006-02-05 02:49:47 +00:00
|
|
|
#endif
|
2006-02-10 13:14:20 +00:00
|
|
|
myDataBusState = result;
|
Added initial trap support. It doesn't quite work yet: when I hit a
trap, the PC keeps getting reset to the start of the frame. FYI,
traps are like breakpoints, only they trigger on any access of the
trap location (e.g. loading data from it, rather than executing it
as a breakpoint).
Fixed two nasty bugs:
1. Debugger::disassemble() was printing hex bytes from the wrong address.
This is because I used readRAM(), which wants a parameter of 0-127, and
reads only from RAM. I *should* have been using peek(), which takes a
16-bit address. In fact, readRAM() is only for the GUI.
2. D6502::disassemble() was printing wrong operands in zero,x and
zero,y addressing modes, due to me passing a wrong number of places
(and thus creating a wrong format string).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@537 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-06-21 04:30:49 +00:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
void System::poke(uInt16 addr, uInt8 value)
|
|
|
|
{
|
2010-03-26 00:59:56 +00:00
|
|
|
uInt16 page = (addr & myAddressMask) >> myPageShift;
|
|
|
|
PageAccess& access = myPageAccessTable[page];
|
Added initial trap support. It doesn't quite work yet: when I hit a
trap, the PC keeps getting reset to the start of the frame. FYI,
traps are like breakpoints, only they trigger on any access of the
trap location (e.g. loading data from it, rather than executing it
as a breakpoint).
Fixed two nasty bugs:
1. Debugger::disassemble() was printing hex bytes from the wrong address.
This is because I used readRAM(), which wants a parameter of 0-127, and
reads only from RAM. I *should* have been using peek(), which takes a
16-bit address. In fact, readRAM() is only for the GUI.
2. D6502::disassemble() was printing wrong operands in zero,x and
zero,y addressing modes, due to me passing a wrong number of places
(and thus creating a wrong format string).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@537 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-06-21 04:30:49 +00:00
|
|
|
|
|
|
|
// See if this page uses direct accessing or not
|
|
|
|
if(access.directPokeBase != 0)
|
|
|
|
{
|
2010-03-26 00:59:56 +00:00
|
|
|
// Since we have direct access to this poke, we can dirty its page
|
|
|
|
myPageIsDirtyTable[page] = true;
|
Added initial trap support. It doesn't quite work yet: when I hit a
trap, the PC keeps getting reset to the start of the frame. FYI,
traps are like breakpoints, only they trigger on any access of the
trap location (e.g. loading data from it, rather than executing it
as a breakpoint).
Fixed two nasty bugs:
1. Debugger::disassemble() was printing hex bytes from the wrong address.
This is because I used readRAM(), which wants a parameter of 0-127, and
reads only from RAM. I *should* have been using peek(), which takes a
16-bit address. In fact, readRAM() is only for the GUI.
2. D6502::disassemble() was printing wrong operands in zero,x and
zero,y addressing modes, due to me passing a wrong number of places
(and thus creating a wrong format string).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@537 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-06-21 04:30:49 +00:00
|
|
|
*(access.directPokeBase + (addr & myPageMask)) = value;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-03-28 03:13:10 +00:00
|
|
|
// The specific device informs us if the poke succeeded
|
|
|
|
myPageIsDirtyTable[page] = access.device->poke(addr, value);
|
Added initial trap support. It doesn't quite work yet: when I hit a
trap, the PC keeps getting reset to the start of the frame. FYI,
traps are like breakpoints, only they trigger on any access of the
trap location (e.g. loading data from it, rather than executing it
as a breakpoint).
Fixed two nasty bugs:
1. Debugger::disassemble() was printing hex bytes from the wrong address.
This is because I used readRAM(), which wants a parameter of 0-127, and
reads only from RAM. I *should* have been using peek(), which takes a
16-bit address. In fact, readRAM() is only for the GUI.
2. D6502::disassemble() was printing wrong operands in zero,x and
zero,y addressing modes, due to me passing a wrong number of places
(and thus creating a wrong format string).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@537 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-06-21 04:30:49 +00:00
|
|
|
}
|
|
|
|
|
2006-12-15 16:43:12 +00:00
|
|
|
#ifdef DEBUGGER_SUPPORT
|
2005-07-09 23:44:08 +00:00
|
|
|
if(!myDataBusLocked)
|
2006-02-05 02:49:47 +00:00
|
|
|
#endif
|
2006-02-10 13:14:20 +00:00
|
|
|
myDataBusState = value;
|
2005-07-09 23:44:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2005-12-29 21:16:28 +00:00
|
|
|
void System::lockDataBus()
|
|
|
|
{
|
2005-07-09 23:44:08 +00:00
|
|
|
myDataBusLocked = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
2005-12-29 21:16:28 +00:00
|
|
|
void System::unlockDataBus()
|
|
|
|
{
|
2005-07-09 23:44:08 +00:00
|
|
|
myDataBusLocked = false;
|
Added initial trap support. It doesn't quite work yet: when I hit a
trap, the PC keeps getting reset to the start of the frame. FYI,
traps are like breakpoints, only they trigger on any access of the
trap location (e.g. loading data from it, rather than executing it
as a breakpoint).
Fixed two nasty bugs:
1. Debugger::disassemble() was printing hex bytes from the wrong address.
This is because I used readRAM(), which wants a parameter of 0-127, and
reads only from RAM. I *should* have been using peek(), which takes a
16-bit address. In fact, readRAM() is only for the GUI.
2. D6502::disassemble() was printing wrong operands in zero,x and
zero,y addressing modes, due to me passing a wrong number of places
(and thus creating a wrong format string).
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@537 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2005-06-21 04:30:49 +00:00
|
|
|
}
|
OK, another huge commit. I need to commit this now, because things are
starting to go out of sync on my development machines. OK, where to
begin ...
Changed state file format, so older state files will no longer work. The
changes aren't finalized yet, so expect more breakage.
Added getByte() and putByte() methods to serialized data, resulting in
smaller state files (previously, 1-byte values were stored as 4-byte ints).
Totally reworked controller handling code. Controller state is now
explicitly set with an ::update() method, making it easier to serialize.
Some work is still required on the serialization stuff for more advanced
controllers.
Added a 'Serializable' interface to all carts, device, controllers, etc
that can be (de)serialized. This fixes a long-standing design issue
which I personally caused many years ago.
Console switches state (SWCHB register) is now saved to state files.
Added beginnings of movie support. Basically, this saves an initial
state file, and thereafter continuously saves controller and console
switches state. Support is still somewhat rough and there's no UI for
it, but it does successfully save and later load/play state movies.
Removed specific events for driving controllers, and have them use
joystick events instead. This has the nice side effect that
joystick direction remapping 'just works' for driving controllers too.
Fixed issues with paddle emulation seen in 'Night Driver' ROM. Related
to this, removed a hack wrt paddles when grabmouse is enabled. There's
still some work to do when using the mouse to emulate paddles, but the
Stelladaptor and real paddles work fine.
Added beginnings of TrackBall CX-22 controller emulation. It doesn't
actually do anything yet, but the class is there :)
Probably some other stuff that I'm forgetting ...
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1385 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-10-03 21:41:19 +00:00
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
|
|
|
bool System::save(Serializer& out) const
|
|
|
|
{
|
|
|
|
const string& device = name();
|
|
|
|
try
|
|
|
|
{
|
|
|
|
out.putString(device);
|
|
|
|
out.putInt(myCycles);
|
|
|
|
|
|
|
|
if(!myM6502->save(out))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Now save the state of each device
|
|
|
|
for(uInt32 i = 0; i < myNumberOfDevices; ++i)
|
|
|
|
if(!myDevices[i]->save(out))
|
|
|
|
return false;
|
|
|
|
}
|
2009-08-27 22:59:14 +00:00
|
|
|
catch(const char* msg)
|
OK, another huge commit. I need to commit this now, because things are
starting to go out of sync on my development machines. OK, where to
begin ...
Changed state file format, so older state files will no longer work. The
changes aren't finalized yet, so expect more breakage.
Added getByte() and putByte() methods to serialized data, resulting in
smaller state files (previously, 1-byte values were stored as 4-byte ints).
Totally reworked controller handling code. Controller state is now
explicitly set with an ::update() method, making it easier to serialize.
Some work is still required on the serialization stuff for more advanced
controllers.
Added a 'Serializable' interface to all carts, device, controllers, etc
that can be (de)serialized. This fixes a long-standing design issue
which I personally caused many years ago.
Console switches state (SWCHB register) is now saved to state files.
Added beginnings of movie support. Basically, this saves an initial
state file, and thereafter continuously saves controller and console
switches state. Support is still somewhat rough and there's no UI for
it, but it does successfully save and later load/play state movies.
Removed specific events for driving controllers, and have them use
joystick events instead. This has the nice side effect that
joystick direction remapping 'just works' for driving controllers too.
Fixed issues with paddle emulation seen in 'Night Driver' ROM. Related
to this, removed a hack wrt paddles when grabmouse is enabled. There's
still some work to do when using the mouse to emulate paddles, but the
Stelladaptor and real paddles work fine.
Added beginnings of TrackBall CX-22 controller emulation. It doesn't
actually do anything yet, but the class is there :)
Probably some other stuff that I'm forgetting ...
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1385 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-10-03 21:41:19 +00:00
|
|
|
{
|
2009-08-27 22:59:14 +00:00
|
|
|
cerr << "ERROR: System::save" << endl << " " << msg << endl;
|
OK, another huge commit. I need to commit this now, because things are
starting to go out of sync on my development machines. OK, where to
begin ...
Changed state file format, so older state files will no longer work. The
changes aren't finalized yet, so expect more breakage.
Added getByte() and putByte() methods to serialized data, resulting in
smaller state files (previously, 1-byte values were stored as 4-byte ints).
Totally reworked controller handling code. Controller state is now
explicitly set with an ::update() method, making it easier to serialize.
Some work is still required on the serialization stuff for more advanced
controllers.
Added a 'Serializable' interface to all carts, device, controllers, etc
that can be (de)serialized. This fixes a long-standing design issue
which I personally caused many years ago.
Console switches state (SWCHB register) is now saved to state files.
Added beginnings of movie support. Basically, this saves an initial
state file, and thereafter continuously saves controller and console
switches state. Support is still somewhat rough and there's no UI for
it, but it does successfully save and later load/play state movies.
Removed specific events for driving controllers, and have them use
joystick events instead. This has the nice side effect that
joystick direction remapping 'just works' for driving controllers too.
Fixed issues with paddle emulation seen in 'Night Driver' ROM. Related
to this, removed a hack wrt paddles when grabmouse is enabled. There's
still some work to do when using the mouse to emulate paddles, but the
Stelladaptor and real paddles work fine.
Added beginnings of TrackBall CX-22 controller emulation. It doesn't
actually do anything yet, but the class is there :)
Probably some other stuff that I'm forgetting ...
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1385 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-10-03 21:41:19 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
OK, this looks like a huge update, but it's only because of some Serializer
class reworking. Serializer class now handles read/write of state from
files as well as in-memory streams. As a result, Deserializer class has
been removed.
Added state rewinding to the debugger. For now, this is limited to 100
levels of undo, with a new state generated each time a step/trace/frame/
scanline advance is performed. The undo level is 'rolling', in that it
remembers the last 100 levels (so you lose the oldest states when you
start adding more than 100). For now, this is tied to the 'Alt-r' key
in the debugger. Still TODO is add a button for it, and clean up some
TIA output issues when rewinding.
Added support for 6K version of Supercharger ROMs (this fixes issues
with the 6K version of Cubis).
Cleaned up the Serializable infrastructure, making sure that all
classes that need to implement it actually do so now.
Fixed issue with editable widgets in the UI, where pressing Enter
on the keypad wasn't actually being registered.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1849 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2009-08-05 16:05:34 +00:00
|
|
|
bool System::load(Serializer& in)
|
OK, another huge commit. I need to commit this now, because things are
starting to go out of sync on my development machines. OK, where to
begin ...
Changed state file format, so older state files will no longer work. The
changes aren't finalized yet, so expect more breakage.
Added getByte() and putByte() methods to serialized data, resulting in
smaller state files (previously, 1-byte values were stored as 4-byte ints).
Totally reworked controller handling code. Controller state is now
explicitly set with an ::update() method, making it easier to serialize.
Some work is still required on the serialization stuff for more advanced
controllers.
Added a 'Serializable' interface to all carts, device, controllers, etc
that can be (de)serialized. This fixes a long-standing design issue
which I personally caused many years ago.
Console switches state (SWCHB register) is now saved to state files.
Added beginnings of movie support. Basically, this saves an initial
state file, and thereafter continuously saves controller and console
switches state. Support is still somewhat rough and there's no UI for
it, but it does successfully save and later load/play state movies.
Removed specific events for driving controllers, and have them use
joystick events instead. This has the nice side effect that
joystick direction remapping 'just works' for driving controllers too.
Fixed issues with paddle emulation seen in 'Night Driver' ROM. Related
to this, removed a hack wrt paddles when grabmouse is enabled. There's
still some work to do when using the mouse to emulate paddles, but the
Stelladaptor and real paddles work fine.
Added beginnings of TrackBall CX-22 controller emulation. It doesn't
actually do anything yet, but the class is there :)
Probably some other stuff that I'm forgetting ...
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1385 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-10-03 21:41:19 +00:00
|
|
|
{
|
|
|
|
const string& device = name();
|
|
|
|
try
|
|
|
|
{
|
|
|
|
if(in.getString() != device)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
myCycles = (uInt32) in.getInt();
|
|
|
|
|
|
|
|
// Next, load state for the CPU
|
|
|
|
if(!myM6502->load(in))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Now load the state of each device
|
|
|
|
for(uInt32 i = 0; i < myNumberOfDevices; ++i)
|
|
|
|
if(!myDevices[i]->load(in))
|
|
|
|
return false;
|
|
|
|
}
|
2009-08-27 22:59:14 +00:00
|
|
|
catch(const char* msg)
|
OK, another huge commit. I need to commit this now, because things are
starting to go out of sync on my development machines. OK, where to
begin ...
Changed state file format, so older state files will no longer work. The
changes aren't finalized yet, so expect more breakage.
Added getByte() and putByte() methods to serialized data, resulting in
smaller state files (previously, 1-byte values were stored as 4-byte ints).
Totally reworked controller handling code. Controller state is now
explicitly set with an ::update() method, making it easier to serialize.
Some work is still required on the serialization stuff for more advanced
controllers.
Added a 'Serializable' interface to all carts, device, controllers, etc
that can be (de)serialized. This fixes a long-standing design issue
which I personally caused many years ago.
Console switches state (SWCHB register) is now saved to state files.
Added beginnings of movie support. Basically, this saves an initial
state file, and thereafter continuously saves controller and console
switches state. Support is still somewhat rough and there's no UI for
it, but it does successfully save and later load/play state movies.
Removed specific events for driving controllers, and have them use
joystick events instead. This has the nice side effect that
joystick direction remapping 'just works' for driving controllers too.
Fixed issues with paddle emulation seen in 'Night Driver' ROM. Related
to this, removed a hack wrt paddles when grabmouse is enabled. There's
still some work to do when using the mouse to emulate paddles, but the
Stelladaptor and real paddles work fine.
Added beginnings of TrackBall CX-22 controller emulation. It doesn't
actually do anything yet, but the class is there :)
Probably some other stuff that I'm forgetting ...
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1385 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-10-03 21:41:19 +00:00
|
|
|
{
|
2009-08-27 22:59:14 +00:00
|
|
|
cerr << "ERROR: System::load" << endl << " " << msg << endl;
|
OK, another huge commit. I need to commit this now, because things are
starting to go out of sync on my development machines. OK, where to
begin ...
Changed state file format, so older state files will no longer work. The
changes aren't finalized yet, so expect more breakage.
Added getByte() and putByte() methods to serialized data, resulting in
smaller state files (previously, 1-byte values were stored as 4-byte ints).
Totally reworked controller handling code. Controller state is now
explicitly set with an ::update() method, making it easier to serialize.
Some work is still required on the serialization stuff for more advanced
controllers.
Added a 'Serializable' interface to all carts, device, controllers, etc
that can be (de)serialized. This fixes a long-standing design issue
which I personally caused many years ago.
Console switches state (SWCHB register) is now saved to state files.
Added beginnings of movie support. Basically, this saves an initial
state file, and thereafter continuously saves controller and console
switches state. Support is still somewhat rough and there's no UI for
it, but it does successfully save and later load/play state movies.
Removed specific events for driving controllers, and have them use
joystick events instead. This has the nice side effect that
joystick direction remapping 'just works' for driving controllers too.
Fixed issues with paddle emulation seen in 'Night Driver' ROM. Related
to this, removed a hack wrt paddles when grabmouse is enabled. There's
still some work to do when using the mouse to emulate paddles, but the
Stelladaptor and real paddles work fine.
Added beginnings of TrackBall CX-22 controller emulation. It doesn't
actually do anything yet, but the class is there :)
Probably some other stuff that I'm forgetting ...
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1385 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
2007-10-03 21:41:19 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|