(MESS) c65: Less tagmap lookup. (nw)

This commit is contained in:
Curt Coder 2014-03-31 13:02:31 +00:00
parent 5233737351
commit 66fe5ecda5
2 changed files with 10 additions and 10 deletions

View File

@ -52,9 +52,7 @@ bus serial (available in all modes), a Fast and a Burst serial bus
#include "emu.h" #include "emu.h"
#include "cpu/m6502/m4510.h" #include "cpu/m6502/m4510.h"
#include "sound/mos6581.h"
#include "machine/mos6526.h" #include "machine/mos6526.h"
#include "video/vic4567.h"
#include "machine/cbm_snqk.h" #include "machine/cbm_snqk.h"
#include "includes/c65.h" #include "includes/c65.h"
#include "bus/cbmiec/cbmiec.h" #include "bus/cbmiec/cbmiec.h"
@ -466,16 +464,12 @@ int c65_state::c64_paddle_read( device_t *device, address_space &space, int whic
READ8_MEMBER( c65_state::sid_potx_r ) READ8_MEMBER( c65_state::sid_potx_r )
{ {
device_t *sid = machine().device("sid_r"); return c64_paddle_read(m_sid_r, space, 0);
return c64_paddle_read(sid, space, 0);
} }
READ8_MEMBER( c65_state::sid_poty_r ) READ8_MEMBER( c65_state::sid_poty_r )
{ {
device_t *sid = machine().device("sid_r"); return c64_paddle_read(m_sid_r, space, 1);
return c64_paddle_read(sid, space, 1);
} }
@ -487,7 +481,7 @@ READ8_MEMBER( c65_state::sid_poty_r )
UINT32 c65_state::screen_update_c65(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) UINT32 c65_state::screen_update_c65(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{ {
machine().device<vic3_device>("vic3")->video_update(bitmap, cliprect); m_vic->video_update(bitmap, cliprect);
return 0; return 0;
} }
@ -539,7 +533,7 @@ static const vic3_interface c65_vic3_pal_intf = {
INTERRUPT_GEN_MEMBER(c65_state::vic3_raster_irq) INTERRUPT_GEN_MEMBER(c65_state::vic3_raster_irq)
{ {
machine().device<vic3_device>("vic3")->raster_interrupt_gen(); m_vic->raster_interrupt_gen();
} }
/************************************* /*************************************

View File

@ -12,6 +12,8 @@
#include "imagedev/cartslot.h" #include "imagedev/cartslot.h"
#include "imagedev/snapquik.h" #include "imagedev/snapquik.h"
#include "machine/ram.h" #include "machine/ram.h"
#include "sound/mos6581.h"
#include "video/vic4567.h"
#define C64_MAX_ROMBANK 64 // .crt files contain multiple 'CHIPs', i.e. rom banks (of variable size) with headers. Known carts have at most 64 'CHIPs'. #define C64_MAX_ROMBANK 64 // .crt files contain multiple 'CHIPs', i.e. rom banks (of variable size) with headers. Known carts have at most 64 'CHIPs'.
@ -61,6 +63,8 @@ public:
: driver_device(mconfig, type, tag), : driver_device(mconfig, type, tag),
m_cia0(*this, "cia_0"), m_cia0(*this, "cia_0"),
m_cia1(*this, "cia_1"), m_cia1(*this, "cia_1"),
m_sid_r(*this, "sid_r"),
m_vic(*this, "vic3"),
m_iec(*this, CBM_IEC_TAG), m_iec(*this, CBM_IEC_TAG),
m_colorram(*this, "colorram"), m_colorram(*this, "colorram"),
m_basic(*this, "basic"), m_basic(*this, "basic"),
@ -74,6 +78,8 @@ public:
required_device<mos6526_device> m_cia0; required_device<mos6526_device> m_cia0;
required_device<mos6526_device> m_cia1; required_device<mos6526_device> m_cia1;
required_device<mos6581_device> m_sid_r;
required_device<vic3_device> m_vic;
optional_device<cbm_iec_device> m_iec; optional_device<cbm_iec_device> m_iec;
required_shared_ptr<UINT8> m_colorram; required_shared_ptr<UINT8> m_colorram;