Mercurial > audlegacy-plugins
diff src/console/nes_cpu_io.h @ 341:986f098da058 trunk
[svn] - merge in blargg's changes
| author | nenolod |
|---|---|
| date | Thu, 07 Dec 2006 15:20:41 -0800 |
| parents | fb513e10174e |
| children |
line wrap: on
line diff
--- a/src/console/nes_cpu_io.h Wed Dec 06 07:57:05 2006 -0800 +++ b/src/console/nes_cpu_io.h Thu Dec 07 15:20:41 2006 -0800 @@ -61,6 +61,7 @@ if ( unsigned (addr - Nes_Apu::start_addr) <= Nes_Apu::end_addr - Nes_Apu::start_addr ) { + GME_APU_HOOK( this, addr - Nes_Apu::start_addr, data ); apu.write_register( cpu::time(), addr, data ); return; } @@ -68,10 +69,10 @@ unsigned bank = addr - bank_select_addr; if ( bank < bank_count ) { - blargg_long addr = rom.mask_addr( data * (blargg_long) bank_size ); - if ( addr >= rom.size() ) + blargg_long offset = rom.mask_addr( data * (blargg_long) bank_size ); + if ( offset >= rom.size() ) set_warning( "Invalid bank" ); - cpu::map_code( (bank + 8) * bank_size, bank_size, rom.at_addr( addr ) ); + cpu::map_code( (bank + 8) * bank_size, bank_size, rom.at_addr( offset ) ); return; }
