From 8eb3f42f0a79fc7c63808d235b98c51cc400182a Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 23 Aug 2013 12:10:50 +0000 Subject: [PATCH] added missing short names to legacy devices and added validation that short name is always mandatory (nw) --- src/emu/cpu/dsp56k/dsp56k.c | 1 + src/emu/cpu/g65816/g65816.c | 2 ++ src/emu/cpu/h83002/h8_16.c | 8 +++++ src/emu/cpu/h83002/h8_8.c | 1 + src/emu/cpu/i386/i386.c | 9 +++++ src/emu/cpu/mc68hc11/mc68hc11.c | 1 + src/emu/cpu/mcs48/mcs48.c | 56 +++++++++++++++++-------------- src/emu/cpu/mcs51/mcs51.c | 14 ++++++++ src/emu/cpu/mips/mips3.c | 16 +++++++++ src/emu/cpu/mips/mips3drc.c | 19 +++++++++-- src/emu/cpu/mn10200/mn10200.c | 1 + src/emu/cpu/nec/nec.c | 3 ++ src/emu/cpu/nec/v25.c | 4 ++- src/emu/cpu/pdp1/pdp1.c | 1 + src/emu/cpu/pdp1/tx0.c | 2 ++ src/emu/cpu/pic16c5x/pic16c5x.c | 6 ++++ src/emu/cpu/pic16c62x/pic16c62x.c | 7 ++++ src/emu/cpu/powerpc/ppc.c | 8 +++++ src/emu/cpu/powerpc/ppccom.c | 1 + src/emu/cpu/powerpc/ppcdrc.c | 10 ++++++ src/emu/cpu/pps4/pps4.c | 1 + src/emu/cpu/rsp/rsp.c | 1 + src/emu/cpu/rsp/rspdrc.c | 1 + src/emu/cpu/s2650/s2650.c | 1 + src/emu/cpu/saturn/saturn.c | 1 + src/emu/cpu/sc61860/sc61860.c | 1 + src/emu/cpu/scmp/scmp.c | 2 ++ src/emu/cpu/se3208/se3208.c | 1 + src/emu/cpu/sh2/sh2.c | 2 ++ src/emu/cpu/sh2/sh2drc.c | 2 ++ src/emu/cpu/sh4/sh4.c | 1 + src/emu/cpu/sharc/sharc.c | 1 + src/emu/cpu/spc700/spc700.c | 1 + src/emu/cpu/ssp1601/ssp1601.c | 1 + src/emu/cpu/superfx/superfx.c | 1 + src/emu/cpu/t11/t11.c | 1 + src/emu/cpu/tlcs90/tlcs90.c | 4 +++ src/emu/cpu/tlcs900/tlcs900.c | 2 ++ src/emu/cpu/tms32010/tms32010.c | 3 ++ src/emu/cpu/tms32025/tms32025.c | 1 + src/emu/cpu/tms32051/tms32051.c | 1 + src/emu/cpu/tms34010/tms34010.c | 2 ++ src/emu/cpu/tms7000/tms7000.c | 1 + src/emu/cpu/tms9900/99xxcore.h | 12 +++++++ src/emu/cpu/unsp/unsp.c | 1 + src/emu/cpu/upd7810/upd7810.c | 5 +++ src/emu/cpu/v60/v60.c | 2 ++ src/emu/cpu/v810/v810.c | 1 + src/emu/cpu/z180/z180.c | 1 + src/emu/cpu/z8/z8.c | 4 +++ src/emu/cpu/z80/z80.c | 2 ++ src/emu/cpu/z8000/z8000.c | 2 ++ src/emu/devcpu.c | 3 +- src/emu/validity.c | 10 ++++-- 54 files changed, 213 insertions(+), 33 deletions(-) diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c index 45ac6e01c91..90dde0b6b7a 100644 --- a/src/emu/cpu/dsp56k/dsp56k.c +++ b/src/emu/cpu/dsp56k/dsp56k.c @@ -598,6 +598,7 @@ CPU_GET_INFO( dsp56k ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "DSP56156"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "dsp56156"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Motorola DSP56156"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "0.1"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c index 47cfad6ae15..503e1a5421c 100644 --- a/src/emu/cpu/g65816/g65816.c +++ b/src/emu/cpu/g65816/g65816.c @@ -489,6 +489,7 @@ CPU_GET_INFO( g65816 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "G65C816"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "g65c816"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "6500"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -715,6 +716,7 @@ CPU_GET_INFO( _5a22 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "5A22"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "5a22"); break; case CPUINFO_INT_REGISTER + _5A22_FASTROM: info->i = g65816_get_reg(cpustate, _5A22_FASTROM); break; case CPUINFO_STR_REGISTER + _5A22_FASTROM: sprintf(info->s, "fastROM:%d", cpustate->fastROM & 1 ? 1 : 0); break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(_5a22_map); break; diff --git a/src/emu/cpu/h83002/h8_16.c b/src/emu/cpu/h83002/h8_16.c index 2fd556d9582..2f44f266dea 100644 --- a/src/emu/cpu/h83002/h8_16.c +++ b/src/emu/cpu/h83002/h8_16.c @@ -908,6 +908,7 @@ CPU_GET_INFO( h8_3002 ) // CPU misc parameters case CPUINFO_STR_NAME: strcpy(info->s, "H8/3002"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "h8_3002"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; case CPUINFO_STR_FLAGS: strcpy(info->s, h8_get_ccr_str(h8)); break; case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; @@ -956,6 +957,7 @@ CPU_GET_INFO( h8_3044 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(h8_3044_internal_map); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(h8_24); break; case CPUINFO_STR_NAME: strcpy(info->s, "H8/3044"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "h8_3044"); break; default: CPU_GET_INFO_CALL(h8_3002); } @@ -968,6 +970,7 @@ CPU_GET_INFO( h8_3007 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(h8_3007_internal_map); break; case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(h8_3007); break; case CPUINFO_STR_NAME: strcpy(info->s, "H8/3007"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "h8_3007"); break; default: CPU_GET_INFO_CALL(h8_3002); } @@ -981,6 +984,7 @@ CPU_GET_INFO( h8s_2241 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(h8s_2xxx); break; case CPUINFO_FCT_RESET: info->reset= CPU_RESET_NAME(h8s_2xxx); break; case CPUINFO_STR_NAME: strcpy(info->s, "H8S/2241"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "h8s_2241"); break; default: CPU_GET_INFO_CALL(h8_3002); } @@ -994,6 +998,7 @@ CPU_GET_INFO( h8s_2246 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(h8s_2xxx); break; case CPUINFO_FCT_RESET: info->reset= CPU_RESET_NAME(h8s_2xxx); break; case CPUINFO_STR_NAME: strcpy(info->s, "H8S/2246"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "h8s_2246"); break; default: CPU_GET_INFO_CALL(h8_3002); } @@ -1007,6 +1012,7 @@ CPU_GET_INFO( h8s_2323 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(h8s_2xxx); break; case CPUINFO_FCT_RESET: info->reset= CPU_RESET_NAME(h8s_2xxx); break; case CPUINFO_STR_NAME: strcpy(info->s, "H8S/2323"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "h8s_2323"); break; default: CPU_GET_INFO_CALL(h8_3002); } @@ -1021,6 +1027,7 @@ CPU_GET_INFO( h8s_2394 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(h8s_2xxx); break; case CPUINFO_FCT_RESET: info->reset= CPU_RESET_NAME(h8s_2394); break; case CPUINFO_STR_NAME: strcpy(info->s, "H8S/2394"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "h8s_2394"); break; default: CPU_GET_INFO_CALL(h8_3002); } @@ -1035,6 +1042,7 @@ CPU_GET_INFO( h8s_2655 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(h8s_2xxx); break; case CPUINFO_FCT_RESET: info->reset= CPU_RESET_NAME(h8s_2xxx); break; case CPUINFO_STR_NAME: strcpy(info->s, "H8S/2655"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "h8s_2655"); break; default: CPU_GET_INFO_CALL(h8_3002); } diff --git a/src/emu/cpu/h83002/h8_8.c b/src/emu/cpu/h83002/h8_8.c index 7d6da1fd4a7..a2639ca0a37 100644 --- a/src/emu/cpu/h83002/h8_8.c +++ b/src/emu/cpu/h83002/h8_8.c @@ -785,6 +785,7 @@ CPU_GET_INFO( h8_3334 ) // CPU misc parameters case CPUINFO_STR_NAME: strcpy(info->s, "H8/3334"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "h8_3334"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; case CPUINFO_STR_FLAGS: strcpy(info->s, h8_get_ccr_str(h8)); break; case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c index ccde979942d..11e8fb1d2c5 100644 --- a/src/emu/cpu/i386/i386.c +++ b/src/emu/cpu/i386/i386.c @@ -3645,6 +3645,7 @@ CPU_GET_INFO( i386 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "I386"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i386"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Intel 386"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -3844,6 +3845,7 @@ CPU_GET_INFO( i486 ) case CPUINFO_INT_REGISTER + X87_TAG: info->i = cpustate->x87_tw; break; case CPUINFO_STR_NAME: strcpy(info->s, "I486"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i486"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Intel 486"); break; case CPUINFO_STR_REGISTER + X87_CTRL: sprintf(info->s, "x87_CW: %04X", cpustate->x87_cw); break; case CPUINFO_STR_REGISTER + X87_STATUS: sprintf(info->s, "x87_SW: %04X", cpustate->x87_sw); break; @@ -3981,6 +3983,7 @@ CPU_GET_INFO( pentium ) case CPUINFO_INT_REGISTER + X87_TAG: info->i = cpustate->x87_tw; break; case CPUINFO_STR_NAME: strcpy(info->s, "PENTIUM"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pentium"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Intel Pentium"); break; case CPUINFO_STR_REGISTER + X87_CTRL: sprintf(info->s, "x87_CW: %04X", cpustate->x87_cw); break; case CPUINFO_STR_REGISTER + X87_STATUS: sprintf(info->s, "x87_SW: %04X", cpustate->x87_sw); break; @@ -4105,6 +4108,7 @@ CPU_GET_INFO( mediagx ) case CPUINFO_INT_REGISTER + X87_TAG: info->i = cpustate->x87_tw; break; case CPUINFO_STR_NAME: strcpy(info->s, "MEDIAGX"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "mediagx"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Cyrix MediaGX"); break; case CPUINFO_STR_REGISTER + X87_CTRL: sprintf(info->s, "x87_CW: %04X", cpustate->x87_cw); break; case CPUINFO_STR_REGISTER + X87_STATUS: sprintf(info->s, "x87_SW: %04X", cpustate->x87_sw); break; @@ -4221,6 +4225,7 @@ CPU_GET_INFO( pentium_pro ) case CPUINFO_FCT_EXIT: info->exit = CPU_EXIT_NAME(pentium_pro); break; case CPUINFO_STR_NAME: strcpy(info->s, "Pentium Pro"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pentium_pro"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Intel Pentium Pro"); break; default: CPU_GET_INFO_CALL(pentium); break; @@ -4326,6 +4331,7 @@ CPU_GET_INFO( pentium_mmx ) case CPUINFO_FCT_EXIT: info->exit = CPU_EXIT_NAME(pentium_mmx); break; case CPUINFO_STR_NAME: strcpy(info->s, "Pentium MMX"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pentium_mmx"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Intel Pentium"); break; default: CPU_GET_INFO_CALL(pentium); break; @@ -4431,6 +4437,7 @@ CPU_GET_INFO( pentium2 ) case CPUINFO_FCT_EXIT: info->exit = CPU_EXIT_NAME(pentium2); break; case CPUINFO_STR_NAME: strcpy(info->s, "Pentium II"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pentium2"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Intel Pentium II"); break; default: CPU_GET_INFO_CALL(pentium); break; @@ -4538,6 +4545,7 @@ CPU_GET_INFO( pentium3 ) case CPUINFO_FCT_EXIT: info->exit = CPU_EXIT_NAME(pentium3); break; case CPUINFO_STR_NAME: strcpy(info->s, "Pentium III"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pentium3"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Intel Pentium III"); break; default: CPU_GET_INFO_CALL(pentium); break; @@ -4646,6 +4654,7 @@ CPU_GET_INFO( pentium4 ) case CPUINFO_FCT_EXIT: info->exit = CPU_EXIT_NAME(pentium4); break; case CPUINFO_STR_NAME: strcpy(info->s, "Pentium 4"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pentium4"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Intel Pentium 4"); break; default: CPU_GET_INFO_CALL(pentium); break; diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c index 9e73eb79b42..f96cae94e04 100644 --- a/src/emu/cpu/mc68hc11/mc68hc11.c +++ b/src/emu/cpu/mc68hc11/mc68hc11.c @@ -692,6 +692,7 @@ CPU_GET_INFO( mc68hc11 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "MC68HC11"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "mc68hc11"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Motorola MC68HC11"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c index f64adefb16e..9df18d0afd5 100644 --- a/src/emu/cpu/mcs48/mcs48.c +++ b/src/emu/cpu/mcs48/mcs48.c @@ -1416,7 +1416,7 @@ static CPU_GET_INFO( mcs48 ) CPU-SPECIFIC CONTEXT ACCESS ***************************************************************************/ -static void mcs48_generic_get_info(legacy_cpu_device *device, UINT32 state, cpuinfo *info, UINT8 features, int romsize, int ramsize, int cycle_states, const char *name) +static void mcs48_generic_get_info(legacy_cpu_device *device, UINT32 state, cpuinfo *info, UINT8 features, int romsize, int ramsize, int cycle_states, const char *name, const char *shortname) { switch (state) { @@ -1487,6 +1487,10 @@ static void mcs48_generic_get_info(legacy_cpu_device *device, UINT32 state, cpui strcpy(info->s, name); break; + case CPUINFO_STR_SHORTNAME: + strcpy(info->s, shortname); + break; + /* default case */ default: CPU_GET_INFO_CALL(mcs48); @@ -1496,31 +1500,31 @@ static void mcs48_generic_get_info(legacy_cpu_device *device, UINT32 state, cpui /* Official Intel MCS-48 parts */ -CPU_GET_INFO( i8021 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 1024, 64, 10, "I8021"); } -CPU_GET_INFO( i8022 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 2048, 128, 10, "I8022"); } -CPU_GET_INFO( i8035 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 0, 64, 5, "I8035"); } -CPU_GET_INFO( i8048 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 1024, 64, 5, "I8048"); } -CPU_GET_INFO( i8648 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 1024, 64, 5, "I8648"); } -CPU_GET_INFO( i8748 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 1024, 64, 5, "I8748"); } -CPU_GET_INFO( i8039 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 0, 128, 5, "I8039"); } -CPU_GET_INFO( i8049 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 2048, 128, 5, "I8049"); } -CPU_GET_INFO( i8749 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 2048, 128, 5, "I8749"); } -CPU_GET_INFO( i8040 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 0, 256, 5, "I8040"); } -CPU_GET_INFO( i8050 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 4096, 256, 5, "I8050"); } - - -/* Official Intel UPI-41 parts */ -CPU_GET_INFO( i8041 ) { mcs48_generic_get_info(device, state, info, UPI41_FEATURE, 1024, 128, 5, "I8041"); } -CPU_GET_INFO( i8741 ) { mcs48_generic_get_info(device, state, info, UPI41_FEATURE, 1024, 128, 5, "I8741"); } -CPU_GET_INFO( i8042 ) { mcs48_generic_get_info(device, state, info, UPI41_FEATURE, 2048, 256, 5, "I8042"); } -CPU_GET_INFO( i8242 ) { mcs48_generic_get_info(device, state, info, UPI41_FEATURE, 2048, 256, 5, "I8242"); } -CPU_GET_INFO( i8742 ) { mcs48_generic_get_info(device, state, info, UPI41_FEATURE, 2048, 256, 5, "I8742"); } - - -/* Clones */ -CPU_GET_INFO( mb8884 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 0, 64, 5, "MB8884"); } -CPU_GET_INFO( n7751 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 1024, 64, 5, "N7751"); } -CPU_GET_INFO( m58715 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 2048, 128, 5, "M58715"); } +CPU_GET_INFO( i8021 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 1024, 64, 10, "I8021", "i8021"); } +CPU_GET_INFO( i8022 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 2048, 128, 10, "I8022", "i8022"); } +CPU_GET_INFO( i8035 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 0, 64, 5, "I8035", "i8035"); } +CPU_GET_INFO( i8048 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 1024, 64, 5, "I8048", "i8048"); } +CPU_GET_INFO( i8648 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 1024, 64, 5, "I8648", "i8648"); } +CPU_GET_INFO( i8748 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 1024, 64, 5, "I8748", "i8748"); } +CPU_GET_INFO( i8039 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 0, 128, 5, "I8039", "i8039"); } +CPU_GET_INFO( i8049 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 2048, 128, 5, "I8049", "i8049"); } +CPU_GET_INFO( i8749 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 2048, 128, 5, "I8749", "i8749"); } +CPU_GET_INFO( i8040 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 0, 256, 5, "I8040", "i8040"); } +CPU_GET_INFO( i8050 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 4096, 256, 5, "I8050", "i8050"); } + + +/* Official Intel UPI-41 parts */ +CPU_GET_INFO( i8041 ) { mcs48_generic_get_info(device, state, info, UPI41_FEATURE, 1024, 128, 5, "I8041", "i8041"); } +CPU_GET_INFO( i8741 ) { mcs48_generic_get_info(device, state, info, UPI41_FEATURE, 1024, 128, 5, "I8741", "i8741"); } +CPU_GET_INFO( i8042 ) { mcs48_generic_get_info(device, state, info, UPI41_FEATURE, 2048, 256, 5, "I8042", "i8042"); } +CPU_GET_INFO( i8242 ) { mcs48_generic_get_info(device, state, info, UPI41_FEATURE, 2048, 256, 5, "I8242", "i8242"); } +CPU_GET_INFO( i8742 ) { mcs48_generic_get_info(device, state, info, UPI41_FEATURE, 2048, 256, 5, "I8742", "i8742"); } + + +/* Clones */ +CPU_GET_INFO( mb8884 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 0, 64, 5, "MB8884", "mb8884"); } +CPU_GET_INFO( n7751 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 1024, 64, 5, "N7751", "n7751"); } +CPU_GET_INFO( m58715 ) { mcs48_generic_get_info(device, state, info, MCS48_FEATURE, 2048, 128, 5, "M58715", "m58715"); } /* Official Intel MCS-48 parts */ DEFINE_LEGACY_CPU_DEVICE(I8021, i8021); /* 1k internal ROM, 64 bytes internal RAM */ diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/emu/cpu/mcs51/mcs51.c index 37388e4a073..7eeff02973d 100644 --- a/src/emu/cpu/mcs51/mcs51.c +++ b/src/emu/cpu/mcs51/mcs51.c @@ -2584,6 +2584,7 @@ CPU_GET_INFO( i8031 ) { case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break; case CPUINFO_STR_NAME: strcpy(info->s, "I8031"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i8031"); break; default: CPU_GET_INFO_CALL(mcs51); break; } /* --- the following bits of info are returned as NULL-terminated strings --- */ @@ -2596,6 +2597,7 @@ CPU_GET_INFO( i8051 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_12bit); break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break; case CPUINFO_STR_NAME: strcpy(info->s, "I8051"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i8051"); break; default: CPU_GET_INFO_CALL(mcs51); break; } /* --- the following bits of info are returned as NULL-terminated strings --- */ @@ -2609,6 +2611,7 @@ CPU_GET_INFO( i8032 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_8bit); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i8052); break; case CPUINFO_STR_NAME: strcpy(info->s, "I8032"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i8032"); break; default: CPU_GET_INFO_CALL(mcs51); break; } } @@ -2622,6 +2625,7 @@ CPU_GET_INFO( i8052 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_8bit); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i8052); break; case CPUINFO_STR_NAME: strcpy(info->s, "I8052"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i8052"); break; default: CPU_GET_INFO_CALL(mcs51); break; } } @@ -2633,6 +2637,7 @@ CPU_GET_INFO( i8751 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_12bit); break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break; case CPUINFO_STR_NAME: strcpy(info->s, "I8751"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i8751"); break; default: CPU_GET_INFO_CALL(mcs51); break; } } @@ -2646,6 +2651,7 @@ CPU_GET_INFO( i8752 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_8bit); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i8052); break; case CPUINFO_STR_NAME: strcpy(info->s, "I8752"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i8752"); break; default: CPU_GET_INFO_CALL(mcs51); break; } } @@ -2665,6 +2671,7 @@ CPU_GET_INFO( i80c31 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c51); break; case CPUINFO_STR_NAME: strcpy(info->s, "I80C31"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i80c31"); break; default: CPU_GET_INFO_CALL(i8031); break; } } @@ -2676,6 +2683,7 @@ CPU_GET_INFO( i80c51 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c51); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c51); break; case CPUINFO_STR_NAME: strcpy(info->s, "I80C51"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i80c51"); break; default: CPU_GET_INFO_CALL(i8051); break; } } @@ -2687,6 +2695,7 @@ CPU_GET_INFO( i80c32 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c52); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c52); break; case CPUINFO_STR_NAME: strcpy(info->s, "I80C32"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i80c32"); break; default: CPU_GET_INFO_CALL(i8032); break; } } @@ -2697,6 +2706,7 @@ CPU_GET_INFO( i80c52 ) { case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c52); break; case CPUINFO_STR_NAME: strcpy(info->s, "I80C52"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i80c52"); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c52); break; default: CPU_GET_INFO_CALL(i8052); break; } @@ -2708,6 +2718,7 @@ CPU_GET_INFO( i87c51 ) { case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c51); break; case CPUINFO_STR_NAME: strcpy(info->s, "I87C51"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i87c51"); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c51); break; default: CPU_GET_INFO_CALL(i8751); break; } @@ -2719,6 +2730,7 @@ CPU_GET_INFO( i87c52 ) { case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c52); break; case CPUINFO_STR_NAME: strcpy(info->s, "I87C52"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "i87c52"); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c52); break; default: CPU_GET_INFO_CALL(i8752); break; } @@ -2734,6 +2746,7 @@ CPU_GET_INFO( at89c4051 ) { case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c51); break; case CPUINFO_STR_NAME: strcpy(info->s, "AT89C4051"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "at89c4051"); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c51); break; default: CPU_GET_INFO_CALL(i8051); break; } @@ -2745,6 +2758,7 @@ CPU_GET_INFO( ds5002fp ) { case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(ds5002fp); break; case CPUINFO_STR_NAME: strcpy(info->s, "DS5002FP"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ds5002fp"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Dallas"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/mips/mips3.c b/src/emu/cpu/mips/mips3.c index b86bc95027c..b789a07b603 100644 --- a/src/emu/cpu/mips/mips3.c +++ b/src/emu/cpu/mips/mips3.c @@ -2355,6 +2355,7 @@ CPU_GET_INFO( vr4300be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "VR4300 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "vr4300be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2373,6 +2374,7 @@ CPU_GET_INFO( vr4300le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "VR4300 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "vr4300le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2392,6 +2394,7 @@ CPU_GET_INFO( vr4310be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "VR4310 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "vr4310be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2410,6 +2413,7 @@ CPU_GET_INFO( vr4310le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "VR4310 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "vr4310le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2445,6 +2449,7 @@ CPU_GET_INFO( r4600be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R4600 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4600be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2463,6 +2468,7 @@ CPU_GET_INFO( r4600le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R4600 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4600le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2499,6 +2505,7 @@ CPU_GET_INFO( r4650be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "IDT R4650 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4650be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2517,6 +2524,7 @@ CPU_GET_INFO( r4650le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "IDT R4650 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4650le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2553,6 +2561,7 @@ CPU_GET_INFO( r4700be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R4700 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4700be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2572,6 +2581,7 @@ CPU_GET_INFO( r4700le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R4700 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4700le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2608,6 +2618,7 @@ CPU_GET_INFO( r5000be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R5000 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r5000be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2626,6 +2637,7 @@ CPU_GET_INFO( r5000le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R5000 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r5000le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2662,6 +2674,7 @@ CPU_GET_INFO( qed5271be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "QED5271 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "qed5271be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2680,6 +2693,7 @@ CPU_GET_INFO( qed5271le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "QED5271 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "qed5271le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2716,6 +2730,7 @@ CPU_GET_INFO( rm7000be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "RM7000 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "rm7000be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2734,6 +2749,7 @@ CPU_GET_INFO( rm7000le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "RM7000 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "rm7000le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; diff --git a/src/emu/cpu/mips/mips3drc.c b/src/emu/cpu/mips/mips3drc.c index 24b38f38f74..3ea83109e97 100644 --- a/src/emu/cpu/mips/mips3drc.c +++ b/src/emu/cpu/mips/mips3drc.c @@ -3717,6 +3717,7 @@ CPU_GET_INFO( vr4300be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "VR4300 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "vr4300be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3735,6 +3736,7 @@ CPU_GET_INFO( vr4300le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "VR4300 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "vr4300le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3754,6 +3756,7 @@ CPU_GET_INFO( vr4310be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "VR4310 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "vr4310be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3772,6 +3775,7 @@ CPU_GET_INFO( vr4310le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "VR4310 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "vr4310le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3805,6 +3809,7 @@ CPU_GET_INFO( r4600be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R4600 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4600be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3823,7 +3828,7 @@ CPU_GET_INFO( r4600le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R4600 (little)"); break; - + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4600le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; } @@ -3857,6 +3862,7 @@ CPU_GET_INFO( r4650be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "IDT R4650 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4650be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3875,6 +3881,7 @@ CPU_GET_INFO( r4650le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "IDT R4650 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4650le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3909,6 +3916,7 @@ CPU_GET_INFO( r4700be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R4700 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4700be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3927,7 +3935,8 @@ CPU_GET_INFO( r4700le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R4700 (little)"); break; - + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r4700le"); break; + /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; } @@ -3961,6 +3970,7 @@ CPU_GET_INFO( r5000be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R5000 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r5000be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3979,6 +3989,7 @@ CPU_GET_INFO( r5000le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "R5000 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "r5000le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -4013,6 +4024,7 @@ CPU_GET_INFO( qed5271be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "QED5271 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "qed5271be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -4031,6 +4043,7 @@ CPU_GET_INFO( qed5271le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "QED5271 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "qed5271le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -4065,6 +4078,7 @@ CPU_GET_INFO( rm7000be ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "RM7000 (big)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "rm7000be"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -4083,6 +4097,7 @@ CPU_GET_INFO( rm7000le ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "RM7000 (little)"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "rm7000le"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c index 4808c048a34..3ee7c2d67ce 100644 --- a/src/emu/cpu/mn10200/mn10200.c +++ b/src/emu/cpu/mn10200/mn10200.c @@ -2397,6 +2397,7 @@ CPU_GET_INFO( mn10200 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "Panasonic MN10200"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "mn10200"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "MN10200"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c index 23335d78b86..da72fc37fdf 100644 --- a/src/emu/cpu/nec/nec.c +++ b/src/emu/cpu/nec/nec.c @@ -631,6 +631,7 @@ CPU_GET_INFO( v20 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "V20"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "v20"); break; default: CPU_GET_INFO_CALL(nec); break; } @@ -650,6 +651,7 @@ CPU_GET_INFO( v30 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "V30"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "v30"); break; default: CPU_GET_INFO_CALL(nec); break; } @@ -669,6 +671,7 @@ CPU_GET_INFO( v33 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "V33"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "v33"); break; default: CPU_GET_INFO_CALL(nec); break; } diff --git a/src/emu/cpu/nec/v25.c b/src/emu/cpu/nec/v25.c index a2a1ccc5bb1..5ccb57fdfd0 100644 --- a/src/emu/cpu/nec/v25.c +++ b/src/emu/cpu/nec/v25.c @@ -711,7 +711,7 @@ static CPU_GET_INFO( v25v35 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &nec_state->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "NEC"); break; + case CPUINFO_STR_NAME: strcpy(info->s, "NEC"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "NEC V-Series"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "2.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -772,6 +772,7 @@ CPU_GET_INFO( v25 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "V25"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "v25"); break; default: CPU_GET_INFO_CALL(v25v35); break; } @@ -795,6 +796,7 @@ CPU_GET_INFO( v35 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "V35"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "v35"); break; default: CPU_GET_INFO_CALL(v25v35); break; } diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c index ca34c63481c..069d1e2a690 100644 --- a/src/emu/cpu/pdp1/pdp1.c +++ b/src/emu/cpu/pdp1/pdp1.c @@ -1027,6 +1027,7 @@ CPU_GET_INFO( pdp1 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PDP1"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pdp1_cpu"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "DEC PDP-1"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "2.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/pdp1/tx0.c b/src/emu/cpu/pdp1/tx0.c index 01c41b3f1d1..de2fc7b8454 100644 --- a/src/emu/cpu/pdp1/tx0.c +++ b/src/emu/cpu/pdp1/tx0.c @@ -504,6 +504,7 @@ CPU_GET_INFO( tx0_64kw ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TX-0"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tx0_64kw_cpu"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "TX-0"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -631,6 +632,7 @@ CPU_GET_INFO( tx0_8kw ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TX-0"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tx0_8kw_cpu"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "TX-0"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c index 4accbad3ea6..1b78a78b88f 100644 --- a/src/emu/cpu/pic16c5x/pic16c5x.c +++ b/src/emu/cpu/pic16c5x/pic16c5x.c @@ -1049,6 +1049,7 @@ static CPU_GET_INFO( pic16c5x ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C5x"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c5x"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Microchip"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.14"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -1143,6 +1144,7 @@ CPU_GET_INFO( pic16c54 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C54"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c54"); break; default: CPU_GET_INFO_CALL(pic16c5x); break; } @@ -1201,6 +1203,7 @@ CPU_GET_INFO( pic16c55 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C55"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c55"); break; default: CPU_GET_INFO_CALL(pic16c5x); break; } @@ -1259,6 +1262,7 @@ CPU_GET_INFO( pic16c56 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C56"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c56"); break; default: CPU_GET_INFO_CALL(pic16c5x); break; } @@ -1319,6 +1323,7 @@ CPU_GET_INFO( pic16c57 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C57"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c57"); break; default: CPU_GET_INFO_CALL(pic16c5x); break; } @@ -1379,6 +1384,7 @@ CPU_GET_INFO( pic16c58 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C58"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c58"); break; default: CPU_GET_INFO_CALL(pic16c5x); break; } diff --git a/src/emu/cpu/pic16c62x/pic16c62x.c b/src/emu/cpu/pic16c62x/pic16c62x.c index 33d8a4ac1c5..de711418195 100644 --- a/src/emu/cpu/pic16c62x/pic16c62x.c +++ b/src/emu/cpu/pic16c62x/pic16c62x.c @@ -1170,6 +1170,7 @@ static CPU_GET_INFO( pic16c62x ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C62x"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c62x"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Microchip"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -1272,6 +1273,7 @@ CPU_GET_INFO( pic16c620 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C620"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c620"); break; default: CPU_GET_INFO_CALL(pic16c62x); break; } @@ -1335,6 +1337,7 @@ CPU_GET_INFO( pic16c621 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C621"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c621"); break; default: CPU_GET_INFO_CALL(pic16c62x); break; } @@ -1398,6 +1401,7 @@ CPU_GET_INFO( pic16c622 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C622"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c622"); break; default: CPU_GET_INFO_CALL(pic16c62x); break; } @@ -1463,6 +1467,7 @@ CPU_GET_INFO( pic16c620a ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C620A"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c620a"); break; default: CPU_GET_INFO_CALL(pic16c62x); break; } @@ -1528,6 +1533,7 @@ CPU_GET_INFO( pic16c621a ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C621A"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c621a"); break; default: CPU_GET_INFO_CALL(pic16c62x); break; } @@ -1593,6 +1599,7 @@ CPU_GET_INFO( pic16c622a ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C622A"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pic16c622a"); break; default: CPU_GET_INFO_CALL(pic16c62x); break; } diff --git a/src/emu/cpu/powerpc/ppc.c b/src/emu/cpu/powerpc/ppc.c index b87db93a412..0b93a77dde8 100644 --- a/src/emu/cpu/powerpc/ppc.c +++ b/src/emu/cpu/powerpc/ppc.c @@ -1852,6 +1852,7 @@ static CPU_GET_INFO( ppc ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PPC403"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc403"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "PowerPC"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -1922,6 +1923,7 @@ CPU_GET_INFO( ppc403 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PPC403"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc403"); break; case CPUINFO_STR_REGISTER + PPC_EXIER: sprintf(info->s, "EXIER: %08X", EXIER); break; case CPUINFO_STR_REGISTER + PPC_EXISR: sprintf(info->s, "EXISR: %08X", EXISR); break; @@ -1948,6 +1950,7 @@ CPU_GET_INFO( ppc405 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PPC405"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc405"); break; case CPUINFO_STR_REGISTER + PPC_EXIER: sprintf(info->s, "EXIER: %08X", EXIER); break; case CPUINFO_STR_REGISTER + PPC_EXISR: sprintf(info->s, "EXISR: %08X", EXISR); break; @@ -1982,6 +1985,7 @@ CPU_GET_INFO( ppc603 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PPC603"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc603"); break; case CPUINFO_STR_REGISTER + PPC_DEC: sprintf(info->s, "DEC: %08X", read_decrementer()); break; default: CPU_GET_INFO_CALL(ppc); break; @@ -2027,6 +2031,7 @@ CPU_GET_INFO( ppc602 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PPC602"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc602"); break; case CPUINFO_STR_REGISTER + PPC_IBR: sprintf(info->s, "IBR: %08X", ppc.ibr); break; default: CPU_GET_INFO_CALL(ppc); break; @@ -2070,6 +2075,7 @@ CPU_GET_INFO( mpc8240 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "MPC8240"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "mpc8240"); break; default: CPU_GET_INFO_CALL(ppc); break; } @@ -2111,6 +2117,7 @@ CPU_GET_INFO( ppc601 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PPC601"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc601"); break; default: CPU_GET_INFO_CALL(ppc); break; } @@ -2152,6 +2159,7 @@ CPU_GET_INFO( ppc604 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PPC604"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc604"); break; default: CPU_GET_INFO_CALL(ppc); break; } diff --git a/src/emu/cpu/powerpc/ppccom.c b/src/emu/cpu/powerpc/ppccom.c index 66117767154..205d90a02d0 100644 --- a/src/emu/cpu/powerpc/ppccom.c +++ b/src/emu/cpu/powerpc/ppccom.c @@ -1546,6 +1546,7 @@ void ppccom_get_info(powerpc_state *ppc, UINT32 state, cpuinfo *info) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "PowerPC"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "2.0"); break; case CPUINFO_STR_SOURCE_FILE: /* provided by core */ break; diff --git a/src/emu/cpu/powerpc/ppcdrc.c b/src/emu/cpu/powerpc/ppcdrc.c index 40d4ddfac99..8043b04591c 100644 --- a/src/emu/cpu/powerpc/ppcdrc.c +++ b/src/emu/cpu/powerpc/ppcdrc.c @@ -4466,6 +4466,7 @@ CPU_GET_INFO( ppc403ga ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 403GA"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc403ga"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc4xx); break; @@ -4501,6 +4502,7 @@ CPU_GET_INFO( ppc403gcx ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 403GCX"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc403gcx"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc4xx); break; @@ -4537,6 +4539,7 @@ CPU_GET_INFO( ppc405gp ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 405GP"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc405gp"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc4xx); break; @@ -4575,6 +4578,7 @@ CPU_GET_INFO( ppc601 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 601"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc601"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4609,6 +4613,7 @@ CPU_GET_INFO( ppc602 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 602"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc602"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4643,6 +4648,7 @@ CPU_GET_INFO( ppc603 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 603"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc603"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4677,6 +4683,7 @@ CPU_GET_INFO( ppc603e ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 603e"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc603e"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4711,6 +4718,7 @@ CPU_GET_INFO( ppc603r ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 603R"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc603r"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4745,6 +4753,7 @@ CPU_GET_INFO( ppc604 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 604"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ppc604"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4784,6 +4793,7 @@ CPU_GET_INFO( mpc8240 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC MPC8240"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "mpc8240"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; diff --git a/src/emu/cpu/pps4/pps4.c b/src/emu/cpu/pps4/pps4.c index d93a3ea6055..649da7fe868 100644 --- a/src/emu/cpu/pps4/pps4.c +++ b/src/emu/cpu/pps4/pps4.c @@ -436,6 +436,7 @@ CPU_GET_INFO( pps4 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "PPS4"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "pps4"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Rockwell PPS-4"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c index 8e22c6a55bd..c38f7029a06 100644 --- a/src/emu/cpu/rsp/rsp.c +++ b/src/emu/cpu/rsp/rsp.c @@ -3075,6 +3075,7 @@ CPU_GET_INFO( rsp ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "RSP"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "rsp"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "RSP"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c index 1c9a8c5e188..2a7ba31c96e 100644 --- a/src/emu/cpu/rsp/rspdrc.c +++ b/src/emu/cpu/rsp/rspdrc.c @@ -6053,6 +6053,7 @@ CPU_GET_INFO( rsp ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "RSP"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "rsp"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "RSP"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c index 189aab4974d..6c717559216 100644 --- a/src/emu/cpu/s2650/s2650.c +++ b/src/emu/cpu/s2650/s2650.c @@ -1603,6 +1603,7 @@ CPU_GET_INFO( s2650 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "S2650"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "s2650"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Signetics 2650"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.2"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c index 82736f3d619..57fe36f781a 100644 --- a/src/emu/cpu/saturn/saturn.c +++ b/src/emu/cpu/saturn/saturn.c @@ -372,6 +372,7 @@ CPU_GET_INFO( saturn ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "Saturn"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "saturn_cpu"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Saturn"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0alpha"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c index a28b2084533..d1313bf648f 100644 --- a/src/emu/cpu/sc61860/sc61860.c +++ b/src/emu/cpu/sc61860/sc61860.c @@ -236,6 +236,7 @@ CPU_GET_INFO( sc61860 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "SC61860"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "sc61860"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "SC61860"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0beta"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/scmp/scmp.c b/src/emu/cpu/scmp/scmp.c index 48b44a5c608..d6b43858ac5 100644 --- a/src/emu/cpu/scmp/scmp.c +++ b/src/emu/cpu/scmp/scmp.c @@ -641,6 +641,7 @@ CPU_GET_INFO( scmp ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "INS 8050 SC/MP"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ins8050"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "National Semiconductor SC/MP"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -660,6 +661,7 @@ CPU_GET_INFO( ins8060 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "INS 8060 SC/MP II"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ins8060"); break; default: CPU_GET_INFO_CALL(scmp); break; } diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c index 6f8854618e9..fce7db6ca96 100644 --- a/src/emu/cpu/se3208/se3208.c +++ b/src/emu/cpu/se3208/se3208.c @@ -1897,6 +1897,7 @@ CPU_GET_INFO( se3208 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "SE3208"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "se3208"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Advanced Digital Chips Inc."); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.00"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c index a63e8808a67..f06a7c230fd 100644 --- a/src/emu/cpu/sh2/sh2.c +++ b/src/emu/cpu/sh2/sh2.c @@ -2464,6 +2464,7 @@ CPU_GET_INFO( sh2 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "SH-2"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "sh2"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Hitachi SH7600"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.01"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -2515,6 +2516,7 @@ CPU_GET_INFO( sh1 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "SH-1"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "sh1"); break; default: CPU_GET_INFO_CALL(sh2); break; } diff --git a/src/emu/cpu/sh2/sh2drc.c b/src/emu/cpu/sh2/sh2drc.c index d4b4f0a2e2b..8305ebb391f 100644 --- a/src/emu/cpu/sh2/sh2drc.c +++ b/src/emu/cpu/sh2/sh2drc.c @@ -3395,6 +3395,7 @@ CPU_GET_INFO( sh2 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "SH-2"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "sh2"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Hitachi SuperH RISC"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "2.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -3450,6 +3451,7 @@ CPU_GET_INFO( sh1 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "SH-1"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "sh1"); break; default: CPU_GET_INFO_CALL(sh2); break; } diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index 4d2cba47285..3c558550423 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -3561,6 +3561,7 @@ CPU_GET_INFO( sh4 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "SH-4"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "sh4"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Hitachi SH7750"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c index 3632ab433fb..defd40778bf 100644 --- a/src/emu/cpu/sharc/sharc.c +++ b/src/emu/cpu/sharc/sharc.c @@ -1263,6 +1263,7 @@ CPU_GET_INFO( adsp21062 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "ADSP21062"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "adsp21062"); break; default: CPU_GET_INFO_CALL(sharc); break; } diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c index ce2ae1ab0e5..13175c9961e 100644 --- a/src/emu/cpu/spc700/spc700.c +++ b/src/emu/cpu/spc700/spc700.c @@ -1783,6 +1783,7 @@ CPU_GET_INFO( spc700 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "SPC700"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "spc700"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Sony SPC700"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.1"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c index 921562c283f..a4baa298d9a 100644 --- a/src/emu/cpu/ssp1601/ssp1601.c +++ b/src/emu/cpu/ssp1601/ssp1601.c @@ -872,6 +872,7 @@ CPU_GET_INFO( ssp1601 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "SSP1601"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ssp1601"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "SSP1601 DSP"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/superfx/superfx.c b/src/emu/cpu/superfx/superfx.c index 4654633da24..711998abca7 100644 --- a/src/emu/cpu/superfx/superfx.c +++ b/src/emu/cpu/superfx/superfx.c @@ -1628,6 +1628,7 @@ CPU_GET_INFO( superfx ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "SuperFX"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "superfx"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "SuperFX"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c index b23f0b2d42b..573f3ea1f25 100644 --- a/src/emu/cpu/t11/t11.c +++ b/src/emu/cpu/t11/t11.c @@ -466,6 +466,7 @@ CPU_GET_INFO( t11 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "T11"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "t11"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "DEC T-11"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c index 3e660cbff25..8a9eda4d5f6 100644 --- a/src/emu/cpu/tlcs90/tlcs90.c +++ b/src/emu/cpu/tlcs90/tlcs90.c @@ -2856,6 +2856,7 @@ CPU_GET_INFO( tmp90840 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMP90840"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tmp90840"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Toshiba TLCS-90"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -2902,6 +2903,7 @@ CPU_GET_INFO( tmp90841 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMP90841"); return; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tmp90841"); return; } CPU_GET_INFO_CALL(tmp90840); @@ -2918,6 +2920,7 @@ CPU_GET_INFO( tmp91640 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMP91640"); return; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tmp91640"); return; } CPU_GET_INFO_CALL(tmp90840); @@ -2934,6 +2937,7 @@ CPU_GET_INFO( tmp91641 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMP91641"); return; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tmp91641"); return; } CPU_GET_INFO_CALL(tmp90840); diff --git a/src/emu/cpu/tlcs900/tlcs900.c b/src/emu/cpu/tlcs900/tlcs900.c index 02d27429dda..a66409680a7 100644 --- a/src/emu/cpu/tlcs900/tlcs900.c +++ b/src/emu/cpu/tlcs900/tlcs900.c @@ -1280,6 +1280,7 @@ CPU_GET_INFO( tlcs900h ) case CPUINFO_STR_REGISTER + TLCS900_DMAM3: sprintf( info->s, "DMAM0:%02x", cpustate->dmam[3].b.l ); break; case CPUINFO_STR_NAME: strcpy( info->s, "TLCS-900/H" ); break; + case CPUINFO_STR_SHORTNAME: strcpy( info->s, "tlcs900h" ); break; case CPUINFO_STR_FAMILY: strcpy( info->s, "Toshiba TLCS-900" ); break; case CPUINFO_STR_VERSION: strcpy( info->s, "0.1" ); break; case CPUINFO_STR_SOURCE_FILE: strcpy( info->s, __FILE__ ); break; @@ -2158,6 +2159,7 @@ CPU_GET_INFO( tmp95c063 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp95c063_mem); break; case CPUINFO_STR_NAME: strcpy( info->s, "TMP95C063" ); break; + case CPUINFO_STR_SHORTNAME: strcpy( info->s, "tmp95c063" ); break; default: CPU_GET_INFO_CALL(tlcs900h); break; } diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c index 477a70d2e06..091b5526433 100644 --- a/src/emu/cpu/tms32010/tms32010.c +++ b/src/emu/cpu/tms32010/tms32010.c @@ -1027,6 +1027,7 @@ CPU_GET_INFO( tms32010 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMS32010"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tms32010"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Texas Instruments TMS32010"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.31"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -1091,6 +1092,7 @@ CPU_GET_INFO( tms32015 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMS32015"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tms32015"); break; default: CPU_GET_INFO_CALL(tms32010); break; } @@ -1125,6 +1127,7 @@ CPU_GET_INFO( tms32016 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMS32016"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tms32016"); break; default: CPU_GET_INFO_CALL(tms32010); break; } diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c index cdcb29f72ba..d2c7c6af14b 100644 --- a/src/emu/cpu/tms32025/tms32025.c +++ b/src/emu/cpu/tms32025/tms32025.c @@ -2347,6 +2347,7 @@ CPU_GET_INFO( tms32025 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMS32025"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tms32025"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Texas Instruments TMS320x25"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.10"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c index a93caf35581..8e6755ff4d0 100644 --- a/src/emu/cpu/tms32051/tms32051.c +++ b/src/emu/cpu/tms32051/tms32051.c @@ -741,6 +741,7 @@ CPU_GET_INFO( tms32051 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMS32051"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tms32051"); break; default: CPU_GET_INFO_CALL(tms); break; } diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index c711bcc4e3c..9ed68966521 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -1790,6 +1790,7 @@ CPU_GET_INFO( tms34010 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMS34010"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tms34010"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Texas Instruments 340x0"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -1815,6 +1816,7 @@ CPU_GET_INFO( tms34020 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMS34020"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tms34020"); break; default: CPU_GET_INFO_CALL(tms34010); break; } diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c index 59a8090c779..6993ff1baff 100644 --- a/src/emu/cpu/tms7000/tms7000.c +++ b/src/emu/cpu/tms7000/tms7000.c @@ -319,6 +319,7 @@ CPU_GET_INFO( tms7000 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "TMS7000"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "tms7000"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Texas Instriuments TMS7000"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h index 0ed4d1acb2f..338d206355b 100644 --- a/src/emu/cpu/tms9900/99xxcore.h +++ b/src/emu/cpu/tms9900/99xxcore.h @@ -93,18 +93,21 @@ Other references can be found on spies.com: #define TMS99XX_PREFIX ti990_10 #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( ti990_10l ) #define TMS99XX_device_get_name "TI990/10L" + #define TMS99XX_device_get_shortname "ti990_10l" #elif (TMS99XX_MODEL == TMS9900_ID) #define TMS99XX_PREFIX tms9900 #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9900l ) #define TMS99XX_device_get_name "TMS9900L" + #define TMS99XX_device_get_shortname "tms9900l" #elif (TMS99XX_MODEL == TMS9940_ID) #define TMS99XX_PREFIX tms9940 #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9940l ) #define TMS99XX_device_get_name "TMS9940L" + #define TMS99XX_device_get_shortname "tms9940l" #error "tms9940 is not yet supported" @@ -113,12 +116,14 @@ Other references can be found on spies.com: #define TMS99XX_PREFIX tms9980a #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9980al ) #define TMS99XX_device_get_name "TMS9980AL/TMS9981L" + #define TMS99XX_device_get_shortname "tms9980al" #elif (TMS99XX_MODEL == TMS9985_ID) #define TMS99XX_PREFIX tms9985 #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9985l ) #define TMS99XX_device_get_name "TMS9985L" + #define TMS99XX_device_get_shortname "tms9985l" #error "tms9985 is not yet supported" @@ -127,6 +132,7 @@ Other references can be found on spies.com: #define TMS99XX_PREFIX tms9989 #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9989l ) #define TMS99XX_device_get_name "TMS9989L" + #define TMS99XX_device_get_shortname "tms9989l" #error "tms9989 is not yet supported" @@ -135,12 +141,14 @@ Other references can be found on spies.com: #define TMS99XX_PREFIX tms9995 #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms9995l ) #define TMS99XX_device_get_name "TMS9995L" + #define TMS99XX_device_get_shortname "tms9995l" #elif (TMS99XX_MODEL == TMS99000_ID) #define TMS99XX_PREFIX tms99000 #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms99000l ) #define TMS99XX_device_get_name "TMS99000L" + #define TMS99XX_device_get_shortname "tms99000l" #error "tms99000 is not yet supported" @@ -149,6 +157,7 @@ Other references can be found on spies.com: #define TMS99XX_PREFIX tms99105a #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms99105al ) #define TMS99XX_device_get_name "TMS99105AL" + #define TMS99XX_device_get_shortname "tms99105al" #error "tms99105a is not yet supported" @@ -157,6 +166,7 @@ Other references can be found on spies.com: #define TMS99XX_PREFIX tms99110a #define TMS99XX_GET_INFO CPU_GET_INFO_NAME( tms99110al ) #define TMS99XX_device_get_name "TMS99110AL" + #define TMS99XX_device_get_shortname "tms99110al" #error "tms99110a is not yet supported" @@ -4770,6 +4780,8 @@ void TMS99XX_GET_INFO(legacy_cpu_device *device, UINT32 state, cpuinfo *info) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, TMS99XX_device_get_name); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, TMS99XX_device_get_shortname); break; + case CPUINFO_STR_FAMILY: strcpy(info->s, "Texas Instruments 9900L"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "2.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/unsp/unsp.c b/src/emu/cpu/unsp/unsp.c index 711a18f3fc4..08b1a09c417 100644 --- a/src/emu/cpu/unsp/unsp.c +++ b/src/emu/cpu/unsp/unsp.c @@ -900,6 +900,7 @@ CPU_GET_INFO( unsp ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "u'nSP"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "unsp"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "u'nSP"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c index e5db011f819..aa391ee4bb2 100644 --- a/src/emu/cpu/upd7810/upd7810.c +++ b/src/emu/cpu/upd7810/upd7810.c @@ -2183,6 +2183,7 @@ CPU_GET_INFO( upd7810 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "uPD7810"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "upd7810"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "NEC uPD7810"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "0.3"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -2268,6 +2269,7 @@ CPU_GET_INFO( upd7807 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "uPD7807"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "upd7807"); break; default: CPU_GET_INFO_CALL(upd7810); break; } @@ -2279,6 +2281,7 @@ CPU_GET_INFO( upd7801 ) { case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(upd7801); break; case CPUINFO_STR_NAME: strcpy(info->s, "uPD7801"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "upd7801"); break; default: CPU_GET_INFO_CALL(upd7810); break; } @@ -2292,6 +2295,7 @@ CPU_GET_INFO( upd78c05 ) { case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(upd78c05); break; case CPUINFO_STR_NAME: strcpy(info->s, "uPD78C05"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "upd78c05"); break; /* These registers are not present in the uPD78C05 cpu */ case CPUINFO_STR_REGISTER + UPD7810_A2: @@ -2336,6 +2340,7 @@ CPU_GET_INFO( upd78c06 ) { case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(upd78c06); break; case CPUINFO_STR_NAME: strcpy(info->s, "uPD78C06"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "upd78c06"); break; default: CPU_GET_INFO_CALL(upd78c05); break; } diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c index f910deb802e..a1f76b74b93 100644 --- a/src/emu/cpu/v60/v60.c +++ b/src/emu/cpu/v60/v60.c @@ -667,6 +667,7 @@ CPU_GET_INFO( v60 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "V60"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "v60"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "NEC V60"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -755,6 +756,7 @@ CPU_GET_INFO( v70 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "V70"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "v70"); break; default: CPU_GET_INFO_CALL(v60); break; } diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c index eb37e66eb97..72cf2c2b59e 100644 --- a/src/emu/cpu/v810/v810.c +++ b/src/emu/cpu/v810/v810.c @@ -1534,6 +1534,7 @@ CPU_GET_INFO( v810 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "V810"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "v810"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "NEC V810"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c index e14da552d3d..cd19577161a 100644 --- a/src/emu/cpu/z180/z180.c +++ b/src/emu/cpu/z180/z180.c @@ -2727,6 +2727,7 @@ CPU_GET_INFO( z180 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "Z180"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "z180"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Zilog Z8x180"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "0.4"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; diff --git a/src/emu/cpu/z8/z8.c b/src/emu/cpu/z8/z8.c index 75730ad6743..b73426408be 100644 --- a/src/emu/cpu/z8/z8.c +++ b/src/emu/cpu/z8/z8.c @@ -863,6 +863,7 @@ static CPU_GET_INFO( z8 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "Z8"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "z8"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Zilog Z8"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -883,6 +884,7 @@ CPU_GET_INFO( z8601 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "Z8601"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "z8601"); break; default: CPU_GET_INFO_CALL(z8); break; } @@ -897,6 +899,7 @@ CPU_GET_INFO( ub8830d ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "UB8830D"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "ub8830d"); break; default: CPU_GET_INFO_CALL(z8); break; } @@ -911,6 +914,7 @@ CPU_GET_INFO( z8611 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "Z8611"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "z8611"); break; default: CPU_GET_INFO_CALL(z8); break; } diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c index 42e061d60d4..3caa0536bd1 100644 --- a/src/emu/cpu/z80/z80.c +++ b/src/emu/cpu/z80/z80.c @@ -3897,6 +3897,7 @@ CPU_GET_INFO( z80 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "Z80"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "z80"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Zilog Z80"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "3.9"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -3921,6 +3922,7 @@ CPU_GET_INFO( nsc800 ) case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(nsc800); break; case CPUINFO_STR_NAME: strcpy(info->s, "NSC800"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "nsc800"); break; default: CPU_GET_INFO_CALL(z80); break; } diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c index 3dcdc00508e..5175ef5c1e8 100644 --- a/src/emu/cpu/z8000/z8000.c +++ b/src/emu/cpu/z8000/z8000.c @@ -813,6 +813,7 @@ CPU_GET_INFO( z8002 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "Z8002"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "z8002"); break; case CPUINFO_STR_FAMILY: strcpy(info->s, "Zilog Z8000"); break; case CPUINFO_STR_VERSION: strcpy(info->s, "1.1"); break; case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; @@ -888,6 +889,7 @@ CPU_GET_INFO( z8001 ) /* --- the following bits of info are returned as NULL-terminated strings --- */ case CPUINFO_STR_NAME: strcpy(info->s, "Zilog Z8001"); break; + case CPUINFO_STR_SHORTNAME: strcpy(info->s, "z8001"); break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; case CPUINFO_INT_MAX_INSTRUCTION_BYTES: info->i = 8; break; diff --git a/src/emu/devcpu.c b/src/emu/devcpu.c index 938e8b04bfb..9345760eace 100644 --- a/src/emu/devcpu.c +++ b/src/emu/devcpu.c @@ -74,7 +74,7 @@ cpu_device::~cpu_device() //------------------------------------------------- legacy_cpu_device::legacy_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, cpu_get_info_func get_info) - : cpu_device(mconfig, type, "CPU", tag, owner, clock, "", __FILE__), + : cpu_device(mconfig, type, "CPU", tag, owner, clock, "", ""), m_get_info(get_info), m_token(NULL), m_set_info(reinterpret_cast(get_legacy_fct(CPUINFO_FCT_SET_INFO))), @@ -112,6 +112,7 @@ legacy_cpu_device::legacy_cpu_device(const machine_config &mconfig, device_type // set the real name m_name = get_legacy_string(CPUINFO_STR_NAME); m_shortname = get_legacy_string(CPUINFO_STR_SHORTNAME); + m_source = get_legacy_string(CPUINFO_STR_SOURCE_FILE); m_searchpath = m_shortname; int tokenbytes = get_legacy_int(CPUINFO_INT_CONTEXT_SIZE); diff --git a/src/emu/validity.c b/src/emu/validity.c index 02cea73ea08..2c53cd21dcd 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -1112,9 +1112,13 @@ void validity_checker::validate_devices() if (device_map.add(device->tag(), 0, false) == TMERR_DUPLICATE) mame_printf_error("Multiple devices with the same tag '%s' defined\n", device->tag()); - // if we have a ROM region, we must have a shortname - if (device->rom_region() != NULL && strcmp(device->shortname(), "") == 0) - mame_printf_error("Device has ROM definition but does not have short name defined\n"); + // all devices must have a shortname + if (strcmp(device->shortname(), "") == 0) + mame_printf_error("Device does not have short name defined\n"); + + // all devices must have a source file defined + if (strcmp(device->source(), "") == 0) + mame_printf_error("Device does not have source file location defined\n"); // check for device-specific validity check device->validity_check(*this);