kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added SMP ports to the SFM state, for keeping the last state of the ports in the event that the register log has or will run empty

CQTexperiment
Chris Moeller 2013-10-26 15:26:00 -07:00
parent 2b40e87fee
commit 031f36524e
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Frameworks/GME/gme/Spc_Sfm.cpp
View File

@ -216,6 +216,19 @@ blargg_err_t Sfm_Emu::start_track_( int track )
smp.regs.y = META_ENUM_INT(name + "y", 0x00); smp.regs.y = META_ENUM_INT(name + "y", 0x00);
smp.regs.s = META_ENUM_INT(name + "s", 0xef); smp.regs.s = META_ENUM_INT(name + "s", 0xef);
smp.regs.p = META_ENUM_INT(name + "psw", 0x02); smp.regs.p = META_ENUM_INT(name + "psw", 0x02);
value = metadata.enumValue("smp:ports");
if (value)
{
for (auto &n : smp.sfm_last)
{
n = strtol(value, &end, 10);
if (*end == ',')
value = end + 1;
else
break;
}
}
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
{ {
@ -364,6 +377,7 @@ blargg_err_t Sfm_Emu::start_track_( int track )
blargg_err_t Sfm_Emu::save( gme_writer_t writer, void* your_data ) const blargg_err_t Sfm_Emu::save( gme_writer_t writer, void* your_data ) const
{ {
bool first;
std::string name; std::string name;
std::ostringstream oss; std::ostringstream oss;
Bml_Parser metadata; Bml_Parser metadata;
@ -388,6 +402,17 @@ blargg_err_t Sfm_Emu::save( gme_writer_t writer, void* your_data ) const
metadata.setValue( name + "s", smp.regs.s ); metadata.setValue( name + "s", smp.regs.s );
metadata.setValue( name + "psw", smp.regs.p ); metadata.setValue( name + "psw", smp.regs.p );
oss.str("");
oss.clear();
first = true;
for (auto n : smp.sfm_last)
{
if (!first) oss << ",";
oss << (unsigned long)n;
first = false;
}
metadata.setValue("smp:ports", oss.str().c_str());
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
{ {
SuperFamicom::SMP::Timer<192> const& t = (i == 0 ? smp.timer0 : (i == 1 ? smp.timer1 : *(SuperFamicom::SMP::Timer<192>*)&smp.timer2)); SuperFamicom::SMP::Timer<192> const& t = (i == 0 ? smp.timer0 : (i == 1 ? smp.timer1 : *(SuperFamicom::SMP::Timer<192>*)&smp.timer2));