From 1edc53b8992cda7552b90e61cbf498a3a1b66406 Mon Sep 17 00:00:00 2001 From: cam900 Date: Sun, 31 Mar 2019 11:34:32 +0900 Subject: [PATCH] deco16ic.cpp : Simplify handlers, Reduce some unnecessary lines --- src/mame/drivers/cninja.cpp | 2 +- src/mame/drivers/dblewing.cpp | 3 +-- src/mame/drivers/dreambal.cpp | 3 +-- src/mame/drivers/mirage.cpp | 3 +-- src/mame/video/boogwing.cpp | 3 +-- src/mame/video/cbuster.cpp | 3 +-- src/mame/video/cninja.cpp | 15 +++++---------- src/mame/video/darkseal.cpp | 3 +-- src/mame/video/dassault.cpp | 3 +-- src/mame/video/deco16ic.cpp | 36 +++++++++++++++++------------------ src/mame/video/deco16ic.h | 26 ++++++++++++------------- src/mame/video/deco32.cpp | 3 +-- src/mame/video/dietgo.cpp | 3 +-- src/mame/video/funkyjet.cpp | 3 +-- src/mame/video/pktgaldx.cpp | 3 +-- src/mame/video/rohga.cpp | 9 +++------ src/mame/video/sshangha.cpp | 3 +-- src/mame/video/supbtime.cpp | 3 +-- src/mame/video/vaportra.cpp | 3 +-- 19 files changed, 53 insertions(+), 77 deletions(-) diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp index a2b6418ac47..5857231534a 100644 --- a/src/mame/drivers/cninja.cpp +++ b/src/mame/drivers/cninja.cpp @@ -59,7 +59,7 @@ template WRITE16_MEMBER(cninja_state::cninja_pf_control_w) { m_screen->update_partial(m_screen->vpos()); - m_deco_tilegen[Chip]->pf_control_w(space, offset, data, mem_mask); + m_deco_tilegen[Chip]->pf_control_w(offset, data, mem_mask); } diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp index c38f2a3f567..1f4ab05a118 100644 --- a/src/mame/drivers/dblewing.cpp +++ b/src/mame/drivers/dblewing.cpp @@ -138,8 +138,7 @@ private: uint32_t dblewing_state::screen_update_dblewing(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = generic_space(); - uint16_t flip = m_deco_tilegen->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen->pf_control_r(0); flip_screen_set(BIT(flip, 7)); m_sprgen->set_flip_screen(BIT(flip, 7)); diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp index 6040f329c5f..2c11d07f7a7 100644 --- a/src/mame/drivers/dreambal.cpp +++ b/src/mame/drivers/dreambal.cpp @@ -83,8 +83,7 @@ private: uint32_t dreambal_state::screen_update_dreambal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = generic_space(); - uint16_t flip = m_deco_tilegen->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen->pf_control_r(0); flip_screen_set(BIT(flip, 7)); m_deco_tilegen->pf_update(nullptr, nullptr); diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp index 92107fedea7..ad8c0927d3c 100644 --- a/src/mame/drivers/mirage.cpp +++ b/src/mame/drivers/mirage.cpp @@ -106,8 +106,7 @@ void miragemj_state::video_start() uint32_t miragemj_state::screen_update_mirage(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen->pf_control_r(0); flip_screen_set(BIT(flip, 7)); m_sprgen->set_flip_screen(BIT(flip, 7)); diff --git a/src/mame/video/boogwing.cpp b/src/mame/video/boogwing.cpp index 52564201416..d0b38966639 100644 --- a/src/mame/video/boogwing.cpp +++ b/src/mame/video/boogwing.cpp @@ -182,8 +182,7 @@ void boogwing_state::mix_boogwing(screen_device &screen, bitmap_rgb32 &bitmap, c uint32_t boogwing_state::screen_update_boogwing(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); uint16_t priority = m_priority; // sprites are flipped relative to tilemaps diff --git a/src/mame/video/cbuster.cpp b/src/mame/video/cbuster.cpp index b66af9d3a05..599378adbef 100644 --- a/src/mame/video/cbuster.cpp +++ b/src/mame/video/cbuster.cpp @@ -61,8 +61,7 @@ WRITE16_MEMBER(cbuster_state::palette_ext_w) uint32_t cbuster_state::screen_update_twocrude(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); flip_screen_set(!BIT(flip, 7)); m_sprgen->set_flip_screen(!BIT(flip, 7)); diff --git a/src/mame/video/cninja.cpp b/src/mame/video/cninja.cpp index cfb7e30fe03..fbd6e004ea8 100644 --- a/src/mame/video/cninja.cpp +++ b/src/mame/video/cninja.cpp @@ -128,8 +128,7 @@ void cninja_state::cninjabl_draw_sprites( screen_device &screen, bitmap_ind16 &b uint32_t cninja_state::screen_update_cninja(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); flip_screen_set(BIT(flip, 7)); m_sprgen[0]->set_flip_screen(BIT(flip, 7)); @@ -161,8 +160,7 @@ uint32_t cninja_state::screen_update_cninjabl2(screen_device &screen, bitmap_ind uint32_t cninja_state::screen_update_cninjabl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); /* force layers to be enabled */ m_deco_tilegen[1]->set_enable(0, 1 ); @@ -186,8 +184,7 @@ uint32_t cninja_state::screen_update_cninjabl(screen_device &screen, bitmap_ind1 uint32_t cninja_state::screen_update_edrandy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); flip_screen_set(BIT(flip, 7)); m_sprgen[0]->set_flip_screen(BIT(flip, 7)); @@ -206,8 +203,7 @@ uint32_t cninja_state::screen_update_edrandy(screen_device &screen, bitmap_ind16 uint32_t cninja_state::screen_update_robocop2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); uint16_t priority = m_priority; /* One of the tilemap chips can switch between 2 tilemaps at 4bpp, or 1 at 8bpp */ @@ -264,8 +260,7 @@ VIDEO_START_MEMBER(cninja_state,mutantf) uint32_t cninja_state::screen_update_mutantf(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); uint16_t priority = m_priority; // sprites are flipped relative to tilemaps diff --git a/src/mame/video/darkseal.cpp b/src/mame/video/darkseal.cpp index 4d076ec0963..77538fd78f6 100644 --- a/src/mame/video/darkseal.cpp +++ b/src/mame/video/darkseal.cpp @@ -56,8 +56,7 @@ WRITE16_MEMBER(darkseal_state::palette_ext_w) uint32_t darkseal_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[1]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[1]->pf_control_r(0); flip_screen_set(!BIT(flip, 7)); m_sprgen->set_flip_screen(!BIT(flip, 7)); diff --git a/src/mame/video/dassault.cpp b/src/mame/video/dassault.cpp index 7c7f8e7b550..5d8c4accad8 100644 --- a/src/mame/video/dassault.cpp +++ b/src/mame/video/dassault.cpp @@ -83,8 +83,7 @@ void dassault_state::mixdassaultlayer(bitmap_rgb32 &bitmap, bitmap_ind16* sprite /* are the priorities 100% correct? they're the same as they were before conversion to DECO52 sprite device, but if (for example) you walk to the side of the crates in the first part of the game you appear over them... */ uint32_t dassault_state::screen_update_dassault(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); uint16_t priority = m_priority; flip_screen_set(BIT(flip, 7)); diff --git a/src/mame/video/deco16ic.cpp b/src/mame/video/deco16ic.cpp index a52cac73971..e93dee62230 100644 --- a/src/mame/video/deco16ic.cpp +++ b/src/mame/video/deco16ic.cpp @@ -602,7 +602,7 @@ void deco16ic_device::set_enable( int tmap, int enable ) /******************************************************************************/ -WRITE16_MEMBER( deco16ic_device::pf1_data_w ) +void deco16ic_device::pf1_data_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_pf1_data[offset]); @@ -611,7 +611,7 @@ WRITE16_MEMBER( deco16ic_device::pf1_data_w ) m_pf1_tilemap_16x16->mark_tile_dirty(offset); } -WRITE16_MEMBER( deco16ic_device::pf2_data_w ) +void deco16ic_device::pf2_data_w(offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_pf2_data[offset]); @@ -620,17 +620,17 @@ WRITE16_MEMBER( deco16ic_device::pf2_data_w ) m_pf2_tilemap_16x16->mark_tile_dirty(offset); } -READ16_MEMBER( deco16ic_device::pf1_data_r ) +u16 deco16ic_device::pf1_data_r(offs_t offset) { return m_pf1_data[offset]; } -READ16_MEMBER( deco16ic_device::pf2_data_r ) +u16 deco16ic_device::pf2_data_r(offs_t offset) { return m_pf2_data[offset]; } -WRITE16_MEMBER( deco16ic_device::pf_control_w ) +void deco16ic_device::pf_control_w(offs_t offset, u16 data, u16 mem_mask) { // update until current scanline (inclusive if we're in hblank) int ydelta = (screen().hpos() > screen().visible_area().right()) ? 0 : 1; @@ -639,40 +639,40 @@ WRITE16_MEMBER( deco16ic_device::pf_control_w ) COMBINE_DATA(&m_pf12_control[offset]); } -READ16_MEMBER( deco16ic_device::pf_control_r ) +u16 deco16ic_device::pf_control_r(offs_t offset) { return m_pf12_control[offset]; } -READ32_MEMBER( deco16ic_device::pf_control_dword_r ) +u32 deco16ic_device::pf_control_dword_r(offs_t offset) { - return pf_control_r(space, offset, 0xffff)^0xffff0000; + return pf_control_r(offset) ^ 0xffff0000; } -WRITE32_MEMBER( deco16ic_device::pf_control_dword_w ) +void deco16ic_device::pf_control_dword_w(offs_t offset, u32 data, u32 mem_mask) { - pf_control_w(space, offset, data & 0xffff, mem_mask & 0xffff); + pf_control_w(offset, data & 0xffff, mem_mask & 0xffff); } -READ32_MEMBER( deco16ic_device::pf1_data_dword_r ) +u32 deco16ic_device::pf1_data_dword_r(offs_t offset) { - return pf1_data_r(space, offset, 0xffff)^0xffff0000; + return pf1_data_r(offset) ^ 0xffff0000; } -WRITE32_MEMBER( deco16ic_device::pf1_data_dword_w ) +void deco16ic_device::pf1_data_dword_w(offs_t offset, u32 data, u32 mem_mask) { - pf1_data_w(space, offset, data & 0xffff, mem_mask & 0xffff); + pf1_data_w(offset, data & 0xffff, mem_mask & 0xffff); } -READ32_MEMBER( deco16ic_device::pf2_data_dword_r ) +u32 deco16ic_device::pf2_data_dword_r(offs_t offset) { - return pf2_data_r(space, offset, 0xffff)^0xffff0000; + return pf2_data_r(offset) ^ 0xffff0000; } -WRITE32_MEMBER( deco16ic_device::pf2_data_dword_w ) +void deco16ic_device::pf2_data_dword_w(offs_t offset, u32 data, u32 mem_mask) { - pf2_data_w(space, offset, data & 0xffff, mem_mask & 0xffff); + pf2_data_w(offset, data & 0xffff, mem_mask & 0xffff); } diff --git a/src/mame/video/deco16ic.h b/src/mame/video/deco16ic.h index 2c5fa213e03..4b6ff44647d 100644 --- a/src/mame/video/deco16ic.h +++ b/src/mame/video/deco16ic.h @@ -49,25 +49,23 @@ public: void set_pf12_16x16_bank(int bank) { m_pf12_16x16_gfx_bank = bank; } - DECLARE_WRITE16_MEMBER( pf1_data_w ); - DECLARE_WRITE16_MEMBER( pf2_data_w ); + void pf1_data_w(offs_t offset, u16 data, u16 mem_mask = ~0); + void pf2_data_w(offs_t offset, u16 data, u16 mem_mask = ~0); - DECLARE_READ16_MEMBER( pf1_data_r ); - DECLARE_READ16_MEMBER( pf2_data_r ); + u16 pf1_data_r(offs_t offset); + u16 pf2_data_r(offs_t offset); - DECLARE_WRITE16_MEMBER( pf_control_w ); + void pf_control_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 pf_control_r(offs_t offset); - DECLARE_READ16_MEMBER( pf_control_r ); + void pf1_data_dword_w(offs_t offset, u32 data, u32 mem_mask = ~0); + void pf2_data_dword_w(offs_t offset, u32 data, u32 mem_mask = ~0); - DECLARE_WRITE32_MEMBER( pf1_data_dword_w ); - DECLARE_WRITE32_MEMBER( pf2_data_dword_w ); + u32 pf1_data_dword_r(offs_t offset); + u32 pf2_data_dword_r(offs_t offset); - DECLARE_READ32_MEMBER( pf1_data_dword_r ); - DECLARE_READ32_MEMBER( pf2_data_dword_r ); - - DECLARE_WRITE32_MEMBER( pf_control_dword_w ); - - DECLARE_READ32_MEMBER( pf_control_dword_r ); + void pf_control_dword_w(offs_t offset, u32 data, u32 mem_mask = ~0); + u32 pf_control_dword_r(offs_t offset); void print_debug_info(bitmap_ind16 &bitmap); diff --git a/src/mame/video/deco32.cpp b/src/mame/video/deco32.cpp index 285960426a6..44352932ebc 100644 --- a/src/mame/video/deco32.cpp +++ b/src/mame/video/deco32.cpp @@ -130,8 +130,7 @@ void dragngun_state::video_start() uint32_t captaven_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); flip_screen_set(BIT(flip, 7)); m_sprgen[0]->set_flip_screen(BIT(flip, 7)); diff --git a/src/mame/video/dietgo.cpp b/src/mame/video/dietgo.cpp index 299c6f61f59..8223693a488 100644 --- a/src/mame/video/dietgo.cpp +++ b/src/mame/video/dietgo.cpp @@ -5,8 +5,7 @@ uint32_t dietgo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen->pf_control_r(0); flip_screen_set(BIT(flip, 7)); m_sprgen->set_flip_screen(BIT(flip, 7)); diff --git a/src/mame/video/funkyjet.cpp b/src/mame/video/funkyjet.cpp index ce64ae11162..5a6b56964f2 100644 --- a/src/mame/video/funkyjet.cpp +++ b/src/mame/video/funkyjet.cpp @@ -13,8 +13,7 @@ uint32_t funkyjet_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen->pf_control_r(0); flip_screen_set(BIT(flip, 7)); m_sprgen->set_flip_screen(BIT(flip, 7)); diff --git a/src/mame/video/pktgaldx.cpp b/src/mame/video/pktgaldx.cpp index 40405a90c12..cb32ae8b900 100644 --- a/src/mame/video/pktgaldx.cpp +++ b/src/mame/video/pktgaldx.cpp @@ -8,8 +8,7 @@ uint32_t pktgaldx_state::screen_update_pktgaldx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen->pf_control_r(0); // sprites are flipped relative to tilemaps flip_screen_set(BIT(flip, 7)); diff --git a/src/mame/video/rohga.cpp b/src/mame/video/rohga.cpp index 73833d5dc9a..0c906f4b005 100644 --- a/src/mame/video/rohga.cpp +++ b/src/mame/video/rohga.cpp @@ -22,8 +22,7 @@ WRITE16_MEMBER(rohga_state::rohga_buffer_spriteram16_w) uint32_t rohga_state::screen_update_rohga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); uint16_t priority = m_decocomn->priority_r(); // sprites are flipped relative to tilemaps @@ -128,8 +127,7 @@ void rohga_state::mixwizdfirelayer(bitmap_rgb32 &bitmap, const rectangle &clipre uint32_t rohga_state::screen_update_wizdfire(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); uint16_t priority = m_decocomn->priority_r(); // sprites are flipped relative to tilemaps @@ -331,8 +329,7 @@ void rohga_state::mixnitroballlayer(screen_device &screen, bitmap_rgb32 &bitmap, uint32_t rohga_state::screen_update_nitrobal(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); uint16_t priority = m_decocomn->priority_r(); flip_screen_set(BIT(flip, 7)); diff --git a/src/mame/video/sshangha.cpp b/src/mame/video/sshangha.cpp index 789ba128820..b8f4aac1cb3 100644 --- a/src/mame/video/sshangha.cpp +++ b/src/mame/video/sshangha.cpp @@ -37,8 +37,7 @@ uint32_t sshangha_state::screen_update(screen_device &screen, bitmap_rgb32 &bitm const bool combine_tilemaps = (m_video_control&4) ? false : true; // sprites are flipped relative to tilemaps - address_space &space = machine().dummy_space(); - uint16_t flip = m_tilegen->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_tilegen->pf_control_r(0); flip_screen_set(BIT(flip, 7)); m_sprgen1->set_flip_screen(!BIT(flip, 7)); m_sprgen2->set_flip_screen(!BIT(flip, 7)); diff --git a/src/mame/video/supbtime.cpp b/src/mame/video/supbtime.cpp index 7fa8add9e52..8213afa543b 100644 --- a/src/mame/video/supbtime.cpp +++ b/src/mame/video/supbtime.cpp @@ -17,8 +17,7 @@ uint32_t supbtime_state::screen_update_common(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, bool use_offsets) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen->pf_control_r(0); flip_screen_set(BIT(flip, 7)); m_sprgen->set_flip_screen(BIT(flip, 7)); diff --git a/src/mame/video/vaportra.cpp b/src/mame/video/vaportra.cpp index a9126ae9c66..db5f1b95a6a 100644 --- a/src/mame/video/vaportra.cpp +++ b/src/mame/video/vaportra.cpp @@ -53,8 +53,7 @@ WRITE16_MEMBER(vaportra_state::palette_ext_w) uint32_t vaportra_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { - address_space &space = machine().dummy_space(); - uint16_t flip = m_deco_tilegen[0]->pf_control_r(space, 0, 0xffff); + uint16_t flip = m_deco_tilegen[0]->pf_control_r(0); int pri = m_priority[0] & 0x03; flip_screen_set(!BIT(flip, 7));