From 676af856960da8317943f18ba685fccea2cf41c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Banaan=20Ananas?= Date: Mon, 23 Jun 2014 09:52:53 +0000 Subject: [PATCH] forgot to resolve callback --- src/emu/cpu/lr35902/lr35902.c | 3 +++ src/emu/cpu/lr35902/opc_main.inc | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/emu/cpu/lr35902/lr35902.c index 2fea7e7b163..2583e69776b 100644 --- a/src/emu/cpu/lr35902/lr35902.c +++ b/src/emu/cpu/lr35902/lr35902.c @@ -130,8 +130,11 @@ void lr35902_cpu_device::device_start() m_device = this; m_program = &space(AS_PROGRAM); + // resolve callbacks m_timer_func.resolve_safe(); + m_incdec16_func.resolve_safe(); + // register for save states save_item(NAME(m_A)); save_item(NAME(m_F)); save_item(NAME(m_B)); diff --git a/src/emu/cpu/lr35902/opc_main.inc b/src/emu/cpu/lr35902/opc_main.inc index dda008559bd..524f6ffc82d 100644 --- a/src/emu/cpu/lr35902/opc_main.inc +++ b/src/emu/cpu/lr35902/opc_main.inc @@ -24,16 +24,14 @@ { \ register UINT16 r = x << 8 | y; \ if (++y == 0) x++; \ - if (!m_incdec16_func.isnull()) \ - m_incdec16_func(r << 16 | x << 8 | y); \ + m_incdec16_func(r << 16 | x << 8 | y); \ } #define DEC_16BIT(x,y) \ { \ register UINT16 r = x << 8 | y; \ if (--y == 0xff) x--; \ - if (!m_incdec16_func.isnull()) \ - m_incdec16_func(r << 16 | x << 8 | y); \ + m_incdec16_func(r << 16 | x << 8 | y); \ } #define ADD_HL_RR(x) \