chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Simplified SPC register initialization and eliminated an unnecessary function

Browse source
This commit is contained in:
Chris Moeller 2013-10-26 14:47:36 -07:00
parent ec58587742
commit fb07d985ea
4 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Frameworks/GME/gme/Spc_Emu.cpp
View file

@ -377,11 +377,9 @@ blargg_err_t Spc_Emu::start_track_( int track )
memcpy( smp.apuram, ptr, 0x10000 ); memcpy( smp.apuram, ptr, 0x10000 );
memcpy( smp.sfm_last, ptr + 0xF4, 4 ); memcpy( smp.sfm_last, ptr + 0xF4, 4 );
smp.op_buswrite( 0xF1, ptr[ 0xF1 ] );
smp.op_buswrite( 0xF2, ptr[ 0xF2 ] ); static const uint8_t regs_to_copy[] = { 0xF1, 0xF2, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC };
smp.op_buswrite( 0xFA, ptr[ 0xFA ] ); for (auto n : regs_to_copy) smp.op_buswrite( n, ptr[ n ] );
smp.op_buswrite( 0xFB, ptr[ 0xFB ] );
smp.op_buswrite( 0xFC, ptr[ 0xFC ] );
ptr += 0x10000; ptr += 0x10000;
smp.dsp.spc_dsp.load( ptr ); smp.dsp.spc_dsp.load( ptr );

2
Frameworks/GME/gme/higan/processor/spc700/spc700.hpp
View file

@ -11,8 +11,6 @@ struct SPC700 {
virtual void op_write(uint16_t addr, uint8_t data) = 0; virtual void op_write(uint16_t addr, uint8_t data) = 0;
void op_step(); void op_step();
virtual uint8_t disassembler_read(uint16_t addr) = 0;
#include "registers.hpp" #include "registers.hpp"
#include "memory.hpp" #include "memory.hpp"

6
Frameworks/GME/gme/higan/smp/memory.cpp
View file

@ -182,10 +182,4 @@ void SMP::op_write(uint16_t addr, uint8_t data) {
cycle_edge(); cycle_edge();
} }
uint8_t SMP::disassembler_read(uint16_t addr) {
if((addr & 0xfff0) == 0x00f0) return 0x00;
if((addr & 0xffc0) == 0xffc0 && status.iplrom_enable) return iplrom[addr & 0x3f];
return apuram[addr];
}
#endif #endif

2
Frameworks/GME/gme/higan/smp/smp.hpp
View file

@ -90,8 +90,6 @@ public:
uint8_t op_read(uint16_t addr); uint8_t op_read(uint16_t addr);
void op_write(uint16_t addr, uint8_t data); void op_write(uint16_t addr, uint8_t data);
uint8_t disassembler_read(uint16_t addr);
//timing.cpp //timing.cpp
template<unsigned frequency> template<unsigned frequency>
struct Timer { struct Timer {