diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index fc095e3d31d..416084375a1 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -171,7 +171,6 @@ end links { "dasm", - "emu", "utils", "expat", "7z", @@ -207,6 +206,7 @@ includedirs { files { MAME_DIR .. "src/tools/unidasm.c", + MAME_DIR .. "src/emu/emucore.c", } diff --git a/src/devices/cpu/tms9900/9900dasm.c b/src/devices/cpu/tms9900/9900dasm.c index cd3a67ee95a..5daf4a88310 100644 --- a/src/devices/cpu/tms9900/9900dasm.c +++ b/src/devices/cpu/tms9900/9900dasm.c @@ -347,7 +347,7 @@ static int print_arg (char *dest, int mode, int arg, const UINT8 *opram, unsigne /***************************************************************************** * Disassemble a single command and return the number of bytes it uses. *****************************************************************************/ -unsigned Dasm9900 (char *buffer, unsigned pc, int model_id, const UINT8 *oprom, const UINT8 *opram, device_t *device) +unsigned Dasm9900 (char *buffer, unsigned pc, int model_id, const UINT8 *oprom, const UINT8 *opram) { int OP, OP2, opc; int sarg, darg, smode, dmode; @@ -787,7 +787,7 @@ unsigned Dasm9900 (char *buffer, unsigned pc, int model_id, const UINT8 *oprom, } default: - device->logerror("debbugger internal error, file %s, line %d\n", __FILE__, __LINE__); + osd_printf_error("debbugger internal error, file %s, line %d\n", __FILE__, __LINE__); case illegal: sprintf (buffer, "data >%04x", OP); break; @@ -798,15 +798,15 @@ unsigned Dasm9900 (char *buffer, unsigned pc, int model_id, const UINT8 *oprom, CPU_DISASSEMBLE( tms9900 ) { - return Dasm9900(buffer, pc, TMS9900_ID, oprom, opram, device); + return Dasm9900(buffer, pc, TMS9900_ID, oprom, opram); } CPU_DISASSEMBLE( tms9980 ) { - return Dasm9900(buffer, pc, TMS9980_ID, oprom, opram, device); + return Dasm9900(buffer, pc, TMS9980_ID, oprom, opram); } CPU_DISASSEMBLE( tms9995 ) { - return Dasm9900(buffer, pc, TMS9995_ID, oprom, opram, device); + return Dasm9900(buffer, pc, TMS9995_ID, oprom, opram); } diff --git a/src/tools/unidasm.c b/src/tools/unidasm.c index dfd185b1cb3..7a245886d6a 100644 --- a/src/tools/unidasm.c +++ b/src/tools/unidasm.c @@ -355,17 +355,6 @@ static const dasm_table_entry dasm_table[] = // { "z8000", _16be, 0, CPU_DISASSEMBLE_NAME(z8000) }, }; -void CLIB_DECL ATTR_PRINTF(1,2) logerror(const char *format, ...) -{ - /* silent logerrors are allowed in disassemblers */ -} - - -void CLIB_DECL ATTR_PRINTF(1,2) osd_printf_debug(const char *format, ...) -{ - /* silent osd_printf_debugs are allowed in disassemblers */ -} - static int parse_options(int argc, char *argv[], options *opts) {