summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2026-05-04 04:00:55 +1000
committer Vas Crabb <vas@vastheman.com>2026-05-04 04:00:55 +1000
commit37ee3f7cd3fbc151b80dff0d620b2cea2dfe54c0 (patch)
treeece384537fdfa4f8f8a135743c052532a09a8a1d
parentc4a7de0fad78dac4d0399e7b1cb909ddab3ac8c1 (diff)
ui/ui.cpp: Fixed variable name auto-complete gone wrong.
Also cleaned up a bunch of recent changes.
-rw-r--r--src/devices/cpu/i386/x87ops.hxx3
-rw-r--r--src/devices/machine/i8087.cpp9
-rw-r--r--src/devices/video/huc6260.cpp44
-rw-r--r--src/frontend/mame/ui/ui.cpp13
-rw-r--r--src/frontend/mame/ui/viewgfx.cpp42
-rw-r--r--src/frontend/mame/ui/viewgfx.h2
-rw-r--r--src/mame/comad/zerozone.cpp2
-rw-r--r--src/mame/dataeast/brkthru.cpp4
-rw-r--r--src/mame/dataeast/bwing.cpp22
-rw-r--r--src/mame/dataeast/dec0.h44
-rw-r--r--src/mame/dooyong/dooyong.cpp40
-rw-r--r--src/mame/dooyong/dooyong_tilemap.cpp2
-rw-r--r--src/mame/dooyong/gundealr.cpp4
-rw-r--r--src/mame/dynax/realbrk.h9
-rw-r--r--src/mame/konami/bishi.cpp8
-rw-r--r--src/mame/misc/vamphalf.cpp151
-rw-r--r--src/mame/playmark/playmark.cpp8
-rw-r--r--src/mame/playmark/playmark.h22
-rw-r--r--src/mame/playmark/powerbal.cpp10
-rw-r--r--src/mame/playmark/sderby.cpp15
20 files changed, 236 insertions, 218 deletions
diff --git a/src/devices/cpu/i386/x87ops.hxx b/src/devices/cpu/i386/x87ops.hxx
index a9c53159642..8e3a988a9d7 100644
--- a/src/devices/cpu/i386/x87ops.hxx
+++ b/src/devices/cpu/i386/x87ops.hxx
@@ -2307,7 +2307,8 @@ void i386_device::x87_fprem1(uint8_t modrm)
m_x87_sw &= ~X87_SW_C2;
- if (!extFloat80_ieee754_remainder(ST(0), ST(1), result, q)) {
+ if (!extFloat80_ieee754_remainder(ST(0), ST(1), result, q))
+ {
m_x87_sw &= ~(X87_SW_C0|X87_SW_C3|X87_SW_C1);
if (q & 1)
m_x87_sw |= X87_SW_C1;
diff --git a/src/devices/machine/i8087.cpp b/src/devices/machine/i8087.cpp
index ffa18dfb4d4..896b30014ba 100644
--- a/src/devices/machine/i8087.cpp
+++ b/src/devices/machine/i8087.cpp
@@ -423,7 +423,11 @@ int i8087_device::check_exceptions(bool store)
if ((m_sw & ~m_cw) & 0x3f)
{
// interrupt handler
- if (!(m_cw & X87_CW_IEM)) { m_sw |= X87_SW_ES; m_int_handler(1); }
+ if (!(m_cw & X87_CW_IEM))
+ {
+ m_sw |= X87_SW_ES;
+ m_int_handler(1);
+ }
logerror("Unmasked x87 exception (CW:%.4x, SW:%.4x)\n", m_cw, m_sw);
if (store || !(unmasked & (X87_SW_OE | X87_SW_UE)))
return 0;
@@ -2141,7 +2145,8 @@ void i8087_device::fprem1(u8 modrm)
m_sw &= ~X87_SW_C2;
- if (!extFloat80_ieee754_remainder(ST(0), ST(1), result, q)) {
+ if (!extFloat80_ieee754_remainder(ST(0), ST(1), result, q))
+ {
m_sw &= ~(X87_SW_C0|X87_SW_C3|X87_SW_C1);
if (q & 1)
m_sw |= X87_SW_C1;
diff --git a/src/devices/video/huc6260.cpp b/src/devices/video/huc6260.cpp
index c9a5d5cfac3..0d7508ddfb8 100644
--- a/src/devices/video/huc6260.cpp
+++ b/src/devices/video/huc6260.cpp
@@ -113,23 +113,25 @@ TIMER_CALLBACK_MEMBER(huc6260_device::update_events)
{
case HUC6260_HSYNC_START: /* Start of HSync */
m_hsync_changed_cb(0);
-// if (v == 0)
-// {
-// /* Check if the screen should be resized */
-// m_height = LPF - (m_blur ? 1 : 0);
-// if (m_height != video_screen_get_height(m_screen))
-// {
-// rectangle visible_area;
-//
-// /* TODO: Set proper visible area parameters */
-// visible_area.min_x = 64;
-// visible_area.min_y = 18;
-// visible_area.max_x = 64 + 1024 + 64 - 1;
-// visible_area.max_y = 18 + 242 - 1;
-//
-// video_screen_configure(m_screen, WPF, m_height, &visible_area, HZ_TO_ATTOSECONDS(device->clock / (WPF * m_height)));
-// }
-// }
+#if 0
+ if (v == 0)
+ {
+ /* Check if the screen should be resized */
+ m_height = LPF - (m_blur ? 1 : 0);
+ if (m_height != video_screen_get_height(m_screen))
+ {
+ rectangle visible_area;
+
+ /* TODO: Set proper visible area parameters */
+ visible_area.min_x = 64;
+ visible_area.min_y = 18;
+ visible_area.max_x = 64 + 1024 + 64 - 1;
+ visible_area.max_y = 18 + 242 - 1;
+
+ video_screen_configure(m_screen, WPF, m_height, &visible_area, HZ_TO_ATTOSECONDS(device->clock / (WPF * m_height)));
+ }
+ }
+#endif
break;
case 0: /* End of HSync */
@@ -256,19 +258,19 @@ void huc6260_device::write(offs_t offset, u8 data)
break;
case 0x02: /* Color table address LSB */
- m_address = (m_address & 0x100) | data;
+ m_address = (m_address & 0x100) | u16(data);
break;
case 0x03: /* Color table address MSB */
- m_address = ((m_address & 0x0ff) | (BIT(data, 0) << 8)) & 0x1ff;
+ m_address = (m_address & 0x0ff) | (u16(BIT(data, 0)) << 8);
break;
case 0x04: /* Color table data LSB */
- m_palette[m_address] = (m_palette[m_address] & 0x100) | data;
+ m_palette[m_address] = (m_palette[m_address] & 0x100) | u16(data);
break;
case 0x05: /* Color table data MSB */
- m_palette[m_address] = ((m_palette[m_address] & 0x0ff) | (BIT(data, 0) << 8)) & 0x1ff;
+ m_palette[m_address] = (m_palette[m_address] & 0x0ff) | (u16(BIT(data, 0)) << 8);
/* Increment internal address */
m_address = (m_address + 1) & 0x1ff;
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index 9439ec05fca..a9982cda434 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -1170,7 +1170,7 @@ void mame_ui_manager::draw_text_full(
x, y, origwrapwidth,
justify, wrap,
draw, fgcolor, bgcolor,
- totalwidth, totalwidth,
+ totalwidth, totalheight,
text_size, machine().render().ui_aspect(target));
}
@@ -1189,7 +1189,7 @@ void mame_ui_manager::draw_text_full(
x, y, origwrapwidth,
justify, wrap,
draw, fgcolor, bgcolor,
- totalwidth, totalwidth,
+ totalwidth, totalheight,
text_size, machine().render().ui_aspect(container));
}
@@ -1763,15 +1763,14 @@ uint32_t mame_ui_manager::handler_ingame()
}
if (!is_paused)
+ {
machine().pause();
+ m_paused_for_menu = true;
+ }
m_ui_target = &current_ui_target();
set_handler(
ui_callback_type::MENU,
- handler_callback_func(
- [this, is_paused] () -> uint32_t
- {
- return ui_gfx_ui_handler(*m_ui_target, *this, is_paused);
- }));
+ handler_callback_func([this] () { return ui_gfx_ui_handler(*m_ui_target, *this); }));
return 0;
}
diff --git a/src/frontend/mame/ui/viewgfx.cpp b/src/frontend/mame/ui/viewgfx.cpp
index a61dfb31556..7126a8a0195 100644
--- a/src/frontend/mame/ui/viewgfx.cpp
+++ b/src/frontend/mame/ui/viewgfx.cpp
@@ -52,11 +52,11 @@ public:
m_machine.render().texture_free(m_texture);
}
- uint32_t handle(mame_ui_manager &mui, render_target &target, bool uistate)
+ uint32_t handle(mame_ui_manager &mui, render_target &target)
{
// implicitly cancel if there's nothing to display
if (!is_relevant())
- return cancel(uistate);
+ return cancel();
// let the OSD do its thing
mui.machine().osd().check_osd_inputs();
@@ -145,19 +145,19 @@ public:
{
case view::PALETTE:
if (m_palette.interface())
- return handle_palette(mui, target, uistate);
+ return handle_palette(mui, target);
m_mode = view::GFXSET;
break;
case view::GFXSET:
if (m_gfxset.has_gfx())
- return handle_gfxset(mui, target, uistate);
+ return handle_gfxset(mui, target);
m_mode = view::TILEMAP;
break;
case view::TILEMAP:
if (m_machine.tilemap().count())
- return handle_tilemap(mui, target, uistate);
+ return handle_tilemap(mui, target);
m_mode = view::PALETTE;
break;
}
@@ -581,7 +581,7 @@ private:
return m_palette.interface() || m_gfxset.has_gfx() || m_machine.tilemap().count();
}
- uint32_t handle_general_keys(bool uistate)
+ uint32_t handle_general_keys()
{
auto &input = m_machine.ui_input();
@@ -610,15 +610,13 @@ private:
// cancel or graphics viewer dismisses the viewer
if (input.pressed(IPT_UI_BACK) || input.pressed(IPT_UI_SHOW_GFX))
- return cancel(uistate);
+ return cancel();
- return uistate;
+ return 0;
}
- uint32_t cancel(bool uistate)
+ uint32_t cancel()
{
- if (!uistate)
- m_machine.resume();
m_machine.ui_input().reset();
m_current_pointer = -1;
m_pointer_type = ui_event::pointer::UNKNOWN;
@@ -630,9 +628,9 @@ private:
return mame_ui_manager::HANDLER_CANCEL;
}
- uint32_t handle_palette(mame_ui_manager &mui, render_target &target, bool uistate);
- uint32_t handle_gfxset(mame_ui_manager &mui, render_target &target, bool uistate);
- uint32_t handle_tilemap(mame_ui_manager &mui, render_target &target, bool uistate);
+ uint32_t handle_palette(mame_ui_manager &mui, render_target &target);
+ uint32_t handle_gfxset(mame_ui_manager &mui, render_target &target);
+ uint32_t handle_tilemap(mame_ui_manager &mui, render_target &target);
void update_gfxset_bitmap(int xcells, int ycells, gfx_element &gfx);
void update_tilemap_bitmap(int width, int height);
@@ -986,7 +984,7 @@ bool gfx_viewer::tilemap::handle_keys(running_machine &machine, float pixelscale
}
-uint32_t gfx_viewer::handle_palette(mame_ui_manager &mui, render_target &target, bool uistate)
+uint32_t gfx_viewer::handle_palette(mame_ui_manager &mui, render_target &target)
{
device_palette_interface &palette = *m_palette.interface();
palette_device *const paldev = dynamic_cast<palette_device *>(&palette.device());
@@ -1138,11 +1136,11 @@ uint32_t gfx_viewer::handle_palette(mame_ui_manager &mui, render_target &target,
// handle keys
m_palette.handle_keys(m_machine);
- return handle_general_keys(uistate);
+ return handle_general_keys();
}
-uint32_t gfx_viewer::handle_gfxset(mame_ui_manager &mui, render_target &target, bool uistate)
+uint32_t gfx_viewer::handle_gfxset(mame_ui_manager &mui, render_target &target)
{
// get graphics info
auto &info = m_gfxset.m_devices[m_gfxset.m_device];
@@ -1340,11 +1338,11 @@ uint32_t gfx_viewer::handle_gfxset(mame_ui_manager &mui, render_target &target,
// handle keyboard navigation before drawing
if (m_gfxset.handle_keys(m_machine, xcells, ycells))
m_bitmap_dirty = true;
- return handle_general_keys(uistate);
+ return handle_general_keys();
}
-uint32_t gfx_viewer::handle_tilemap(mame_ui_manager &mui, render_target &target, bool uistate)
+uint32_t gfx_viewer::handle_tilemap(mame_ui_manager &mui, render_target &target)
{
// get some UI metrics
render_font *const ui_font = mui.get_font();
@@ -1480,7 +1478,7 @@ uint32_t gfx_viewer::handle_tilemap(mame_ui_manager &mui, render_target &target,
// handle keyboard input
if (m_tilemap.handle_keys(m_machine, pixelscale))
m_bitmap_dirty = true;
- return handle_general_keys(uistate);
+ return handle_general_keys();
}
@@ -1616,7 +1614,7 @@ void gfx_viewer::gfxset_draw_item(gfx_element &gfx, int index, int dstx, int dst
// create or modify gfx sets in VIDEO_START
//-------------------------------------------------
-uint32_t ui_gfx_ui_handler(render_target &target, mame_ui_manager &mui, bool uistate)
+uint32_t ui_gfx_ui_handler(render_target &target, mame_ui_manager &mui)
{
- return mui.get_session_data<gfx_viewer, gfx_viewer>(mui.machine()).handle(mui, target, uistate);
+ return mui.get_session_data<gfx_viewer, gfx_viewer>(mui.machine()).handle(mui, target);
}
diff --git a/src/frontend/mame/ui/viewgfx.h b/src/frontend/mame/ui/viewgfx.h
index 8db7fc7718e..3fdf3b61a7f 100644
--- a/src/frontend/mame/ui/viewgfx.h
+++ b/src/frontend/mame/ui/viewgfx.h
@@ -21,7 +21,7 @@
***************************************************************************/
// master handler
-uint32_t ui_gfx_ui_handler(render_target &target, mame_ui_manager &mui, bool uistate);
+uint32_t ui_gfx_ui_handler(render_target &target, mame_ui_manager &mui);
#endif // MAME_FRONTEND_MAME_UI_VIEWGFX_H
diff --git a/src/mame/comad/zerozone.cpp b/src/mame/comad/zerozone.cpp
index 8ff74c3f622..aa3872154ba 100644
--- a/src/mame/comad/zerozone.cpp
+++ b/src/mame/comad/zerozone.cpp
@@ -84,7 +84,7 @@ public:
, m_vram(*this, "videoram")
{ }
- void zerozone(machine_config &config);
+ void zerozone(machine_config &config) ATTR_COLD;
protected:
// driver_device overrides
diff --git a/src/mame/dataeast/brkthru.cpp b/src/mame/dataeast/brkthru.cpp
index 3c0fb9e54d5..8a7850958b0 100644
--- a/src/mame/dataeast/brkthru.cpp
+++ b/src/mame/dataeast/brkthru.cpp
@@ -184,8 +184,8 @@ public:
m_flipswitch(*this, "FLIP")
{ }
- void brkthru(machine_config &config);
- void darwin(machine_config &config);
+ void brkthru(machine_config &config) ATTR_COLD;
+ void darwin(machine_config &config) ATTR_COLD;
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
DECLARE_INPUT_CHANGED_MEMBER(flipscreen_switch) { flipscreen_w(m_flipscreen); }
diff --git a/src/mame/dataeast/bwing.cpp b/src/mame/dataeast/bwing.cpp
index f3ff84d410c..4a7fbb84a61 100644
--- a/src/mame/dataeast/bwing.cpp
+++ b/src/mame/dataeast/bwing.cpp
@@ -58,8 +58,8 @@ public:
m_vramview(*this, "vramview")
{ }
- void init_bwing();
- void bwing(machine_config &config);
+ void init_bwing() ATTR_COLD;
+ void bwing(machine_config &config) ATTR_COLD;
DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
DECLARE_INPUT_CHANGED_MEMBER(tilt_pressed);
@@ -118,11 +118,12 @@ private:
void draw_sprites(screen_device &screen, bitmap_ind16 &bmp, const rectangle &clip);
INTERRUPT_GEN_MEMBER(sound_interrupt);
+
void bank_map(address_map &map) ATTR_COLD;
void main_map(address_map &map) ATTR_COLD;
void sub_map(address_map &map) ATTR_COLD;
- void sound_io_map(address_map &map) ATTR_COLD;
void sound_map(address_map &map) ATTR_COLD;
+ void sound_io_map(address_map &map) ATTR_COLD;
};
@@ -270,26 +271,29 @@ void bwing_state::draw_sprites(screen_device &screen, bitmap_ind16 &bmp, const r
// single/double
if (!BIT(attrib, 4))
+ {
gfx->prio_transpen(bmp, clip,
code, color,
fx, fy,
x, y,
screen.priority(), primask, 0);
+ }
else
+ {
gfx->prio_zoom_transpen(bmp, clip,
code, color,
fx, fy,
x, y,
1 << 16, 2 << 16,
screen.priority(), primask, 0);
+ }
}
}
uint32_t bwing_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- u32 flip, x, y, shiftx;
-
+ u32 flip, shiftx;
if (BIT(m_mapmask, 5))
{
flip = TILEMAP_FLIPX;
@@ -307,9 +311,9 @@ uint32_t bwing_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
if (!BIT(m_mapmask, 0))
{
m_bgmap->set_flip(flip);
- x = ((m_sreg[1] << 2 & 0x300) + m_sreg[2] + shiftx) & 0x3ff;
+ const u32 x = ((m_sreg[1] << 2 & 0x300) + m_sreg[2] + shiftx) & 0x3ff;
m_bgmap->set_scrollx(0, x);
- y = (m_sreg[1] << 4 & 0x300) + m_sreg[3];
+ const u32 y = (m_sreg[1] << 4 & 0x300) + m_sreg[3];
m_bgmap->set_scrolly(0, y);
m_bgmap->draw(screen, bitmap, cliprect, 0, 1);
}
@@ -320,9 +324,9 @@ uint32_t bwing_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
if (!BIT(m_mapmask, 1))
{
m_fgmap->set_flip(flip);
- x = ((m_sreg[1] << 6 & 0x300) + m_sreg[4] + shiftx) & 0x3ff;
+ const u32 x = ((m_sreg[1] << 6 & 0x300) + m_sreg[4] + shiftx) & 0x3ff;
m_fgmap->set_scrollx(0, x);
- y = (m_sreg[1] << 8 & 0x300) + m_sreg[5];
+ const u32 y = (m_sreg[1] << 8 & 0x300) + m_sreg[5];
m_fgmap->set_scrolly(0, y);
m_fgmap->draw(screen, bitmap, cliprect, 0, 2);
}
diff --git a/src/mame/dataeast/dec0.h b/src/mame/dataeast/dec0.h
index 9402822a253..5e471d0599a 100644
--- a/src/mame/dataeast/dec0.h
+++ b/src/mame/dataeast/dec0.h
@@ -39,16 +39,16 @@ public:
m_io_an(*this, "AN%u", 0U)
{ }
- void dec0_base(machine_config &config);
- void dec0(machine_config &config);
- void dec1(machine_config &config);
- void ffantasybl(machine_config &config);
- void midres(machine_config &config);
- void midresbj(machine_config &config);
- void midresb(machine_config &config);
- void robocopb(machine_config &config);
+ void dec0_base(machine_config &config) ATTR_COLD;
+ void dec0(machine_config &config) ATTR_COLD;
+ void dec1(machine_config &config) ATTR_COLD;
+ void ffantasybl(machine_config &config) ATTR_COLD;
+ void midres(machine_config &config) ATTR_COLD;
+ void midresbj(machine_config &config) ATTR_COLD;
+ void midresb(machine_config &config) ATTR_COLD;
+ void robocopb(machine_config &config) ATTR_COLD;
- void init_ffantasybl();
+ void init_ffantasybl() ATTR_COLD;
protected:
virtual void dec0_control_w(offs_t offset, u16 data, u16 mem_mask = ~0);
@@ -74,7 +74,7 @@ protected:
void set_screen_raw_params(machine_config &config);
- void h6280_decrypt(const char *cputag);
+ void h6280_decrypt(const char *cputag) ATTR_COLD;
void dec0_map(address_map &map) ATTR_COLD;
void dec0_s_map(address_map &map) ATTR_COLD;
@@ -114,7 +114,7 @@ public:
dec0_state(mconfig, type, tag)
{ }
- void drgninjab(machine_config &config);
+ void drgninjab(machine_config &config) ATTR_COLD;
protected:
virtual void machine_start() override ATTR_COLD;
@@ -143,10 +143,10 @@ public:
drgninjab_state(mconfig, type, tag)
{ }
- void birdtry(machine_config &config);
- void bandit(machine_config &config);
- void baddudes(machine_config &config);
- void hbarrel(machine_config &config);
+ void birdtry(machine_config &config) ATTR_COLD;
+ void bandit(machine_config &config) ATTR_COLD;
+ void baddudes(machine_config &config) ATTR_COLD;
+ void hbarrel(machine_config &config) ATTR_COLD;
protected:
virtual void dec0_i8751_w(u16 data) override;
@@ -178,7 +178,7 @@ public:
m_subcpu(*this, "sub")
{ }
- void robocop(machine_config &config);
+ void robocop(machine_config &config) ATTR_COLD;
protected:
required_device<h6280_device> m_subcpu;
@@ -198,9 +198,9 @@ public:
m_sharedram(*this, "sharedram")
{ }
- void hippodrm(machine_config &config);
+ void hippodrm(machine_config &config) ATTR_COLD;
- void init_hippodrm();
+ void init_hippodrm() ATTR_COLD;
private:
u8 prot_r(offs_t offset);
@@ -229,9 +229,9 @@ public:
m_sndview(*this, "sndview")
{ }
- void slyspy(machine_config &config);
+ void slyspy(machine_config &config) ATTR_COLD;
- void init_slyspy();
+ void init_slyspy() ATTR_COLD;
protected:
virtual void machine_reset() override ATTR_COLD;
@@ -268,8 +268,8 @@ public:
std::fill(std::begin(m_automat_scroll_regs), std::end(m_automat_scroll_regs), 0);
}
- void secretab(machine_config &config);
- void automat(machine_config &config);
+ void secretab(machine_config &config) ATTR_COLD;
+ void automat(machine_config &config) ATTR_COLD;
protected:
virtual void machine_start() override ATTR_COLD;
diff --git a/src/mame/dooyong/dooyong.cpp b/src/mame/dooyong/dooyong.cpp
index c18fba28db2..2804b595eaf 100644
--- a/src/mame/dooyong/dooyong.cpp
+++ b/src/mame/dooyong/dooyong.cpp
@@ -107,7 +107,7 @@ protected:
{
}
- void sound_2151(machine_config &config, XTAL ymclk, XTAL okiclk);
+ void sound_2151(machine_config &config, XTAL ymclk, XTAL okiclk) ATTR_COLD;
void bluehawk_sound_map(address_map &map) ATTR_COLD;
required_device<cpu_device> m_maincpu;
@@ -129,9 +129,9 @@ public:
{
}
- void bluehawk(machine_config &config);
- void flytiger(machine_config &config);
- void primella(machine_config &config);
+ void bluehawk(machine_config &config) ATTR_COLD;
+ void flytiger(machine_config &config) ATTR_COLD;
+ void primella(machine_config &config) ATTR_COLD;
protected:
enum
@@ -198,9 +198,9 @@ protected:
u32 screen_update_flytiger(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
u32 screen_update_primella(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void init_banked_paletteram()
+ void init_banked_paletteram() ATTR_COLD
{
- m_paletteram_flytiger = make_unique_clear<u8[]>(0x1000);
+ m_paletteram_flytiger = make_unique_clear<u8 []>(0x1000);
m_palette->basemem().set(m_paletteram_flytiger.get(), 0x1000, 8, ENDIANNESS_LITTLE, 2);
save_pointer(NAME(m_paletteram_flytiger), 0x1000);
}
@@ -242,7 +242,7 @@ protected:
void flytiger_map(address_map &map) ATTR_COLD;
void primella_map(address_map &map) ATTR_COLD;
- std::unique_ptr<u8[]> m_paletteram_flytiger;
+ std::unique_ptr<u8 []> m_paletteram_flytiger;
u8 m_sprites_disabled = 0;
u8 m_flytiger_pri = 0;
u8 m_tx_pri = 0;
@@ -262,9 +262,9 @@ public:
{
}
- void lastday(machine_config &config);
- void gulfstrm(machine_config &config);
- void pollux(machine_config &config);
+ void lastday(machine_config &config) ATTR_COLD;
+ void gulfstrm(machine_config &config) ATTR_COLD;
+ void pollux(machine_config &config) ATTR_COLD;
protected:
void lastday_ctrl_w(u8 data);
@@ -348,14 +348,16 @@ public:
{
}
- void rshark(machine_config &config);
- void superx(machine_config &config);
+ void rshark(machine_config &config) ATTR_COLD;
+ void superx(machine_config &config) ATTR_COLD;
protected:
u32 screen_update_rshark(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- virtual void video_start() override
+ virtual void video_start() override ATTR_COLD
{
+ dooyong_68k_state::video_start();
+
// Register for save/restore
save_item(NAME(m_bg2_priority));
}
@@ -366,7 +368,7 @@ protected:
color = 0; // use external ROM
}
- void dooyong_68k(machine_config &config);
+ void dooyong_68k(machine_config &config) ATTR_COLD;
void rshark_map(address_map &map) ATTR_COLD;
void superx_map(address_map &map) ATTR_COLD;
@@ -382,13 +384,15 @@ public:
{
}
- void popbingo(machine_config &config);
+ void popbingo(machine_config &config) ATTR_COLD;
protected:
u32 screen_update_popbingo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- virtual void video_start() override
+ virtual void video_start() override ATTR_COLD
{
+ dooyong_68k_state::video_start();
+
m_screen->register_screen_bitmap(m_bg_bitmap[0]);
m_screen->register_screen_bitmap(m_bg_bitmap[1]);
@@ -430,7 +434,7 @@ void dooyong_z80_ym2203_state::lastday_ctrl_w(u8 data)
void dooyong_z80_ym2203_state::pollux_ctrl_w(u8 data)
{
-// printf("pollux_ctrl_w %02x\n", data);
+ //logerror("pollux_ctrl_w %02x\n", data);
/* bit 0 is flip screen */
flip_screen_set(BIT(data, 0));
@@ -716,7 +720,7 @@ void dooyong_68k_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap
const bool flip = flip_screen();
int sx = spriteram[offs + 4] & 0x01ff;
- int sy = (s16)spriteram[offs + 6] & 0x01ff;
+ int sy = s16(spriteram[offs + 6]) & 0x01ff;
sy = util::sext(sy, 9); // Correctly sign-extend 9-bit number
if (flip)
{
diff --git a/src/mame/dooyong/dooyong_tilemap.cpp b/src/mame/dooyong/dooyong_tilemap.cpp
index f509711ccc9..2bc33930e02 100644
--- a/src/mame/dooyong/dooyong_tilemap.cpp
+++ b/src/mame/dooyong/dooyong_tilemap.cpp
@@ -98,7 +98,7 @@ void dooyong_rom_tilemap_device::ctrl_w(offs_t offset, u8 data)
default: // Other addresses are used but function is unknown
// 0x05 and 0x07 are initialised on startup
// 0x02 is initialised on startup by some games and written to continuously by others
- // printf("Unknown %s tilemap control: 0x%02x = 0x%02x\n", tag(), u32(offset), u32(data));
+ //logerror("%s: Unknown tilemap control: 0x%02x = 0x%02x\n", machine().describe_context(), offset, data);
break;
}
}
diff --git a/src/mame/dooyong/gundealr.cpp b/src/mame/dooyong/gundealr.cpp
index c35f294e681..cf50e153ecd 100644
--- a/src/mame/dooyong/gundealr.cpp
+++ b/src/mame/dooyong/gundealr.cpp
@@ -107,8 +107,8 @@ public:
, m_palette(*this, "palette")
{ }
- void gundealr(machine_config &config);
- void gundealrbl(machine_config &config);
+ void gundealr(machine_config &config) ATTR_COLD;
+ void gundealrbl(machine_config &config) ATTR_COLD;
protected:
virtual void machine_start() override ATTR_COLD;
diff --git a/src/mame/dynax/realbrk.h b/src/mame/dynax/realbrk.h
index dea8f4be12b..0b7e42eb531 100644
--- a/src/mame/dynax/realbrk.h
+++ b/src/mame/dynax/realbrk.h
@@ -31,10 +31,10 @@ public:
m_player_io(*this, "P%u", 1U)
{ }
- void pkgnsh(machine_config &config);
- void dai2kaku(machine_config &config);
- void realbrk(machine_config &config);
- void pkgnshdx(machine_config &config);
+ void pkgnsh(machine_config &config) ATTR_COLD;
+ void dai2kaku(machine_config &config) ATTR_COLD;
+ void realbrk(machine_config &config) ATTR_COLD;
+ void pkgnshdx(machine_config &config) ATTR_COLD;
protected:
virtual void video_start() override ATTR_COLD;
@@ -87,6 +87,7 @@ private:
template <bool Rotatable> void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, bitmap_ind8 &priority);
void vblank_irq(int state);
+
void base_mem(address_map &map) ATTR_COLD;
void dai2kaku_mem(address_map &map) ATTR_COLD;
void pkgnsh_mem(address_map &map) ATTR_COLD;
diff --git a/src/mame/konami/bishi.cpp b/src/mame/konami/bishi.cpp
index a170dca918a..2ab3380355a 100644
--- a/src/mame/konami/bishi.cpp
+++ b/src/mame/konami/bishi.cpp
@@ -244,10 +244,10 @@ void bishi_state::lamp_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
// Only 1st and 3rd player in the 2 player variant.
if (i == 1 && m_is_2players) continue;
- m_red_button_lamps[lamp_index] = (new_state >> (i * 3 + 0)) & 1;
- m_green_button_lamps[lamp_index] = (new_state >> (i * 3 + 1)) & 1;
- m_blue_button_lamps[lamp_index] = (new_state >> (i * 3 + 2)) & 1;
- m_start_button_lamps[lamp_index] = (new_state >> (i + 9)) & 1;
+ m_red_button_lamps[lamp_index] = BIT(new_state, i * 3 + 0);
+ m_green_button_lamps[lamp_index] = BIT(new_state, i * 3 + 1);
+ m_blue_button_lamps[lamp_index] = BIT(new_state, i * 3 + 2);
+ m_start_button_lamps[lamp_index] = BIT(new_state, i + 9);
lamp_index++;
}
}
diff --git a/src/mame/misc/vamphalf.cpp b/src/mame/misc/vamphalf.cpp
index 15bc8dcf936..151d75dcb49 100644
--- a/src/mame/misc/vamphalf.cpp
+++ b/src/mame/misc/vamphalf.cpp
@@ -105,61 +105,49 @@ public:
{
}
- void common(machine_config &config);
- void sound_ym_oki(machine_config &config);
- void sound_ym_banked_oki(machine_config &config);
- void sound_suplup(machine_config &config);
- void sound_qs1000(machine_config &config);
- void mrdig(machine_config &config);
- void suplup(machine_config &config);
- void vamphalf(machine_config &config);
- void boonggab(machine_config &config);
- void jmpbreak(machine_config &config);
- void newxpang(machine_config &config);
- void worldadv(machine_config &config);
- void aoh(machine_config &config);
- void coolmini(machine_config &config);
- void mrkicker(machine_config &config);
- void solitaire(machine_config &config);
-
- void init_vamphalf();
- void init_vamphalfr1();
- void init_vamphafk();
- void init_coolmini();
- void init_coolminii();
- void init_mrdig();
- void init_jmpbreak();
- void init_jmpbreaka();
- void init_poosho();
- void init_newxpang();
- void init_newxpanga();
- void init_worldadv();
- void init_dtfamily();
- void init_dquizgo2();
- void init_suplup();
- void init_luplup();
- void init_luplup29();
- void init_luplup10();
- void init_puzlbang();
- void init_toyland();
- void init_aoh();
- void init_boonggab();
- void init_mrkicker();
- void init_solitaire();
+ void sound_ym_oki(machine_config &config) ATTR_COLD;
+ void sound_ym_banked_oki(machine_config &config) ATTR_COLD;
+ void sound_suplup(machine_config &config) ATTR_COLD;
+ void sound_qs1000(machine_config &config) ATTR_COLD;
+ void mrdig(machine_config &config) ATTR_COLD;
+ void suplup(machine_config &config) ATTR_COLD;
+ void vamphalf(machine_config &config) ATTR_COLD;
+ void boonggab(machine_config &config) ATTR_COLD;
+ void jmpbreak(machine_config &config) ATTR_COLD;
+ void newxpang(machine_config &config) ATTR_COLD;
+ void worldadv(machine_config &config) ATTR_COLD;
+ void aoh(machine_config &config) ATTR_COLD;
+ void coolmini(machine_config &config) ATTR_COLD;
+ void mrkicker(machine_config &config) ATTR_COLD;
+ void solitaire(machine_config &config) ATTR_COLD;
+
+ void init_vamphalf() ATTR_COLD;
+ void init_vamphalfr1() ATTR_COLD;
+ void init_vamphafk() ATTR_COLD;
+ void init_coolmini() ATTR_COLD;
+ void init_coolminii() ATTR_COLD;
+ void init_mrdig() ATTR_COLD;
+ void init_jmpbreak() ATTR_COLD;
+ void init_jmpbreaka() ATTR_COLD;
+ void init_poosho() ATTR_COLD;
+ void init_newxpang() ATTR_COLD;
+ void init_newxpanga() ATTR_COLD;
+ void init_worldadv() ATTR_COLD;
+ void init_dtfamily() ATTR_COLD;
+ void init_dquizgo2() ATTR_COLD;
+ void init_suplup() ATTR_COLD;
+ void init_luplup() ATTR_COLD;
+ void init_luplup29() ATTR_COLD;
+ void init_luplup10() ATTR_COLD;
+ void init_puzlbang() ATTR_COLD;
+ void init_toyland() ATTR_COLD;
+ void init_aoh() ATTR_COLD;
+ void init_boonggab() ATTR_COLD;
+ void init_mrkicker() ATTR_COLD;
+ void init_solitaire() ATTR_COLD;
ioport_value boonggab_photo_sensors_r();
- u16 eeprom_r();
- void eeprom_w(u16 data);
- void flipscreen_w(u16 data);
- u16 vram_r(offs_t offset) { return m_tiles[offset]; }
- void vram_w(offs_t offset, u16 data, u16 mem_mask = ~0) { COMBINE_DATA(&m_tiles[offset]); }
-
- void banked_oki(int chip);
-
- void common_map(address_map &map) ATTR_COLD;
- void common_32bit_map(address_map &map) ATTR_COLD;
-
static constexpr u16 HTOTAL = 448;
static constexpr u16 HBEND = 31;
static constexpr u16 HBSTART = 351;
@@ -170,6 +158,19 @@ public:
protected:
virtual void video_start() override ATTR_COLD;
+ void common(machine_config &config) ATTR_COLD;
+
+ void banked_oki(int chip) ATTR_COLD;
+
+ u16 eeprom_r();
+ void eeprom_w(u16 data);
+ void flipscreen_w(u16 data);
+ u16 vram_r(offs_t offset) { return m_tiles[offset]; }
+ void vram_w(offs_t offset, u16 data, u16 mem_mask = ~0) { COMBINE_DATA(&m_tiles[offset]); }
+
+ void common_map(address_map &map) ATTR_COLD;
+ void common_32bit_map(address_map &map) ATTR_COLD;
+
required_device<cpu_device> m_maincpu;
required_device<palette_device> m_palette;
optional_device<generic_latch_8_device> m_soundlatch;
@@ -249,13 +250,13 @@ public:
{
}
- void misncrft(machine_config &config);
- void wyvernwg(machine_config &config);
- void yorijori(machine_config &config);
+ void misncrft(machine_config &config) ATTR_COLD;
+ void wyvernwg(machine_config &config) ATTR_COLD;
+ void yorijori(machine_config &config) ATTR_COLD;
- void init_misncrft();
- void init_wyvernwg();
- void init_yorijori();
+ void init_misncrft() ATTR_COLD;
+ void init_wyvernwg() ATTR_COLD;
+ void init_yorijori() ATTR_COLD;
private:
required_device<i8052_device> m_qdsp_cpu;
@@ -280,11 +281,11 @@ public:
{
}
- void finalgdr(machine_config &config);
- void mrkickera(machine_config &config);
+ void finalgdr(machine_config &config) ATTR_COLD;
+ void mrkickera(machine_config &config) ATTR_COLD;
- void init_mrkickera();
- void init_finalgdr();
+ void init_mrkickera() ATTR_COLD;
+ void init_finalgdr() ATTR_COLD;
private:
required_device<nvram_device> m_nvram;
@@ -487,7 +488,7 @@ void vamphalf_state::common_32bit_map(address_map &map)
void vamphalf_qdsp_state::yorijori_32bit_map(address_map &map)
{
map(0x00000000, 0x001fffff).ram().share(m_wram32);
- map(0x40000000, 0x4003ffff).rw(FUNC(vamphalf_state::vram_r), FUNC(vamphalf_state::vram_w));
+ map(0x40000000, 0x4003ffff).rw(FUNC(vamphalf_qdsp_state::vram_r), FUNC(vamphalf_qdsp_state::vram_w));
map(0x80000000, 0x8000ffff).ram().w(m_palette, FUNC(palette_device::write32)).share("palette");
map(0xffe00000, 0xffffffff).rom().region("maincpu", 0);
}
@@ -497,21 +498,21 @@ void vamphalf_state::vamphalf_io(address_map &map)
map(0x030, 0x030).umask16(0x00ff).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
map(0x050, 0x050).umask16(0x00ff).w("ymsnd", FUNC(ym2151_device::address_w));
map(0x051, 0x051).umask16(0x00ff).rw("ymsnd", FUNC(ym2151_device::status_r), FUNC(ym2151_device::data_w));
- map(0x070, 0x070).r(FUNC(vamphalf_state::eeprom_r));
- map(0x090, 0x090).w(FUNC(vamphalf_state::flipscreen_w));
+ map(0x070, 0x070).r(FUNC(vamphalf_qdsp_state::eeprom_r));
+ map(0x090, 0x090).w(FUNC(vamphalf_qdsp_state::flipscreen_w));
map(0x180, 0x180).portr("SYSTEM");
map(0x181, 0x181).portr("P1_P2");
- map(0x182, 0x182).w(FUNC(vamphalf_state::eeprom_w));
+ map(0x182, 0x182).w(FUNC(vamphalf_qdsp_state::eeprom_w));
}
void vamphalf_qdsp_state::misncrft_io(address_map &map)
{
- map(0x040, 0x040).w(FUNC(vamphalf_state::flipscreen_w));
+ map(0x040, 0x040).w(FUNC(vamphalf_qdsp_state::flipscreen_w));
map(0x080, 0x080).portr("P1_P2");
map(0x090, 0x090).portr("SYSTEM");
- map(0x0f0, 0x0f0).w(FUNC(vamphalf_state::eeprom_w));
+ map(0x0f0, 0x0f0).w(FUNC(vamphalf_qdsp_state::eeprom_w));
map(0x100, 0x100).umask16(0x00ff).w(m_soundlatch, FUNC(generic_latch_8_device::write));
- map(0x160, 0x161).r(FUNC(vamphalf_state::eeprom_r));
+ map(0x160, 0x161).r(FUNC(vamphalf_qdsp_state::eeprom_r));
}
void vamphalf_state::coolmini_io(address_map &map)
@@ -547,12 +548,12 @@ void vamphalf_state::suplup_io(address_map &map)
void vamphalf_qdsp_state::wyvernwg_io(address_map &map)
{
map(0x0600, 0x0600).rw(FUNC(vamphalf_qdsp_state::prot_r<0x0001>), FUNC(vamphalf_qdsp_state::wyvernwg_prot_w));
- map(0x0800, 0x0800).umask32(0x0000ffff).w(FUNC(vamphalf_state::flipscreen_w));
+ map(0x0800, 0x0800).umask32(0x0000ffff).w(FUNC(vamphalf_qdsp_state::flipscreen_w));
map(0x0a00, 0x0a00).portr("P1_P2");
map(0x0c00, 0x0c00).portr("SYSTEM");
map(0x1500, 0x1500).umask32(0x000000ff).w(m_soundlatch, FUNC(generic_latch_8_device::write));
- map(0x1c00, 0x1c00).umask32(0x0000ffff).w(FUNC(vamphalf_state::eeprom_w));
- map(0x1f00, 0x1f00).umask32(0x0000ffff).r(FUNC(vamphalf_state::eeprom_r));
+ map(0x1c00, 0x1c00).umask32(0x0000ffff).w(FUNC(vamphalf_qdsp_state::eeprom_w));
+ map(0x1f00, 0x1f00).umask32(0x0000ffff).r(FUNC(vamphalf_qdsp_state::eeprom_r));
}
void vamphalf_nvram_state::finalgdr_io(address_map &map)
@@ -564,7 +565,7 @@ void vamphalf_nvram_state::finalgdr_io(address_map &map)
map(0x0d00, 0x0d00).umask32(0x0000ff00).rw("oki1", FUNC(okim6295_device::read), FUNC(okim6295_device::write));
map(0x0e00, 0x0e00).portr("P1_P2");
map(0x0f00, 0x0f00).portr("SYSTEM");
- map(0x1100, 0x1100).umask32(0x0000ffff).r(FUNC(vamphalf_state::eeprom_r));
+ map(0x1100, 0x1100).umask32(0x0000ffff).r(FUNC(vamphalf_nvram_state::eeprom_r));
map(0x1800, 0x1800).nopr(); //?
map(0x1800, 0x1800).w(FUNC(vamphalf_nvram_state::finalgdr_eeprom_w));
map(0x1810, 0x1810).w(FUNC(vamphalf_nvram_state::finalgdr_prot_w));
@@ -575,7 +576,7 @@ void vamphalf_nvram_state::finalgdr_io(address_map &map)
void vamphalf_nvram_state::mrkickera_io(address_map &map)
{
- map(0x0900, 0x0900).umask32(0x0000ffff).r(FUNC(vamphalf_state::eeprom_r));
+ map(0x0900, 0x0900).umask32(0x0000ffff).r(FUNC(vamphalf_nvram_state::eeprom_r));
map(0x1000, 0x1000).nopr(); //?
map(0x1000, 0x1000).w(FUNC(vamphalf_nvram_state::finalgdr_eeprom_w));
map(0x1010, 0x1010).w(FUNC(vamphalf_nvram_state::finalgdr_prot_w));
@@ -676,7 +677,7 @@ void vamphalf_qdsp_state::yorijori_io(address_map &map)
map(0x0d00, 0x0d00).portr("P1_P2");
map(0x0e00, 0x0e00).umask32(0x0000ff00).w(m_soundlatch, FUNC(generic_latch_8_device::write));
map(0x0f00, 0x0f00).portr("SYSTEM");
- map(0x1100, 0x1100).umask32(0x0000ffff).r(FUNC(vamphalf_state::eeprom_r));
+ map(0x1100, 0x1100).umask32(0x0000ffff).r(FUNC(vamphalf_qdsp_state::eeprom_r));
map(0x1800, 0x1800).nopr(); //?
map(0x1800, 0x1800).w(FUNC(vamphalf_qdsp_state::yorijori_eeprom_w));
map(0x1810, 0x1810).w(FUNC(vamphalf_qdsp_state::finalgdr_prot_w));
diff --git a/src/mame/playmark/playmark.cpp b/src/mame/playmark/playmark.cpp
index e83d2783c46..fb8e9a4465c 100644
--- a/src/mame/playmark/playmark.cpp
+++ b/src/mame/playmark/playmark.cpp
@@ -142,6 +142,7 @@ void playmark_state::luckboomh_dispenser_w(u8 data)
{
// if (data & 0x87) logerror("%s: Writing unknown bits %02x to the Coin/EEPROM port\n", machine().describe_context(), data);
+ // FIXME: this can't be right - checking all the bits, including the counter and ticket motor outputs, makes no sense
if (data)
{
if (!BIT(m_dispenser_latch, 7))
@@ -1035,6 +1036,7 @@ void playmark_base_state::configure_oki_banks()
u8 *rgn = memregion("oki")->base();
m_oki_numbanks = len / 0x20000;
+ assert(!(m_oki_numbanks & (m_oki_numbanks - 1))); // uses (m_oki_numbanks - 1) as a mask
m_okibank->configure_entries(0, m_oki_numbanks, rgn, 0x20000);
m_okibank->set_entry(1);
@@ -1776,7 +1778,7 @@ ROM_START( hotmind ) // PCB marked Hard Times 28-06-94
ROM_REGION( 0x3000, "pic_hex", 0 )
ROM_LOAD( "hotmind_pic16c57-hs_io15.hex", 0x0000, 0x2d4c, BAD_DUMP CRC(f3300d13) SHA1(78892453c7374ea3d1606cdb81197cc466e2a8c5) ) // protected, contains upper nibble?
- ROM_LOAD( "hotmind_pic16c57.hex", 0x0000, 0x2d4c, BAD_DUMP CRC(11957803) SHA1(c2f87659819bfcf3a5b43fbccf81988c43b9c9c8) ) // Using modified Excelsior PIC code to make it suite this game
+ ROM_LOAD( "hotmind_pic16c57.hex", 0x0000, 0x2d4c, BAD_DUMP CRC(11957803) SHA1(c2f87659819bfcf3a5b43fbccf81988c43b9c9c8) ) // Using modified Excelsior PIC code to make it suit this game
ROM_REGION( 0x080000, "tiles", 0 )
ROM_LOAD16_BYTE( "23.u36", 0x000000, 0x10000, CRC(ddcf60b9) SHA1(0c0fbc44131cb7d36c21bf5aead87b498c5684f5) )
@@ -1816,7 +1818,7 @@ ROM_START( hotmindc ) // PCB marked Hard Times 28-06-94
ROM_REGION( 0x3000, "pic_hex", 0 )
ROM_LOAD( "hotmind_pic16c57-hs_io15.hex", 0x0000, 0x2d4c, BAD_DUMP CRC(f3300d13) SHA1(78892453c7374ea3d1606cdb81197cc466e2a8c5) ) // protected, contains upper nibble?
- ROM_LOAD( "hotmind_pic16c57.hex", 0x0000, 0x2d4c, BAD_DUMP CRC(11957803) SHA1(c2f87659819bfcf3a5b43fbccf81988c43b9c9c8) ) // Using modified Excelsior PIC code to make it suite this game
+ ROM_LOAD( "hotmind_pic16c57.hex", 0x0000, 0x2d4c, BAD_DUMP CRC(11957803) SHA1(c2f87659819bfcf3a5b43fbccf81988c43b9c9c8) ) // Using modified Excelsior PIC code to make it suit this game
ROM_REGION( 0x080000, "tiles", 0 )
ROM_LOAD16_BYTE( "23.u36", 0x000000, 0x10000, CRC(ddcf60b9) SHA1(0c0fbc44131cb7d36c21bf5aead87b498c5684f5) )
@@ -1856,7 +1858,7 @@ ROM_START( luckboomh )
ROM_LOAD( "luckyboom_pic16c57-hs_io15.bin", 0x00000, 0x2000, BAD_DUMP CRC(c4b9c78e) SHA1(e85766383b22a62f19bf272d86d53c7fb1eb5ac4) ) // protected, contains upper nibble?
ROM_REGION( 0x3000, "pic_hex", 0 )
- ROM_LOAD( "luckyboom_pic16c57.hex", 0x0000, 0x2d4c, BAD_DUMP CRC(5c4b5c39) SHA1(d24a097bb4a134406dd95d3ad5ed912f81a6a849) ) // Using modified Excelsior PIC code to make it suite this game
+ ROM_LOAD( "luckyboom_pic16c57.hex", 0x0000, 0x2d4c, BAD_DUMP CRC(5c4b5c39) SHA1(d24a097bb4a134406dd95d3ad5ed912f81a6a849) ) // Using modified Excelsior PIC code to make it suit this game
ROM_REGION( 0x080000, "tiles", 0 )
ROM_LOAD16_BYTE( "23.u36", 0x000000, 0x10000, CRC(71840dd9) SHA1(9d0a75555dedb6fd28bb7c04b863f3ef5a1f8aac) )
diff --git a/src/mame/playmark/playmark.h b/src/mame/playmark/playmark.h
index 34cb2be75c9..b30fc38fb25 100644
--- a/src/mame/playmark/playmark.h
+++ b/src/mame/playmark/playmark.h
@@ -34,7 +34,7 @@ protected:
m_oki_numbanks(0)
{ }
- void configure_oki_banks();
+ void configure_oki_banks() ATTR_COLD;
// devices
required_device<okim6295_device> m_oki;
@@ -80,12 +80,12 @@ public:
m_dispenser_latch(0)
{ }
- void hrdtimes(machine_config &config);
- void luckboomh(machine_config &config);
- void hotmind(machine_config &config);
- void bigtwinb(machine_config &config);
+ void hrdtimes(machine_config &config) ATTR_COLD;
+ void luckboomh(machine_config &config) ATTR_COLD;
+ void hotmind(machine_config &config) ATTR_COLD;
+ void bigtwinb(machine_config &config) ATTR_COLD;
- void init_pic_decode();
+ void init_pic_decode() ATTR_COLD;
protected:
virtual void machine_start() override ATTR_COLD;
@@ -166,8 +166,8 @@ public:
m_bg_full_size(false)
{ }
- void bigtwin(machine_config &config);
- void excelsr(machine_config &config);
+ void bigtwin(machine_config &config) ATTR_COLD;
+ void excelsr(machine_config &config) ATTR_COLD;
protected:
virtual void machine_reset() override ATTR_COLD;
@@ -207,7 +207,7 @@ public:
m_fg_rowscroll_enable(false)
{ }
- void wbeachvl_pic(machine_config &config);
+ void wbeachvl_pic(machine_config &config) ATTR_COLD;
protected:
virtual void machine_reset() override ATTR_COLD;
@@ -229,7 +229,7 @@ protected:
void wbeachvl_main_map(address_map &map) ATTR_COLD;
- void wbeachvl_base(machine_config &config);
+ void wbeachvl_base(machine_config &config) ATTR_COLD;
};
// uses MCS-51 MCU for audio
@@ -241,7 +241,7 @@ public:
m_audio_mcs(*this, "audiomcs")
{ }
- void wbeachvl_mcs(machine_config &config);
+ void wbeachvl_mcs(machine_config &config) ATTR_COLD;
private:
// devices
diff --git a/src/mame/playmark/powerbal.cpp b/src/mame/playmark/powerbal.cpp
index 009c985c10e..5b1a14f3b07 100644
--- a/src/mame/playmark/powerbal.cpp
+++ b/src/mame/playmark/powerbal.cpp
@@ -35,9 +35,9 @@ public:
, m_bg_yoffset(0)
{ }
- void init_powerbal();
+ void init_powerbal() ATTR_COLD;
- void powerbal(machine_config &config);
+ void powerbal(machine_config &config) ATTR_COLD;
protected:
virtual void machine_start() override ATTR_COLD;
@@ -68,7 +68,7 @@ public:
: powerbal_state(mconfig, type, tag)
{ }
- void atombjt(machine_config &config);
+ void atombjt(machine_config &config) ATTR_COLD;
protected:
virtual void video_start() override ATTR_COLD;
@@ -89,9 +89,9 @@ public:
, m_token(*this, "token")
{ }
- void init_magicstk();
+ void init_magicstk() ATTR_COLD;
- void magicstk(machine_config &config);
+ void magicstk(machine_config &config) ATTR_COLD;
private:
required_device<eeprom_serial_93cxx_device> m_eeprom;
diff --git a/src/mame/playmark/sderby.cpp b/src/mame/playmark/sderby.cpp
index 47ac84623bd..45ce35ae589 100644
--- a/src/mame/playmark/sderby.cpp
+++ b/src/mame/playmark/sderby.cpp
@@ -111,12 +111,12 @@ public:
{ }
- void luckboom(machine_config &config);
- void pmroulet(machine_config &config);
- void sderby(machine_config &config);
- void sderbya(machine_config &config);
- void shinygld(machine_config &config);
- void spacewin(machine_config &config);
+ void luckboom(machine_config &config) ATTR_COLD;
+ void pmroulet(machine_config &config) ATTR_COLD;
+ void sderby(machine_config &config) ATTR_COLD;
+ void sderbya(machine_config &config) ATTR_COLD;
+ void shinygld(machine_config &config) ATTR_COLD;
+ void spacewin(machine_config &config) ATTR_COLD;
protected:
virtual void machine_start() override { m_lamps.resolve(); }
@@ -160,6 +160,7 @@ protected:
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
uint32_t screen_update_pmroulet(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
+
void luckboom_map(address_map &map) ATTR_COLD;
void roulette_map(address_map &map) ATTR_COLD;
void sderby_map(address_map &map) ATTR_COLD;
@@ -173,7 +174,7 @@ class zw3_state : public sderby_state
public:
using sderby_state::sderby_state;
- void zw3(machine_config &config);
+ void zw3(machine_config &config) ATTR_COLD;
protected:
virtual void video_start() override ATTR_COLD;