diff options
author | 2009-07-08 16:20:01 +0000 | |
---|---|---|
committer | 2009-07-08 16:20:01 +0000 | |
commit | 2577a0b22d7b5d43ea7078e5ff9cfd0ae47a3a69 (patch) | |
tree | 382637c4868771c0793965aaa3261d450db8e0a5 /src | |
parent | 7b28233e47541c9c5bf075ff0e4af86f973a1917 (diff) |
Another step. Moved the address-space related get_info constants
to devintrf (including endianness). Removed space array from the
CPU class header. Made the memory system much more device-neutral.
Various other cleanups along the way.
Diffstat (limited to 'src')
99 files changed, 899 insertions, 888 deletions
diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c index b4b92b227e5..91893071e2c 100644 --- a/src/emu/cpu/adsp2100/adsp2100.c +++ b/src/emu/cpu/adsp2100/adsp2100.c @@ -1892,7 +1892,7 @@ static CPU_GET_INFO( adsp21xx ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(adsp2100_state); break; case CPUINFO_INT_INPUT_LINES: /* set per CPU */ break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -1934,11 +1934,11 @@ static CPU_GET_INFO( adsp21xx ) case CPUINFO_PTR_STATE_TABLE: info->state_table = &adsp->state; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: /* set per CPU */ break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "ADSP21xx"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "2.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; + case DEVINFO_STR_NAME: /* set per CPU */ break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "ADSP21xx"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "2.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", @@ -1989,7 +1989,7 @@ CPU_GET_INFO( adsp2100 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(adsp2100); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "ADSP2100"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ADSP2100"); break; default: CPU_GET_INFO_CALL(adsp21xx); @@ -2019,7 +2019,7 @@ CPU_GET_INFO( adsp2101 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(adsp2101); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "ADSP2101"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ADSP2101"); break; default: CPU_GET_INFO_CALL(adsp21xx); @@ -2054,7 +2054,7 @@ CPU_GET_INFO( adsp2104 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(adsp2104); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "ADSP2104"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ADSP2104"); break; default: CPU_GET_INFO_CALL(adsp21xx); @@ -2089,7 +2089,7 @@ CPU_GET_INFO( adsp2105 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(adsp2105); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "ADSP2105"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ADSP2105"); break; default: CPU_GET_INFO_CALL(adsp21xx); @@ -2124,7 +2124,7 @@ CPU_GET_INFO( adsp2115 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(adsp2115); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "ADSP2115"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ADSP2115"); break; default: CPU_GET_INFO_CALL(adsp21xx); @@ -2163,7 +2163,7 @@ CPU_GET_INFO( adsp2181 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(adsp2181); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "ADSP2181"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ADSP2181"); break; default: CPU_GET_INFO_CALL(adsp21xx); diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c index cd74578c534..75a0f29805a 100644 --- a/src/emu/cpu/alph8201/alph8201.c +++ b/src/emu/cpu/alph8201/alph8201.c @@ -885,7 +885,7 @@ static CPU_GET_INFO( alpha8xxx ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(alpha8201_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -941,10 +941,10 @@ static CPU_GET_INFO( alpha8xxx ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "AlphaDenshi MCU"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "0.1"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Tatsuyuki Satoh"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "AlphaDenshi MCU"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "0.1"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Tatsuyuki Satoh"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c", cpustate->cf?'C':'.',cpustate->zf?'Z':'.'); break; case CPUINFO_STR_REGISTER + ALPHA8201_PC: sprintf(info->s, "cpustate->PC:%03X", cpustate->PC); break; case CPUINFO_STR_REGISTER + ALPHA8201_SP: sprintf(info->s, "SP:%02X", M_RDMEM(0x001) ); break; @@ -976,7 +976,7 @@ CPU_GET_INFO( alpha8201 ) { switch (state) { - case CPUINFO_STR_NAME: strcpy(info->s, "ALPHA-8201"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ALPHA-8201"); break; case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(alpha8201); break; default: /* 8201 / 8301 */ @@ -988,7 +988,7 @@ CPU_GET_INFO( alpha8301 ) { switch (state) { - case CPUINFO_STR_NAME: strcpy(info->s, "ALPHA-8301"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ALPHA-8301"); break; case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(ALPHA8301); break; default: /* 8201 / 8301 */ diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c index 383aaa1b891..951cba64ed1 100644 --- a/src/emu/cpu/apexc/apexc.c +++ b/src/emu/cpu/apexc/apexc.c @@ -884,7 +884,7 @@ CPU_GET_INFO( apexc ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(apexc_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -928,11 +928,11 @@ CPU_GET_INFO( apexc ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(apexc); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; - case CPUINFO_STR_NAME: strcpy(info->s, "APEXC"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "APEC"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Raphael Nabet"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "APEXC"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "APEC"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Raphael Nabet"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c", (cpustate->running) ? 'R' : 'S'); break; diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c index c715dd57d48..62b92ee10b5 100644 --- a/src/emu/cpu/arm/arm.c +++ b/src/emu/cpu/arm/arm.c @@ -1447,7 +1447,7 @@ CPU_GET_INFO( arm ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(ARM_REGS); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -1513,11 +1513,11 @@ CPU_GET_INFO( arm ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "ARM"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Acorn Risc Machine"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.3"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Bryan McPhail, bmcphail@tendril.co.uk"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ARM"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Acorn Risc Machine"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.3"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Bryan McPhail, bmcphail@tendril.co.uk"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c", diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c index 3287b5f4ee0..433167faccb 100644 --- a/src/emu/cpu/arm7/arm7.c +++ b/src/emu/cpu/arm7/arm7.c @@ -233,7 +233,7 @@ CPU_GET_INFO( arm7 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(arm_state); break; case CPUINFO_INT_INPUT_LINES: info->i = ARM7_NUM_LINES; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -322,11 +322,11 @@ CPU_GET_INFO( arm7 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &ARM7_ICOUNT; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "ARM7"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Acorn Risc Machine"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.3"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Steve Ellenoff, sellenoff@hotmail.com"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ARM7"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Acorn Risc Machine"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.3"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Steve Ellenoff, sellenoff@hotmail.com"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c %s", diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c index c26f956a678..9b35ffd0a63 100644 --- a/src/emu/cpu/asap/asap.c +++ b/src/emu/cpu/asap/asap.c @@ -1723,7 +1723,7 @@ CPU_GET_INFO( asap ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(asap_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -1793,11 +1793,11 @@ CPU_GET_INFO( asap ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &asap->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "ASAP"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Atari ASAP"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ASAP"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Atari ASAP"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; diff --git a/src/emu/cpu/avr8/avr8.c b/src/emu/cpu/avr8/avr8.c index 04fdfb2078a..96047271b1e 100644 --- a/src/emu/cpu/avr8/avr8.c +++ b/src/emu/cpu/avr8/avr8.c @@ -889,7 +889,7 @@ CPU_GET_INFO( avr8 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(avr8_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -922,11 +922,11 @@ CPU_GET_INFO( avr8 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Atmel 8-bit AVR"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "AVR8"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Atmel 8-bit AVR"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "AVR8"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c index 457440334a5..707c34c315f 100644 --- a/src/emu/cpu/ccpu/ccpu.c +++ b/src/emu/cpu/ccpu/ccpu.c @@ -738,7 +738,7 @@ CPU_GET_INFO( ccpu ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(ccpu_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -789,11 +789,11 @@ CPU_GET_INFO( ccpu ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "CCPU"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Cinematronics CPU"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Aaron Giles & Zonn Moore"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "CCPU"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Cinematronics CPU"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Aaron Giles & Zonn Moore"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c", diff --git a/src/emu/cpu/cdp1802/cdp1802.c b/src/emu/cpu/cdp1802/cdp1802.c index 6c4baa87449..b3af98dab90 100644 --- a/src/emu/cpu/cdp1802/cdp1802.c +++ b/src/emu/cpu/cdp1802/cdp1802.c @@ -1074,7 +1074,7 @@ CPU_GET_INFO( cdp1802 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(cdp1802_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 3; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1110,11 +1110,11 @@ CPU_GET_INFO( cdp1802 ) case CPUINFO_PTR_STATE_TABLE: info->state_table = &cpustate->state_table; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "CDP1802"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "RCA COSMAC"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "CDP1802"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "RCA COSMAC"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c", diff --git a/src/emu/cpu/cop400/cop400.c b/src/emu/cpu/cop400/cop400.c index 7400bfb2f59..90d32e97cab 100644 --- a/src/emu/cpu/cop400/cop400.c +++ b/src/emu/cpu/cop400/cop400.c @@ -1364,7 +1364,7 @@ static CPU_GET_INFO( cop400 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(cop400_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = (intf != NULL) ? intf->cki : 16; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1397,11 +1397,11 @@ static CPU_GET_INFO( cop400 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: /* set per-core */ break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP400"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "National Semiconductor COPS"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright MAME Team"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP400"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "National Semiconductor COPS"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright MAME Team"); break; } } @@ -1429,7 +1429,7 @@ CPU_GET_INFO( cop410 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_32b); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP410"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP410"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c", @@ -1450,7 +1450,7 @@ CPU_GET_INFO( cop411 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(cop411); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP411"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP411"); break; default: CPU_GET_INFO_CALL(cop410); break; } @@ -1466,7 +1466,7 @@ CPU_GET_INFO( cop401 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = NULL; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP401"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP401"); break; default: CPU_GET_INFO_CALL(cop410); break; } @@ -1492,7 +1492,7 @@ CPU_GET_INFO( cop420 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_64b); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP420"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP420"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c", @@ -1515,7 +1515,7 @@ CPU_GET_INFO( cop421 ) case CPUINFO_FCT_VALIDITY_CHECK: info->validity_check = CPU_VALIDITY_CHECK_NAME(cop421); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP421"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP421"); break; default: CPU_GET_INFO_CALL(cop420); break; } @@ -1531,7 +1531,7 @@ CPU_GET_INFO( cop422 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(cop422); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP422"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP422"); break; default: CPU_GET_INFO_CALL(cop421); break; } @@ -1547,7 +1547,7 @@ CPU_GET_INFO( cop402 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = NULL; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP402"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP402"); break; default: CPU_GET_INFO_CALL(cop420); break; } @@ -1573,7 +1573,7 @@ CPU_GET_INFO( cop444 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_128b); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP444"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP444"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c", @@ -1595,7 +1595,7 @@ CPU_GET_INFO( cop445 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(cop445); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP445"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP445"); break; default: CPU_GET_INFO_CALL(cop444); break; } @@ -1616,7 +1616,7 @@ CPU_GET_INFO( cop424 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_64b); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP424"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP424"); break; default: CPU_GET_INFO_CALL(cop444); break; } @@ -1632,7 +1632,7 @@ CPU_GET_INFO( cop425 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(cop425); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP425"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP425"); break; default: CPU_GET_INFO_CALL(cop424); break; } @@ -1648,7 +1648,7 @@ CPU_GET_INFO( cop426 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(cop426); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP426"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP426"); break; default: CPU_GET_INFO_CALL(cop424); break; } @@ -1664,7 +1664,7 @@ CPU_GET_INFO( cop404 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = NULL; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "COP404"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "COP404"); break; default: CPU_GET_INFO_CALL(cop444); break; } diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c index 0a6c3f5d4f0..7fe7f05d03e 100644 --- a/src/emu/cpu/cp1610/cp1610.c +++ b/src/emu/cpu/cp1610/cp1610.c @@ -3455,7 +3455,7 @@ CPU_GET_INFO( cp1610 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(cp1610_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -3501,11 +3501,11 @@ CPU_GET_INFO( cp1610 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "CP1610"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, ""); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, + case DEVINFO_STR_NAME: strcpy(info->s, "CP1610"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, ""); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Frank Palazzolo, all rights reserved."); break; case CPUINFO_STR_FLAGS: diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c index 56e18979b61..1940e90591a 100644 --- a/src/emu/cpu/cubeqcpu/cubeqcpu.c +++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c @@ -1887,7 +1887,7 @@ CPU_GET_INFO( cquestsnd ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(cquestsnd_state); break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 8; break; @@ -1921,11 +1921,11 @@ CPU_GET_INFO( cquestsnd ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Sound CPU");break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Cube Quest"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Sound CPU");break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Cube Quest"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "......."); break; case CPUINFO_STR_REGISTER + CQUESTSND_PC: sprintf(info->s, "PC: %02X", cpustate->pc); break; @@ -2005,7 +2005,7 @@ CPU_GET_INFO( cquestrot ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(cquestrot_state); break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 8; break; @@ -2037,11 +2037,11 @@ CPU_GET_INFO( cquestrot ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Rotate CPU");break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Cube Quest"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Rotate CPU");break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Cube Quest"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c", cpustate->cflag ? 'C' : '.', cpustate->vflag ? 'V' : '.', @@ -2123,7 +2123,7 @@ CPU_GET_INFO( cquestlin ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(cquestlin_state); break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 8; break; @@ -2155,11 +2155,11 @@ CPU_GET_INFO( cquestlin ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Line CPU"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Cube Quest"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Line CPU"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Cube Quest"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c|%cG", cpustate->cflag ? 'C' : '.', cpustate->vflag ? 'V' : '.', diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c index 26ba3cfb867..1fc853fa52d 100644 --- a/src/emu/cpu/dsp32/dsp32.c +++ b/src/emu/cpu/dsp32/dsp32.c @@ -742,7 +742,7 @@ CPU_GET_INFO( dsp32c ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(dsp32_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -831,11 +831,11 @@ CPU_GET_INFO( dsp32c ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "DSP32C"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Lucent DSP32"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Aaron Giles"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "DSP32C"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Lucent DSP32"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Aaron Giles"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c index 22ab1be1515..61dc138e7c1 100644 --- a/src/emu/cpu/dsp56k/dsp56k.c +++ b/src/emu/cpu/dsp56k/dsp56k.c @@ -396,7 +396,7 @@ CPU_GET_INFO( dsp56k ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(dsp56k_core); break; case CPUINFO_INT_INPUT_LINES: info->i = 4; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0x0000; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 2; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -493,11 +493,11 @@ CPU_GET_INFO( dsp56k ) info->internal_map16 = ADDRESS_MAP_NAME(dsp56156_program_map); break; // --- the following bits of info are returned as NULL-terminated strings --- - case CPUINFO_STR_NAME: strcpy(info->s, "DSP56156"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Motorola DSP56156"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "0.1"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Andrew Gardner"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "DSP56156"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Motorola DSP56156"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "0.1"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Andrew Gardner"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%s%s %s%s%s%s%s%s%s%s %s%s", diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c index d4ac0f31bdd..9b0f47fca8e 100644 --- a/src/emu/cpu/e132xs/e132xs.c +++ b/src/emu/cpu/e132xs/e132xs.c @@ -4855,7 +4855,7 @@ static CPU_GET_INFO( hyperstone ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(hyperstone_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 8; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -5004,10 +5004,10 @@ static CPU_GET_INFO( hyperstone ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_IO: info->internal_map16 = NULL; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Hyperstone CPU"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "0.9"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Pierpaolo Prazzoli and Ryan Holtz"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Hyperstone CPU"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "0.9"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Pierpaolo Prazzoli and Ryan Holtz"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c FTE:%X FRM:%X ILC:%d FL:%d FP:%d", @@ -5160,7 +5160,7 @@ CPU_GET_INFO( e116t ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e116t); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "E1-16T"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "E1-16T"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5181,7 +5181,7 @@ CPU_GET_INFO( e116xt ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e116xt); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "E1-16XT"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "E1-16XT"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5202,7 +5202,7 @@ CPU_GET_INFO( e116xs ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e116xs); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "E1-16XS"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "E1-16XS"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5223,7 +5223,7 @@ CPU_GET_INFO( e116xsr ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e116xsr); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "E1-16XSR"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "E1-16XSR"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5244,7 +5244,7 @@ CPU_GET_INFO( e132n ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132n); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "E1-32N"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "E1-32N"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5265,7 +5265,7 @@ CPU_GET_INFO( e132t ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132t); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "E1-32T"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "E1-32T"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5286,7 +5286,7 @@ CPU_GET_INFO( e132xn ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132xn); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "E1-32XN"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "E1-32XN"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5307,7 +5307,7 @@ CPU_GET_INFO( e132xt ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132xt); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "E1-32XT"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "E1-32XT"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5328,7 +5328,7 @@ CPU_GET_INFO( e132xs ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132xs); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "E1-32XS"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "E1-32XS"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5349,7 +5349,7 @@ CPU_GET_INFO( e132xsr ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132xsr); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "E1-32XSR"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "E1-32XSR"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5370,7 +5370,7 @@ CPU_GET_INFO( gms30c2116 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(gms30c2116); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "GMS30C2116"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "GMS30C2116"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5391,7 +5391,7 @@ CPU_GET_INFO( gms30c2132 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(gms30c2132); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "GMS30C2132"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "GMS30C2132"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5412,7 +5412,7 @@ CPU_GET_INFO( gms30c2216 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(gms30c2216); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "GMS30C2216"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "GMS30C2216"); break; default: CPU_GET_INFO_CALL(hyperstone); @@ -5433,7 +5433,7 @@ CPU_GET_INFO( gms30c2232 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(gms30c2232); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "GMS30C2232"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "GMS30C2232"); break; default: CPU_GET_INFO_CALL(hyperstone); diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c index c4fc697a166..c13895a8a87 100644 --- a/src/emu/cpu/esrip/esrip.c +++ b/src/emu/cpu/esrip/esrip.c @@ -1976,7 +1976,7 @@ CPU_GET_INFO( esrip ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(esrip_state); break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 8; break; @@ -1984,15 +1984,15 @@ CPU_GET_INFO( esrip ) case CPUINFO_INT_MIN_CYCLES: info->i = 1; break; case CPUINFO_INT_MAX_CYCLES: info->i = 1; break; - case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break; - case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 9; break; - case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -3; break; - case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break; - case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break; - case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break; - case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break; - case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break; - case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break; + case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break; + case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 9; break; + case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -3; break; + case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break; + case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break; case CPUINFO_INT_REGISTER: case CPUINFO_INT_PC: info->i = RIP_PC; break; @@ -2011,11 +2011,11 @@ CPU_GET_INFO( esrip ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Real Time Image Processor"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Entertainment Sciences"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Real Time Image Processor"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Entertainment Sciences"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Philip J Bennett"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c", cpustate->status & 0x80 ? '3' : '.', diff --git a/src/emu/cpu/f8/f8.c b/src/emu/cpu/f8/f8.c index 15be4041a3d..ec36ffcf305 100644 --- a/src/emu/cpu/f8/f8.c +++ b/src/emu/cpu/f8/f8.c @@ -2014,7 +2014,7 @@ CPU_GET_INFO( f8 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(f8_Regs); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -2126,11 +2126,11 @@ CPU_GET_INFO( f8 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "F8"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Fairchild F8"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, + case DEVINFO_STR_NAME: strcpy(info->s, "F8"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Fairchild F8"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c index 9d6dd998b17..8b4d0f46e11 100644 --- a/src/emu/cpu/g65816/g65816.c +++ b/src/emu/cpu/g65816/g65816.c @@ -421,7 +421,7 @@ CPU_GET_INFO( g65816 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(g65816i_cpu_struct); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -477,11 +477,11 @@ CPU_GET_INFO( g65816 ) case CPUINFO_FCT_READOP: info->readop = CPU_READOP_NAME(g65816); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "G65C816"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "6500"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Karl Stenerud, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "G65C816"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "6500"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Karl Stenerud, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/h6280/h6280.c b/src/emu/cpu/h6280/h6280.c index f8ebc308e9b..0d9237b9d29 100644 --- a/src/emu/cpu/h6280/h6280.c +++ b/src/emu/cpu/h6280/h6280.c @@ -433,7 +433,7 @@ CPU_GET_INFO( h6280 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(h6280_Regs); break; case CPUINFO_INT_INPUT_LINES: info->i = 3; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -494,11 +494,11 @@ CPU_GET_INFO( h6280 ) case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(h6280); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "HuC6280"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Hudsonsoft 6280"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.11"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Bryan McPhail, mish@tendril.co.uk"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "HuC6280"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Hudsonsoft 6280"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.11"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Bryan McPhail, mish@tendril.co.uk"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/h83002/h8_16.c b/src/emu/cpu/h83002/h8_16.c index e81758e7371..2ad719446a1 100644 --- a/src/emu/cpu/h83002/h8_16.c +++ b/src/emu/cpu/h83002/h8_16.c @@ -606,10 +606,10 @@ CPU_GET_INFO( h8_3002 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_IO: info->internal_map16 = NULL; break; // CPU misc parameters - case CPUINFO_STR_NAME: strcpy(info->s, "H8/3002"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_NAME: strcpy(info->s, "H8/3002"); break; + case DEVINFO_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; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_INPUT_LINES: info->i = 16; break; @@ -652,7 +652,7 @@ CPU_GET_INFO( h8_3044 ) { case CPUINFO_PTR_INTERNAL_MEMORY_MAP_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 DEVINFO_STR_NAME: strcpy(info->s, "H8/3044"); break; default: CPU_GET_INFO_CALL(h8_3002); } @@ -664,7 +664,7 @@ CPU_GET_INFO( h8_3007 ) { case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map16 = address_map_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 DEVINFO_STR_NAME: strcpy(info->s, "H8/3007"); 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 61c9134b4d8..e754c0c4d74 100644 --- a/src/emu/cpu/h83002/h8_8.c +++ b/src/emu/cpu/h83002/h8_8.c @@ -757,10 +757,10 @@ CPU_GET_INFO( h8_3334 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_IO: info->internal_map16 = NULL; break; // CPU misc parameters - case CPUINFO_STR_NAME: strcpy(info->s, "H8/3334"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_NAME: strcpy(info->s, "H8/3334"); break; + case DEVINFO_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; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_INPUT_LINES: info->i = 16; break; diff --git a/src/emu/cpu/hd6309/hd6309.c b/src/emu/cpu/hd6309/hd6309.c index fe35e891920..de571cd9390 100644 --- a/src/emu/cpu/hd6309/hd6309.c +++ b/src/emu/cpu/hd6309/hd6309.c @@ -1266,7 +1266,7 @@ CPU_GET_INFO( hd6309 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m68_state_t); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 4; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1317,11 +1317,11 @@ CPU_GET_INFO( hd6309 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &m68_state->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "HD6309"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Hitachi 6309"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.01"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright John Butler and Tim Lindner"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "HD6309"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Hitachi 6309"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.01"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright John Butler and Tim Lindner"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c (MD:%c%c%c%c)", diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c index 874fd94342d..0bf9d3bfb67 100644 --- a/src/emu/cpu/i386/i386.c +++ b/src/emu/cpu/i386/i386.c @@ -854,7 +854,7 @@ CPU_GET_INFO( i386 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(i386_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 32; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -970,11 +970,11 @@ CPU_GET_INFO( i386 ) case CPUINFO_FCT_DEBUG_INIT: info->debug_init = CPU_DEBUG_INIT_NAME(i386); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "I386"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Intel 386"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Ville Linde"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "I386"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel 386"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Ville Linde"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%08X", get_flags(cpustate)); break; @@ -1153,8 +1153,8 @@ CPU_GET_INFO( i486 ) case CPUINFO_INT_REGISTER + X87_ST6: info->i = ST(6).f; break; case CPUINFO_INT_REGISTER + X87_ST7: info->i = ST(7).f; break; - case CPUINFO_STR_NAME: strcpy(info->s, "I486"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Intel 486"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "I486"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel 486"); break; case CPUINFO_STR_REGISTER + X87_CTRL: sprintf(info->s, "FPU_CW: %04X", cpustate->fpu_control_word); break; case CPUINFO_STR_REGISTER + X87_STATUS: sprintf(info->s, "FPU_SW: %04X", cpustate->fpu_status_word); break; case CPUINFO_STR_REGISTER + X87_ST0: sprintf(info->s, "ST0: %f", ST(0).f); break; @@ -1284,8 +1284,8 @@ CPU_GET_INFO( pentium ) case CPUINFO_INT_REGISTER + X87_ST6: info->i = ST(6).f; break; case CPUINFO_INT_REGISTER + X87_ST7: info->i = ST(7).f; break; - case CPUINFO_STR_NAME: strcpy(info->s, "PENTIUM"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Intel Pentium"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PENTIUM"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel Pentium"); break; case CPUINFO_STR_REGISTER + X87_CTRL: sprintf(info->s, "FPU_CW: %04X", cpustate->fpu_control_word); break; case CPUINFO_STR_REGISTER + X87_STATUS: sprintf(info->s, "FPU_SW: %04X", cpustate->fpu_status_word); break; case CPUINFO_STR_REGISTER + X87_ST0: sprintf(info->s, "ST0: %f", ST(0).f); break; @@ -1415,8 +1415,8 @@ CPU_GET_INFO( mediagx ) case CPUINFO_INT_REGISTER + X87_ST6: info->i = ST(6).f; break; case CPUINFO_INT_REGISTER + X87_ST7: info->i = ST(7).f; break; - case CPUINFO_STR_NAME: strcpy(info->s, "MEDIAGX"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Cyrix MediaGX"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "MEDIAGX"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Cyrix MediaGX"); break; case CPUINFO_STR_REGISTER + X87_CTRL: sprintf(info->s, "FPU_CW: %04X", cpustate->fpu_control_word); break; case CPUINFO_STR_REGISTER + X87_STATUS: sprintf(info->s, "FPU_SW: %04X", cpustate->fpu_status_word); break; case CPUINFO_STR_REGISTER + X87_ST0: sprintf(info->s, "ST0: %f", ST(0).f); break; diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c index 8c07a9d0d68..886739a5ea5 100644 --- a/src/emu/cpu/i8085/i8085.c +++ b/src/emu/cpu/i8085/i8085.c @@ -1710,7 +1710,7 @@ CPU_GET_INFO( i8085 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(i8085_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 4; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 2; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1739,11 +1739,11 @@ CPU_GET_INFO( i8085 ) case CPUINFO_PTR_STATE_TABLE: info->state_table = &cpustate->state; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "8085A"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Intel 8080"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.1"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "8085A"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel 8080"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.1"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", @@ -1776,7 +1776,7 @@ CPU_GET_INFO( i8080 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i8080); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "8080"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "8080"); break; default: CPU_GET_INFO_CALL(i8085); break; } diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c index 07403ea0c6f..a099f430fa5 100644 --- a/src/emu/cpu/i86/i286.c +++ b/src/emu/cpu/i86/i286.c @@ -385,7 +385,7 @@ CPU_GET_INFO( i80286 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(i80286_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -447,11 +447,11 @@ CPU_GET_INFO( i80286 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "80286"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Intel 80286"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.4"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Real mode i286 emulator v1.4 by Fabrice Frances\n(initial work cpustate->based on David Hedley's pcemu)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "80286"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel 80286"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.4"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Real mode i286 emulator v1.4 by Fabrice Frances\n(initial work cpustate->based on David Hedley's pcemu)"); break; case CPUINFO_STR_FLAGS: cpustate->flags = CompressFlags(); diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c index 8e989672796..652564dc45d 100644 --- a/src/emu/cpu/i86/i86.c +++ b/src/emu/cpu/i86/i86.c @@ -520,7 +520,7 @@ CPU_GET_INFO( i8086 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(i8086_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -560,11 +560,11 @@ CPU_GET_INFO( i8086 ) case CPUINFO_FCT_EXPORT_STRING: info->export_string = CPU_EXPORT_STRING_NAME(i8086);break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "8086"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Intel 80x86"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.4"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Real mode i286 emulator v1.4 by Fabrice Frances\n(initial work cpustate->based on David Hedley's pcemu)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "8086"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel 80x86"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.4"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Real mode i286 emulator v1.4 by Fabrice Frances\n(initial work cpustate->based on David Hedley's pcemu)"); break; case CPUINFO_STR_FLAGS: cpustate->flags = CompressFlags(); @@ -606,7 +606,7 @@ CPU_GET_INFO( i8088 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i8088); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "8088"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "8088"); break; default: CPU_GET_INFO_CALL(i8086); break; } @@ -629,7 +629,7 @@ CPU_GET_INFO( i80186 ) case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(i80186);break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "80186"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "80186"); break; default: CPU_GET_INFO_CALL(i8086); break; } @@ -653,7 +653,7 @@ CPU_GET_INFO( i80188 ) case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(i80186);break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "80188"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "80188"); break; default: CPU_GET_INFO_CALL(i8086); break; } diff --git a/src/emu/cpu/i860/i860.c b/src/emu/cpu/i860/i860.c index d88e441e4dd..eabf5f62768 100644 --- a/src/emu/cpu/i860/i860.c +++ b/src/emu/cpu/i860/i860.c @@ -183,7 +183,7 @@ CPU_GET_INFO( i860 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(i860_state_t); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0x00000000; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -295,11 +295,11 @@ CPU_GET_INFO( i860 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "i860XR"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Intel i860"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "0.1"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Jason Eckhardt"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "i860XR"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel i860"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "0.1"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Jason Eckhardt"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, ""); break; diff --git a/src/emu/cpu/i960/i960.c b/src/emu/cpu/i960/i960.c index 75d1197a6f6..632737cec63 100644 --- a/src/emu/cpu/i960/i960.c +++ b/src/emu/cpu/i960/i960.c @@ -2161,10 +2161,10 @@ CPU_GET_INFO( i960 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_IO: info->internal_map32 = NULL;break; // CPU misc parameters - case CPUINFO_STR_NAME: strcpy(info->s, "i960KB"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_NAME: strcpy(info->s, "i960KB"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; case CPUINFO_STR_FLAGS: strcpy(info->s, i960_get_strflags(i960)); break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_INPUT_LINES: info->i = 4; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = -1; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c index aea65b19f00..d524d64ed06 100644 --- a/src/emu/cpu/jaguar/jaguar.c +++ b/src/emu/cpu/jaguar/jaguar.c @@ -1518,7 +1518,7 @@ CPU_GET_INFO( jaguargpu ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(jaguar_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 5; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -1587,11 +1587,11 @@ CPU_GET_INFO( jaguargpu ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &jaguar->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Jaguar GPU"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Atari Jaguar"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Jaguar GPU"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Atari Jaguar"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c", jaguar->FLAGS & 0x8000 ? 'D':'.', @@ -1678,7 +1678,7 @@ CPU_GET_INFO( jaguardsp ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(jaguardsp);break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Jaguar DSP"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Jaguar DSP"); break; default: CPU_GET_INFO_CALL(jaguargpu); break; } diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c index 411636cbb80..7996844851f 100644 --- a/src/emu/cpu/konami/konami.c +++ b/src/emu/cpu/konami/konami.c @@ -554,7 +554,7 @@ CPU_GET_INFO( konami ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(konami_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -601,11 +601,11 @@ CPU_GET_INFO( konami ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "KONAMI"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "KONAMI 5000x"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "KONAMI"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "KONAMI 5000x"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/emu/cpu/lh5801/lh5801.c index cb2a44eefc6..12f49533ac7 100644 --- a/src/emu/cpu/lh5801/lh5801.c +++ b/src/emu/cpu/lh5801/lh5801.c @@ -191,7 +191,7 @@ CPU_GET_INFO( lh5801 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(lh5801_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -239,11 +239,11 @@ CPU_GET_INFO( lh5801 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "LH5801"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "LH5801"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0alpha"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Peter Trauner, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "LH5801"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "LH5801"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0alpha"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Peter Trauner, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%s%s%s%s%s%s%s%s", diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/emu/cpu/lr35902/lr35902.c index 08e2550baa3..ca8e12ab369 100644 --- a/src/emu/cpu/lr35902/lr35902.c +++ b/src/emu/cpu/lr35902/lr35902.c @@ -423,7 +423,7 @@ CPU_GET_INFO( lr35902 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(lr35902_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 5; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -471,11 +471,11 @@ CPU_GET_INFO( lr35902 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->w.icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "LR35902"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Sharp LR35902"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.4"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright The MESS Team."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "LR35902"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Sharp LR35902"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.4"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright The MESS Team."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/m37710/m37710.c b/src/emu/cpu/m37710/m37710.c index 6bad5319737..dc9a6a7a7fc 100644 --- a/src/emu/cpu/m37710/m37710.c +++ b/src/emu/cpu/m37710/m37710.c @@ -1021,7 +1021,7 @@ CPU_GET_INFO( m37710 ) /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m37710i_cpu_struct); break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1078,11 +1078,11 @@ CPU_GET_INFO( m37710 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_IO: info->internal_map8 = NULL; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M37710"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "M7700"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.2"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright R. Belmont, based on G65816 by Karl Stenerud"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M37710"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "M7700"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.2"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright R. Belmont, based on G65816 by Karl Stenerud"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", @@ -1122,7 +1122,7 @@ CPU_GET_INFO( m37710 ) // 37702 is identical except with an internal ROM, so just change the name CPU_GET_INFO( m37702 ) { - if (state == CPUINFO_STR_NAME) + if (state == DEVINFO_STR_NAME) { strcpy(info->s, "M37702"); return; diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c index e8554645445..60d9f8f7841 100644 --- a/src/emu/cpu/m6502/m4510.c +++ b/src/emu/cpu/m6502/m4510.c @@ -463,7 +463,7 @@ CPU_GET_INFO( m4510 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m4510_Regs); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -521,15 +521,15 @@ CPU_GET_INFO( m4510 ) case CPUINFO_FCT_BURN: info->burn = NULL; break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m4510); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; - case CPUINFO_PTR_INTERNAL_MEMORY_MAP: info->internal_map8 = ADDRESS_MAP_NAME(m4510_mem); break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m4510_mem); break; case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(m4510); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M4510"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "CBM Semiconductor Group CSG 65CE02"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0beta"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Peter Trauner\nall rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M4510"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "CBM Semiconductor Group CSG 65CE02"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0beta"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Peter Trauner\nall rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c index 5e23a6e419b..7ca86454d4b 100644 --- a/src/emu/cpu/m6502/m6502.c +++ b/src/emu/cpu/m6502/m6502.c @@ -699,7 +699,7 @@ CPU_GET_INFO( m6502 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m6502_Regs); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -746,11 +746,11 @@ CPU_GET_INFO( m6502 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6502"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Mostek 6502"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.2"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6502"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Mostek 6502"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.2"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", @@ -788,7 +788,7 @@ CPU_GET_INFO( n2a03 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(n2a03); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "N2A03"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "N2A03"); break; default: CPU_GET_INFO_CALL(m6502); break; } @@ -818,10 +818,10 @@ CPU_GET_INFO( m6510 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m6510); break; case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(m6510); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6510); break; - case CPUINFO_PTR_INTERNAL_MEMORY_MAP: info->internal_map8 = ADDRESS_MAP_NAME(m6510_mem); break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m6510_mem); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6510"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6510"); break; /* --- the following bits of info are set as 64-bit signed integers --- */ case CPUINFO_INT_M6510_PORT: info->i = m6510_get_port(cpustate); break; @@ -840,7 +840,7 @@ CPU_GET_INFO( m6510t ) switch (state) { /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6510T"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6510T"); break; default: CPU_GET_INFO_CALL(m6510); break; } @@ -856,7 +856,7 @@ CPU_GET_INFO( m7501 ) switch (state) { /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M7501"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M7501"); break; default: CPU_GET_INFO_CALL(m6510); break; } @@ -872,7 +872,7 @@ CPU_GET_INFO( m8502 ) switch (state) { /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M8502"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M8502"); break; default: CPU_GET_INFO_CALL(m6510); break; } @@ -908,7 +908,7 @@ CPU_GET_INFO( m65c02 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m65c02); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M65C02"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M65C02"); break; default: CPU_GET_INFO_CALL(m6502); break; } @@ -928,11 +928,11 @@ CPU_GET_INFO( m65sc02 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m65sc02); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M65SC02"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Metal Oxid Semiconductor MOS 6502"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0beta"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Peter Trauner\nall rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M65SC02"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Metal Oxid Semiconductor MOS 6502"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0beta"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Peter Trauner\nall rights reserved."); break; default: CPU_GET_INFO_CALL(m65c02); break; } @@ -974,11 +974,11 @@ CPU_GET_INFO( deco16 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(deco16); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "DECO CPU16"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "DECO"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "0.1"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Bryan McPhail\nall rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "DECO CPU16"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "DECO"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "0.1"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Bryan McPhail\nall rights reserved."); break; default: CPU_GET_INFO_CALL(m6502); break; } diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c index fca8cd9067f..8330c2ad89d 100644 --- a/src/emu/cpu/m6502/m6509.c +++ b/src/emu/cpu/m6502/m6509.c @@ -338,7 +338,7 @@ CPU_GET_INFO( m6509 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m6509_Regs); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -384,14 +384,14 @@ CPU_GET_INFO( m6509 ) case CPUINFO_FCT_BURN: info->burn = NULL; break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6502); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; - case CPUINFO_PTR_INTERNAL_MEMORY_MAP: info->internal_map8 = ADDRESS_MAP_NAME(m6509_mem); break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m6509_mem); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6509"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "MOS Technology 6509"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0beta"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Peter Trauner\nall rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6509"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "MOS Technology 6509"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0beta"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\nCopyright Peter Trauner\nall rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c index 73080050b6e..7993e3e353d 100644 --- a/src/emu/cpu/m6502/m65ce02.c +++ b/src/emu/cpu/m6502/m65ce02.c @@ -283,7 +283,7 @@ CPU_GET_INFO( m65ce02 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m65ce02_Regs); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -332,11 +332,11 @@ CPU_GET_INFO( m65ce02 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M65CE02"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s,"CBM Semiconductor Group CSG 65CE02"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s,"1.0beta"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s,__FILE__); - case CPUINFO_STR_CORE_CREDITS: + case DEVINFO_STR_NAME: strcpy(info->s, "M65CE02"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s,"CBM Semiconductor Group CSG 65CE02"); break; + case DEVINFO_STR_VERSION: strcpy(info->s,"1.0beta"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s,__FILE__); + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller\n" "Copyright Peter Trauner\n" "all rights reserved."); break; diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c index acb5f05ee31..be89d658e6c 100644 --- a/src/emu/cpu/m6800/m6800.c +++ b/src/emu/cpu/m6800/m6800.c @@ -2678,7 +2678,7 @@ CPU_GET_INFO( m6800 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m6800_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -2723,11 +2723,11 @@ CPU_GET_INFO( m6800 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6800"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Motorola 6800"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.1"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "The MAME team."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6800"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Motorola 6800"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.1"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "The MAME team."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", @@ -2771,7 +2771,7 @@ CPU_GET_INFO( m6801 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6801); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6801"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6801"); break; default: CPU_GET_INFO_CALL(m6800); break; } @@ -2794,7 +2794,7 @@ CPU_GET_INFO( m6802 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6802); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6802"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6802"); break; default: CPU_GET_INFO_CALL(m6800); break; } @@ -2822,7 +2822,7 @@ CPU_GET_INFO( m6803 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m6803_mem); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6803"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6803"); break; default: CPU_GET_INFO_CALL(m6800); break; } @@ -2845,7 +2845,7 @@ CPU_GET_INFO( m6808 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6808); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6808"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6808"); break; default: CPU_GET_INFO_CALL(m6800); break; } @@ -2871,7 +2871,7 @@ CPU_GET_INFO( hd63701 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(hd63701); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "HD63701"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "HD63701"); break; default: CPU_GET_INFO_CALL(m6800); break; } @@ -2895,7 +2895,7 @@ CPU_GET_INFO( nsc8105 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(nsc8105); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "NSC8105"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "NSC8105"); break; default: CPU_GET_INFO_CALL(m6800); break; } diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c index 4d3655f2bed..fbf4a52dcc7 100644 --- a/src/emu/cpu/m68000/m68kcpu.c +++ b/src/emu/cpu/m68000/m68kcpu.c @@ -780,7 +780,7 @@ static CPU_GET_INFO( m68k ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m68ki_cpu_core); break; case CPUINFO_INT_INPUT_LINES: info->i = 8; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = -1; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -815,11 +815,11 @@ static CPU_GET_INFO( m68k ) case CPUINFO_PTR_STATE_TABLE: info->state_table = &m68k->state; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: /* set per-core */ break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Motorola 68K"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "4.00"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Karl Stenerud. All rights reserved. (2.1 fixes HJB)"); break; + case DEVINFO_STR_NAME: /* set per-core */ break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Motorola 68K"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "4.00"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Karl Stenerud. All rights reserved. (2.1 fixes HJB)"); break; case CPUINFO_STR_FLAGS: sr = m68ki_get_sr(m68k); @@ -1045,7 +1045,7 @@ CPU_GET_INFO( m68000 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68000); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "68000"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "68000"); break; default: CPU_GET_INFO_CALL(m68k); break; } @@ -1092,7 +1092,7 @@ CPU_GET_INFO( m68008 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68008); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "68008"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "68008"); break; default: CPU_GET_INFO_CALL(m68k); break; } @@ -1135,7 +1135,7 @@ CPU_GET_INFO( m68010 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68010); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "68010"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "68010"); break; default: CPU_GET_INFO_CALL(m68k); break; } @@ -1189,7 +1189,7 @@ CPU_GET_INFO( m68020 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68020); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "68020"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "68020"); break; case CPUINFO_STR_FLAGS: sr = m68ki_get_sr(m68k); @@ -1256,7 +1256,7 @@ CPU_GET_INFO( m68ec020 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68ec020); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "68EC020"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "68EC020"); break; default: CPU_GET_INFO_CALL(m68020); break; } @@ -1309,7 +1309,7 @@ CPU_GET_INFO( m68040 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68040); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "68040"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "68040"); break; case CPUINFO_STR_FLAGS: sr = m68ki_get_sr(m68k); @@ -1352,7 +1352,7 @@ CPU_GET_INFO( scc68070 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68000); break; //todo /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "SCC68070"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "SCC68070"); break; default: CPU_GET_INFO_CALL(m68k); break; } diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c index 2da5823b295..c7134267cb1 100644 --- a/src/emu/cpu/m6805/m6805.c +++ b/src/emu/cpu/m6805/m6805.c @@ -915,7 +915,7 @@ CPU_GET_INFO( m6805 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m6805_Regs); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 4; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -956,11 +956,11 @@ CPU_GET_INFO( m6805 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->iCount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6805"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Motorola 6805"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "The MAME team."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6805"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Motorola 6805"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "The MAME team."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", @@ -1014,7 +1014,7 @@ CPU_GET_INFO( m68705 ) case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(m68705); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M68705"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M68705"); break; default: CPU_GET_INFO_CALL(m6805); break; } @@ -1071,9 +1071,9 @@ CPU_GET_INFO( hd63705 ) case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(hd63705); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "HD63705"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Keith Wilkins, Juergen Buchmueller"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "HD63705"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Keith Wilkins, Juergen Buchmueller"); break; default: CPU_GET_INFO_CALL(m6805); break; } diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c index 56d1f5e182a..5876353f9f5 100644 --- a/src/emu/cpu/m6809/m6809.c +++ b/src/emu/cpu/m6809/m6809.c @@ -1109,7 +1109,7 @@ CPU_GET_INFO( m6809 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(m68_state_t); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1156,11 +1156,11 @@ CPU_GET_INFO( m6809 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &m68_state->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6809"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Motorola 6809"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.11"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright John Butler"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6809"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Motorola 6809"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.11"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright John Butler"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", @@ -1200,7 +1200,7 @@ CPU_GET_INFO( m6809e ) case CPUINFO_INT_CLOCK_DIVIDER: info->i = 4; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "M6809E"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "M6809E"); break; default: CPU_GET_INFO_CALL(m6809); break; } diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c index c03e7aa8344..f719b044ea7 100644 --- a/src/emu/cpu/mb86233/mb86233.c +++ b/src/emu/cpu/mb86233/mb86233.c @@ -1626,7 +1626,7 @@ CPU_GET_INFO( mb86233 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(mb86233_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -1686,11 +1686,11 @@ CPU_GET_INFO( mb86233 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "MB86233"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Fujitsu MB86233"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Miguel Angel Horna and Ernesto Corvi"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "MB86233"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Fujitsu MB86233"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Miguel Angel Horna and Ernesto Corvi"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c", (GETSR()&SIGN_FLAG) ? 'N' : 'n', (GETSR()&ZERO_FLAG) ? 'Z' : 'z' ); diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c index e9c24be87a2..0fc48de7d47 100644 --- a/src/emu/cpu/mb88xx/mb88xx.c +++ b/src/emu/cpu/mb88xx/mb88xx.c @@ -934,7 +934,7 @@ CPU_GET_INFO( mb88 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(mb88_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 6; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -990,11 +990,11 @@ CPU_GET_INFO( mb88 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "MB88xx"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Fujitsu MB88xx"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Ernesto Corvi"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "MB88xx"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Fujitsu MB88xx"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Ernesto Corvi"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c", @@ -1042,7 +1042,7 @@ CPU_GET_INFO( mb8841 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "MB8841"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "MB8841"); break; default: CPU_GET_INFO_CALL(mb88); break; } @@ -1061,7 +1061,7 @@ CPU_GET_INFO( mb8842 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "MB8842"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "MB8842"); break; default: CPU_GET_INFO_CALL(mb88); break; } @@ -1080,7 +1080,7 @@ CPU_GET_INFO( mb8843 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_6bit); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "MB8843"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "MB8843"); break; default: CPU_GET_INFO_CALL(mb88); break; } @@ -1099,7 +1099,7 @@ CPU_GET_INFO( mb8844 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_6bit); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "MB8844"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "MB8844"); break; default: CPU_GET_INFO_CALL(mb88); break; } diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c index 8e3c585a113..306e17ee7c7 100644 --- a/src/emu/cpu/mc68hc11/mc68hc11.c +++ b/src/emu/cpu/mc68hc11/mc68hc11.c @@ -545,7 +545,7 @@ CPU_GET_INFO( mc68hc11 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(hc11_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -586,11 +586,11 @@ CPU_GET_INFO( mc68hc11 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "MC68HC11"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Motorola MC68HC11"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Ville Linde"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "MC68HC11"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Motorola MC68HC11"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Ville Linde"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c index c41d023c34f..dcd21e1dd15 100644 --- a/src/emu/cpu/mcs48/mcs48.c +++ b/src/emu/cpu/mcs48/mcs48.c @@ -1374,7 +1374,7 @@ static CPU_GET_INFO( mcs48 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(mcs48_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = MCS48_INPUT_IRQ; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 3*5; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1411,11 +1411,11 @@ static CPU_GET_INFO( mcs48 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: /* set per-core */ break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: /* set per-core */ break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Intel 8039"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.2"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Mirko Buffoni\nBased on the original work Copyright Dan Boris"); break; + case DEVINFO_STR_NAME: /* set per-core */ break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Intel 8039"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.2"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Mirko Buffoni\nBased on the original work Copyright Dan Boris"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c %c%c%c%c%c%c%c%c", @@ -1502,7 +1502,7 @@ static void mcs48_generic_get_info(const device_config *device, UINT32 state, cp break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: + case DEVINFO_STR_NAME: strcpy(info->s, name); break; diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/emu/cpu/mcs51/mcs51.c index fe2c985e306..2d735f26d44 100644 --- a/src/emu/cpu/mcs51/mcs51.c +++ b/src/emu/cpu/mcs51/mcs51.c @@ -2482,7 +2482,7 @@ static CPU_GET_INFO( mcs51 ) /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(mcs51_state_t); break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 12; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -2537,11 +2537,11 @@ static CPU_GET_INFO( mcs51 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = NULL; break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP_IO: info->internal_map8 = NULL; break; - case CPUINFO_STR_NAME: strcpy(info->s, "I8051"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "MCS-51"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Steve Ellenoff"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "I8051"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "MCS-51"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Steve Ellenoff"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", @@ -2584,7 +2584,7 @@ CPU_GET_INFO( i8031 ) switch (state) { case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break; - case CPUINFO_STR_NAME: strcpy(info->s, "I8031"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "I8031"); break; default: CPU_GET_INFO_CALL(mcs51); break; } /* --- the following bits of info are returned as NULL-terminated strings --- */ @@ -2596,7 +2596,7 @@ CPU_GET_INFO( i8051 ) { case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_12bit); break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break; - case CPUINFO_STR_NAME: strcpy(info->s, "I8051"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "I8051"); break; default: CPU_GET_INFO_CALL(mcs51); break; } /* --- the following bits of info are returned as NULL-terminated strings --- */ @@ -2609,7 +2609,7 @@ CPU_GET_INFO( i8032 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i8052); break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP_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 DEVINFO_STR_NAME: strcpy(info->s, "I8032"); break; default: CPU_GET_INFO_CALL(mcs51); break; } } @@ -2622,7 +2622,7 @@ CPU_GET_INFO( i8052 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_13bit); break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP_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 DEVINFO_STR_NAME: strcpy(info->s, "I8052"); break; default: CPU_GET_INFO_CALL(mcs51); break; } } @@ -2633,7 +2633,7 @@ CPU_GET_INFO( i8751 ) { case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_12bit); break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break; - case CPUINFO_STR_NAME: strcpy(info->s, "I8751"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "I8751"); break; default: CPU_GET_INFO_CALL(mcs51); break; } } @@ -2646,7 +2646,7 @@ CPU_GET_INFO( i8752 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_13bit); break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP_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 DEVINFO_STR_NAME: strcpy(info->s, "I8752"); break; default: CPU_GET_INFO_CALL(mcs51); break; } } @@ -2665,7 +2665,7 @@ CPU_GET_INFO( i80c31 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = NULL; break; case CPUINFO_PTR_INTERNAL_MEMORY_MAP_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 DEVINFO_STR_NAME: strcpy(info->s, "I80C31"); break; default: CPU_GET_INFO_CALL(i8031); break; } } @@ -2676,7 +2676,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 DEVINFO_STR_NAME: strcpy(info->s, "I80C51"); break; default: CPU_GET_INFO_CALL(i8051); break; } } @@ -2687,7 +2687,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 DEVINFO_STR_NAME: strcpy(info->s, "I80C32"); break; default: CPU_GET_INFO_CALL(i8032); break; } } @@ -2697,7 +2697,7 @@ CPU_GET_INFO( i80c52 ) switch (state) { case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c52); break; - case CPUINFO_STR_NAME: strcpy(info->s, "I80C52"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "I80C52"); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c52); break; default: CPU_GET_INFO_CALL(i8052); break; } @@ -2708,7 +2708,7 @@ CPU_GET_INFO( i87c51 ) switch (state) { case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c51); break; - case CPUINFO_STR_NAME: strcpy(info->s, "I87C51"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "I87C51"); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c51); break; default: CPU_GET_INFO_CALL(i8751); break; } @@ -2719,7 +2719,7 @@ CPU_GET_INFO( i87c52 ) switch (state) { case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c52); break; - case CPUINFO_STR_NAME: strcpy(info->s, "I87C52"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "I87C52"); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c52); break; default: CPU_GET_INFO_CALL(i8752); break; } @@ -2734,7 +2734,7 @@ CPU_GET_INFO( at89c4051 ) switch (state) { case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c51); break; - case CPUINFO_STR_NAME: strcpy(info->s, "AT89C4051"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "AT89C4051"); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c51); break; default: CPU_GET_INFO_CALL(i8051); break; } @@ -2745,11 +2745,11 @@ CPU_GET_INFO( ds5002fp ) switch (state) { case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(ds5002fp); break; - case CPUINFO_STR_NAME: strcpy(info->s, "DS5002FP"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Dallas"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Manuel Abadia"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "DS5002FP"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Dallas"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Manuel Abadia"); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(ds5002fp); break; default: CPU_GET_INFO_CALL(i8051); break; } diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c index 7dd54e92621..28be912102c 100644 --- a/src/emu/cpu/minx/minx.c +++ b/src/emu/cpu/minx/minx.c @@ -318,7 +318,7 @@ CPU_GET_INFO( minx ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(minx_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0x00; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -360,11 +360,11 @@ CPU_GET_INFO( minx ) case CPUINFO_FCT_BURN: info->burn = CPU_BURN_NAME(minx); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(minx); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &minx->icount; break; - case CPUINFO_STR_NAME: strcpy( info->s, "Minx" ); break; - case CPUINFO_STR_CORE_FAMILY: strcpy( info->s, "Nintendo Minx" ); break; - case CPUINFO_STR_CORE_VERSION: strcpy( info->s, "0.1" ); break; - case CPUINFO_STR_CORE_FILE: strcpy( info->s, __FILE__ ); break; - case CPUINFO_STR_CORE_CREDITS: strcpy( info->s, "Copyright The MESS Team." ); break; + case DEVINFO_STR_NAME: strcpy( info->s, "Minx" ); break; + case DEVINFO_STR_FAMILY: strcpy( info->s, "Nintendo Minx" ); break; + case DEVINFO_STR_VERSION: strcpy( info->s, "0.1" ); break; + case DEVINFO_STR_SOURCE_FILE: strcpy( info->s, __FILE__ ); break; + case DEVINFO_STR_CREDITS: strcpy( info->s, "Copyright The MESS Team." ); break; case CPUINFO_STR_FLAGS: sprintf( info->s, "%c%c%c%c%c%c%c%c-%c%c%c%c%c", minx->F & FLAG_I ? 'I' : '.', diff --git a/src/emu/cpu/mips/mips3.c b/src/emu/cpu/mips/mips3.c index be58d00e8b7..62c6629643d 100644 --- a/src/emu/cpu/mips/mips3.c +++ b/src/emu/cpu/mips/mips3.c @@ -2121,7 +2121,7 @@ static CPU_GET_INFO( mips3 ) case CPUINFO_FCT_TRANSLATE: info->translate = CPU_GET_TRANSLATE_NAME(mips3); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; /* --- everything else is handled generically --- */ default: mips3com_get_info(&mips3.core, state, info); break; @@ -2153,13 +2153,13 @@ CPU_GET_INFO( r4600be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4600be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R4600 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R4600 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2171,13 +2171,13 @@ CPU_GET_INFO( r4600le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4600le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R4600 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R4600 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2209,13 +2209,13 @@ CPU_GET_INFO( r4650be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4650be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "IDT R4650 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "IDT R4650 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2227,13 +2227,13 @@ CPU_GET_INFO( r4650le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4650le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "IDT R4650 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "IDT R4650 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2265,13 +2265,13 @@ CPU_GET_INFO( r4700be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4700be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R4700 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R4700 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2284,13 +2284,13 @@ CPU_GET_INFO( r4700le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4700le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R4700 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R4700 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2322,13 +2322,13 @@ CPU_GET_INFO( r5000be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r5000be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R5000 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R5000 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2340,13 +2340,13 @@ CPU_GET_INFO( r5000le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r5000le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R5000 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R5000 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2378,13 +2378,13 @@ CPU_GET_INFO( qed5271be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(qed5271be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "QED5271 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "QED5271 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2396,13 +2396,13 @@ CPU_GET_INFO( qed5271le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(qed5271le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "QED5271 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "QED5271 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2434,13 +2434,13 @@ CPU_GET_INFO( rm7000be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(rm7000be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "RM7000 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "RM7000 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -2452,13 +2452,13 @@ CPU_GET_INFO( rm7000le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(rm7000le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "RM7000 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "RM7000 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; diff --git a/src/emu/cpu/mips/mips3com.c b/src/emu/cpu/mips/mips3com.c index 8aaf2485010..0d7d15db711 100644 --- a/src/emu/cpu/mips/mips3com.c +++ b/src/emu/cpu/mips/mips3com.c @@ -449,7 +449,7 @@ void mips3com_get_info(mips3_state *mips, UINT32 state, cpuinfo *info) case CPUINFO_INT_CONTEXT_SIZE: /* provided by core */ break; case CPUINFO_INT_INPUT_LINES: info->i = 6; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = mips->bigendian ? ENDIANNESS_BIG : ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = mips->bigendian ? ENDIANNESS_BIG : ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -535,11 +535,11 @@ void mips3com_get_info(mips3_state *mips, UINT32 state, cpuinfo *info) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &mips->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "MIPS III"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "MIPS III"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "3.0"); break; - case CPUINFO_STR_CORE_FILE: /* provided by core */ break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "MIPS III"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "MIPS III"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "3.0"); break; + case DEVINFO_STR_SOURCE_FILE: /* provided by core */ break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; diff --git a/src/emu/cpu/mips/mips3drc.c b/src/emu/cpu/mips/mips3drc.c index cc64f9808a0..9544e42952d 100644 --- a/src/emu/cpu/mips/mips3drc.c +++ b/src/emu/cpu/mips/mips3drc.c @@ -620,7 +620,7 @@ static CPU_GET_INFO( mips3 ) case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(mips3); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; /* --- everything else is handled generically --- */ default: mips3com_get_info(mips3, state, info); break; @@ -3691,13 +3691,13 @@ CPU_GET_INFO( vr4300be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(vr4300be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "VR4300 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "VR4300 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3709,13 +3709,13 @@ CPU_GET_INFO( vr4300le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(vr4300le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "VR4300 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "VR4300 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3728,13 +3728,13 @@ CPU_GET_INFO( vr4310be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(vr4300be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "VR4310 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "VR4310 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3746,13 +3746,13 @@ CPU_GET_INFO( vr4310le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(vr4300le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "VR4310 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "VR4310 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3779,13 +3779,13 @@ CPU_GET_INFO( r4600be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4600be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R4600 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R4600 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3797,13 +3797,13 @@ CPU_GET_INFO( r4600le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4600le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R4600 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R4600 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3831,13 +3831,13 @@ CPU_GET_INFO( r4650be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4650be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "IDT R4650 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "IDT R4650 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3849,13 +3849,13 @@ CPU_GET_INFO( r4650le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4650le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "IDT R4650 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "IDT R4650 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3883,13 +3883,13 @@ CPU_GET_INFO( r4700be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4700be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R4700 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R4700 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3901,13 +3901,13 @@ CPU_GET_INFO( r4700le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r4700le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R4700 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R4700 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3935,13 +3935,13 @@ CPU_GET_INFO( r5000be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r5000be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R5000 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R5000 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3953,13 +3953,13 @@ CPU_GET_INFO( r5000le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(r5000le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R5000 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R5000 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -3987,13 +3987,13 @@ CPU_GET_INFO( qed5271be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(qed5271be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "QED5271 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "QED5271 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -4005,13 +4005,13 @@ CPU_GET_INFO( qed5271le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(qed5271le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "QED5271 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "QED5271 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -4039,13 +4039,13 @@ CPU_GET_INFO( rm7000be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(rm7000be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "RM7000 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "RM7000 (big)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; @@ -4057,13 +4057,13 @@ CPU_GET_INFO( rm7000le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(rm7000le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "RM7000 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "RM7000 (little)"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(mips3); break; diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c index a86bfbcf135..90873ea29cb 100644 --- a/src/emu/cpu/mips/psx.c +++ b/src/emu/cpu/mips/psx.c @@ -6119,7 +6119,7 @@ CPU_GET_INFO( psxcpu ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(psxcpu_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 6; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 2 * 2; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -6286,11 +6286,11 @@ CPU_GET_INFO( psxcpu ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_IO: info->internal_map32 = 0; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PSX CPU"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "MIPS"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "2.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright 2008 smf"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PSX CPU"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "MIPS"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "2.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright 2008 smf"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; @@ -6424,7 +6424,7 @@ CPU_GET_INFO( cxd8661r ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(cxd8661r_internal_map); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "CXD8661R"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "CXD8661R"); break; default: CPU_GET_INFO_CALL(psxcpu); diff --git a/src/emu/cpu/mips/r3000.c b/src/emu/cpu/mips/r3000.c index 9dd2d3722a9..fdf410ce0d5 100644 --- a/src/emu/cpu/mips/r3000.c +++ b/src/emu/cpu/mips/r3000.c @@ -1186,7 +1186,7 @@ static CPU_GET_INFO( r3000 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(r3000_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 6; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -1262,11 +1262,11 @@ static CPU_GET_INFO( r3000 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &r3000->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R3000"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "MIPS II"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R3000"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "MIPS II"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; @@ -1318,14 +1318,14 @@ CPU_GET_INFO( r3000be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(r3000be); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(r3000be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R3000 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R3000 (big)"); break; default: CPU_GET_INFO_CALL(r3000); break; } @@ -1337,14 +1337,14 @@ CPU_GET_INFO( r3000le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(r3000le); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(r3000le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R3000 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R3000 (little)"); break; default: CPU_GET_INFO_CALL(r3000); break; } @@ -1356,14 +1356,14 @@ CPU_GET_INFO( r3041be ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(r3000be); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(r3000be); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R3041 (big)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R3041 (big)"); break; default: CPU_GET_INFO_CALL(r3000); break; } @@ -1375,14 +1375,14 @@ CPU_GET_INFO( r3041le ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(r3000le); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(r3000le); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "R3041 (little)"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "R3041 (little)"); break; default: CPU_GET_INFO_CALL(r3000); break; } diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c index 51fb95b1a9f..7fabbb9e51e 100644 --- a/src/emu/cpu/nec/nec.c +++ b/src/emu/cpu/nec/nec.c @@ -1329,7 +1329,7 @@ static CPU_GET_INFO( nec ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(nec_state_t); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1384,11 +1384,11 @@ static CPU_GET_INFO( nec ) 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_CORE_FAMILY: strcpy(info->s, "NEC V-Series"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.5"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "NEC emulator v1.5 by Bryan McPhail"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "NEC"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "NEC V-Series"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.5"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "NEC emulator v1.5 by Bryan McPhail"); break; case CPUINFO_STR_FLAGS: flags = CompressFlags(); @@ -1447,7 +1447,7 @@ CPU_GET_INFO( v20 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(v20); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "V20"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "V20"); break; default: CPU_GET_INFO_CALL(nec); break; } @@ -1470,7 +1470,7 @@ CPU_GET_INFO( v25 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(v20); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "V25"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "V25"); break; default: CPU_GET_INFO_CALL(nec); break; } @@ -1489,7 +1489,7 @@ CPU_GET_INFO( v30 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(v30); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "V30"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "V30"); break; default: CPU_GET_INFO_CALL(nec); break; } @@ -1508,7 +1508,7 @@ CPU_GET_INFO( v33 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(v33); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "V33"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "V33"); break; default: CPU_GET_INFO_CALL(nec); break; } @@ -1527,7 +1527,7 @@ CPU_GET_INFO( v35 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(v30); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "V35"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "V35"); break; default: CPU_GET_INFO_CALL(nec); break; } diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c index b895c994b9c..b9872c74e90 100644 --- a/src/emu/cpu/pdp1/pdp1.c +++ b/src/emu/cpu/pdp1/pdp1.c @@ -944,7 +944,7 @@ CPU_GET_INFO( pdp1 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(pdp1_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 16; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -1031,11 +1031,11 @@ CPU_GET_INFO( pdp1 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PDP1"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "DEC PDP-1"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "2.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, + case DEVINFO_STR_NAME: strcpy(info->s, "PDP1"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "DEC PDP-1"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "2.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Brian Silverman (original Java Source)\n" "Vadim Gerasimov (original Java Source)\n" "Chris Salomon (MESS driver)\n" diff --git a/src/emu/cpu/pdp1/tx0.c b/src/emu/cpu/pdp1/tx0.c index 83e3568c5d4..77b4e665081 100644 --- a/src/emu/cpu/pdp1/tx0.c +++ b/src/emu/cpu/pdp1/tx0.c @@ -443,7 +443,7 @@ CPU_GET_INFO( tx0_64kw ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tx0_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -512,11 +512,11 @@ CPU_GET_INFO( tx0_64kw ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TX-0"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "TX-0"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Raphael Nabet"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TX-0"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "TX-0"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Raphael Nabet"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, ""); break; @@ -569,7 +569,7 @@ CPU_GET_INFO( tx0_8kw ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tx0_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -638,11 +638,11 @@ CPU_GET_INFO( tx0_8kw ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TX-0"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "TX-0"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Raphael Nabet"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TX-0"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "TX-0"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Raphael Nabet"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, ""); break; diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c index 66025023af4..74f7857e08f 100644 --- a/src/emu/cpu/pic16c5x/pic16c5x.c +++ b/src/emu/cpu/pic16c5x/pic16c5x.c @@ -1018,7 +1018,7 @@ static CPU_GET_INFO( pic16c5x ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(pic16c5x_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 4; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -1067,11 +1067,11 @@ static CPU_GET_INFO( pic16c5x ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C5x"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Microchip"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.12"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Tony La Porta"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C5x"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Microchip"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.12"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Tony La Porta"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%01x%c%c%c%c%c %c%c%c%03x", @@ -1155,7 +1155,7 @@ CPU_GET_INFO( pic16c54 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c54_ram); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C54"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C54"); break; default: CPU_GET_INFO_CALL(pic16c5x); break; } @@ -1207,7 +1207,7 @@ CPU_GET_INFO( pic16c55 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c55_ram); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C55"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C55"); break; default: CPU_GET_INFO_CALL(pic16c5x); break; } @@ -1261,7 +1261,7 @@ CPU_GET_INFO( pic16c56 ) case CPUINFO_INT_ADDRBUS_WIDTH_PROGRAM: info->i = 10; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C56"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C56"); break; default: CPU_GET_INFO_CALL(pic16c5x); break; } @@ -1319,7 +1319,7 @@ CPU_GET_INFO( pic16c57 ) case CPUINFO_INT_ADDRBUS_WIDTH_DATA: info->i = 7; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C57"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C57"); break; default: CPU_GET_INFO_CALL(pic16c5x); break; } @@ -1377,7 +1377,7 @@ CPU_GET_INFO( pic16c58 ) case CPUINFO_INT_ADDRBUS_WIDTH_DATA: info->i = 7; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PIC16C58"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C58"); break; default: CPU_GET_INFO_CALL(pic16c5x); break; } diff --git a/src/emu/cpu/powerpc/ppc.c b/src/emu/cpu/powerpc/ppc.c index 82e233dec15..70660e16ee8 100644 --- a/src/emu/cpu/powerpc/ppc.c +++ b/src/emu/cpu/powerpc/ppc.c @@ -1741,7 +1741,7 @@ static CPU_GET_INFO( ppc ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(ppc); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -1814,11 +1814,11 @@ static CPU_GET_INFO( ppc ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &ppc_icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PPC403"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "PowerPC"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PPC403"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "PowerPC"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; @@ -1872,7 +1872,7 @@ CPU_GET_INFO( ppc403 ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_INPUT_LINES: info->i = 8; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_REGISTER + PPC_EXIER: info->i = EXIER; break; case CPUINFO_INT_REGISTER + PPC_EXISR: info->i = EXISR; break; @@ -1884,7 +1884,7 @@ CPU_GET_INFO( ppc403 ) case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(ppc403); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PPC403"); break; + case DEVINFO_STR_NAME: 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; @@ -1898,7 +1898,7 @@ CPU_GET_INFO( ppc603 ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_INPUT_LINES: info->i = 5; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_DATABUS_WIDTH_PROGRAM: info->i = 64; break; case CPUINFO_INT_ADDRBUS_WIDTH_PROGRAM: info->i = 32; break; @@ -1918,7 +1918,7 @@ CPU_GET_INFO( ppc603 ) case CPUINFO_FCT_TRANSLATE: info->translate = ppc_translate_address_cb; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PPC603"); break; + case DEVINFO_STR_NAME: 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; @@ -1945,7 +1945,7 @@ CPU_GET_INFO( ppc602 ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_INPUT_LINES: info->i = 5; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_REGISTER + PPC_IBR: info->i = ppc.ibr; break; case CPUINFO_INT_DATABUS_WIDTH_PROGRAM: info->i = 64; break; @@ -1963,7 +1963,7 @@ CPU_GET_INFO( ppc602 ) case CPUINFO_FCT_TRANSLATE: info->translate = ppc_translate_address_cb; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PPC602"); break; + case DEVINFO_STR_NAME: 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; @@ -1990,7 +1990,7 @@ CPU_GET_INFO( mpc8240 ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_INPUT_LINES: info->i = 5; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_DATABUS_WIDTH_PROGRAM: info->i = 64; break; case CPUINFO_INT_ADDRBUS_WIDTH_PROGRAM: info->i = 32; break; @@ -2006,7 +2006,7 @@ CPU_GET_INFO( mpc8240 ) case CPUINFO_FCT_READOP: info->readop = CPU_GET_READOP_NAME(ppc); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "MPC8240"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "MPC8240"); break; default: CPU_GET_INFO_CALL(ppc); break; } @@ -2031,7 +2031,7 @@ CPU_GET_INFO( ppc601 ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_INPUT_LINES: info->i = 5; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_DATABUS_WIDTH_PROGRAM: info->i = 64; break; case CPUINFO_INT_ADDRBUS_WIDTH_PROGRAM: info->i = 32; break; @@ -2047,7 +2047,7 @@ CPU_GET_INFO( ppc601 ) case CPUINFO_FCT_READOP: info->readop = CPU_GET_READOP_NAME(ppc); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PPC601"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PPC601"); break; default: CPU_GET_INFO_CALL(ppc); break; } @@ -2072,7 +2072,7 @@ CPU_GET_INFO( ppc604 ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case CPUINFO_INT_INPUT_LINES: info->i = 5; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_DATABUS_WIDTH_PROGRAM: info->i = 64; break; case CPUINFO_INT_ADDRBUS_WIDTH_PROGRAM: info->i = 32; break; @@ -2088,7 +2088,7 @@ CPU_GET_INFO( ppc604 ) case CPUINFO_FCT_READOP: info->readop = CPU_GET_READOP_NAME(ppc); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PPC604"); break; + case DEVINFO_STR_NAME: 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 1edcaef32e0..ad0cf9e5f84 100644 --- a/src/emu/cpu/powerpc/ppccom.c +++ b/src/emu/cpu/powerpc/ppccom.c @@ -1240,7 +1240,7 @@ void ppccom_get_info(powerpc_state *ppc, UINT32 state, cpuinfo *info) case CPUINFO_INT_CONTEXT_SIZE: /* provided by core */ break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -1325,11 +1325,11 @@ void ppccom_get_info(powerpc_state *ppc, UINT32 state, cpuinfo *info) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &ppc->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "PowerPC"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "2.0"); break; - case CPUINFO_STR_CORE_FILE: /* provided by core */ break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PowerPC"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "PowerPC"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "2.0"); break; + case DEVINFO_STR_SOURCE_FILE: /* provided by core */ break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; diff --git a/src/emu/cpu/powerpc/ppcdrc.c b/src/emu/cpu/powerpc/ppcdrc.c index cf93f3077d8..f2ed69b54e5 100644 --- a/src/emu/cpu/powerpc/ppcdrc.c +++ b/src/emu/cpu/powerpc/ppcdrc.c @@ -811,7 +811,7 @@ static CPU_GET_INFO( ppcdrc ) case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(ppcdrc); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; /* --- everything else is handled generically --- */ default: ppccom_get_info(ppc, state, info); break; @@ -4340,7 +4340,7 @@ CPU_GET_INFO( ppc403ga ) case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(ppcdrc4xx); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 403GA"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PowerPC 403GA"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc4xx); break; @@ -4375,7 +4375,7 @@ CPU_GET_INFO( ppc403gcx ) case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(ppcdrc4xx); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 403GCX"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PowerPC 403GCX"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc4xx); break; @@ -4414,7 +4414,7 @@ CPU_GET_INFO( ppc601 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(ppc601); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 601"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PowerPC 601"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4448,7 +4448,7 @@ CPU_GET_INFO( ppc602 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(ppc602); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 602"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PowerPC 602"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4482,7 +4482,7 @@ CPU_GET_INFO( ppc603 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(ppc603); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 603"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PowerPC 603"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4516,7 +4516,7 @@ CPU_GET_INFO( ppc603e ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(ppc603e); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 603e"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PowerPC 603e"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4550,7 +4550,7 @@ CPU_GET_INFO( ppc603r ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(ppc603r); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 603R"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PowerPC 603R"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4584,7 +4584,7 @@ CPU_GET_INFO( ppc604 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(ppc604); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC 604"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PowerPC 604"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; @@ -4623,7 +4623,7 @@ CPU_GET_INFO( mpc8240 ) case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(mpc8240); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "PowerPC MPC8240"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "PowerPC MPC8240"); break; /* --- everything else is handled generically --- */ default: CPU_GET_INFO_CALL(ppcdrc); break; diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c index db72d86b834..63b529d6943 100644 --- a/src/emu/cpu/rsp/rsp.c +++ b/src/emu/cpu/rsp/rsp.c @@ -2933,7 +2933,7 @@ CPU_GET_INFO( rsp ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(rsp_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -3006,11 +3006,11 @@ CPU_GET_INFO( rsp ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "RSP"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "RSP"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "RSP"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "RSP"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c index 457fdedc8f3..b980a2f9c92 100644 --- a/src/emu/cpu/s2650/s2650.c +++ b/src/emu/cpu/s2650/s2650.c @@ -1523,7 +1523,7 @@ CPU_GET_INFO( s2650 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(s2650_regs); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1575,11 +1575,11 @@ CPU_GET_INFO( s2650 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &s2650c->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "S2650"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Signetics 2650"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.2"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Written by Juergen Buchmueller for use with MAME"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "S2650"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Signetics 2650"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.2"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Written by Juergen Buchmueller for use with MAME"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c index 3029ec65df5..24fd60a6208 100644 --- a/src/emu/cpu/saturn/saturn.c +++ b/src/emu/cpu/saturn/saturn.c @@ -312,7 +312,7 @@ CPU_GET_INFO( saturn ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(saturn_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -375,11 +375,11 @@ CPU_GET_INFO( saturn ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Saturn"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Saturn"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0alpha"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Peter Trauner, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Saturn"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Saturn"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0alpha"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Peter Trauner, all rights reserved."); break; case CPUINFO_STR_REGISTER + SATURN_PC: sprintf(info->s, "PC: %.5x", cpustate->pc);break; case CPUINFO_STR_REGISTER + SATURN_D0: sprintf(info->s, "D0: %.5x", cpustate->d[0]);break; diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c index 66289732d69..9297482b5e3 100644 --- a/src/emu/cpu/sc61860/sc61860.c +++ b/src/emu/cpu/sc61860/sc61860.c @@ -180,7 +180,7 @@ CPU_GET_INFO( sc61860 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(sc61860_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -220,11 +220,11 @@ CPU_GET_INFO( sc61860 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "SC61860"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "SC61860"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0beta"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Peter Trauner, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "SC61860"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "SC61860"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0beta"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Peter Trauner, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c", cpustate->zero?'Z':'.', cpustate->carry ? 'C':'.'); diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c index b5e31bace87..9eb6ce71ae6 100644 --- a/src/emu/cpu/se3208/se3208.c +++ b/src/emu/cpu/se3208/se3208.c @@ -1848,7 +1848,7 @@ CPU_GET_INFO( se3208 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(se3208_state_t); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -1897,11 +1897,11 @@ CPU_GET_INFO( se3208 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &se3208_state->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "SE3208"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Advanced Digital Chips Inc."); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.00"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Miguel Angel Horna, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "SE3208"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Advanced Digital Chips Inc."); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.00"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Miguel Angel Horna, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c %c%c%c%c%c", diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c index 9f8d8aac311..e2e6b58cf42 100644 --- a/src/emu/cpu/sh2/sh2.c +++ b/src/emu/cpu/sh2/sh2.c @@ -2324,7 +2324,7 @@ CPU_GET_INFO( sh2 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(SH2); break; case CPUINFO_INT_INPUT_LINES: info->i = 16; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -2400,11 +2400,11 @@ CPU_GET_INFO( sh2 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &sh2_icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "SH-2"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Hitachi SH7600"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.01"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "SH-2"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Hitachi SH7600"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.01"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%d%c%c", @@ -2451,7 +2451,7 @@ CPU_GET_INFO( sh1 ) case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(sh1); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "SH-1"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "SH-1"); 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 9a93efa6f42..ac9c1387eeb 100644 --- a/src/emu/cpu/sh2/sh2drc.c +++ b/src/emu/cpu/sh2/sh2drc.c @@ -3273,7 +3273,7 @@ CPU_GET_INFO( sh2 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(SH2 *); break; case CPUINFO_INT_INPUT_LINES: info->i = 16; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -3355,11 +3355,11 @@ CPU_GET_INFO( sh2 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &sh2->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "SH-2"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Hitachi SuperH RISC"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "2.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME team, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "SH-2"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Hitachi SuperH RISC"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "2.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME team, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%d%c%c", @@ -3410,7 +3410,7 @@ CPU_GET_INFO( sh1 ) case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(sh1); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "SH-1"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "SH-1"); 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 76fb863799a..b85f23e5e2a 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -3725,7 +3725,7 @@ CPU_GET_INFO( sh4 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(SH4); break; case CPUINFO_INT_INPUT_LINES: info->i = 5; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -3791,11 +3791,11 @@ CPU_GET_INFO( sh4 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &sh4->sh4_icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "SH-4"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Hitachi SH7750"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright R. Belmont"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "SH-4"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Hitachi SH7750"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright R. Belmont"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%s%s%s%s%c%c%d%c%c", diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c index 8ffbebd970a..91929e28d5a 100644 --- a/src/emu/cpu/sharc/sharc.c +++ b/src/emu/cpu/sharc/sharc.c @@ -1080,7 +1080,7 @@ static CPU_GET_INFO( sharc ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(SHARC_REGS); break; case CPUINFO_INT_INPUT_LINES: info->i = 32; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 8; break; @@ -1216,10 +1216,10 @@ static CPU_GET_INFO( sharc ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map64 = ADDRESS_MAP_NAME(internal_pgm); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "SHARC"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "2.01"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Ville Linde"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "SHARC"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "2.01"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Ville Linde"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; @@ -1333,7 +1333,7 @@ CPU_GET_INFO( adsp21062 ) case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(adsp21062); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "ADSP21062"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "ADSP21062"); break; default: CPU_GET_INFO_CALL(sharc); break; } diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c index d8cab1a98f3..c720f5d55d2 100644 --- a/src/emu/cpu/sm8500/sm8500.c +++ b/src/emu/cpu/sm8500/sm8500.c @@ -451,7 +451,7 @@ CPU_GET_INFO( sm8500 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(sm8500_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 8; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -521,11 +521,11 @@ CPU_GET_INFO( sm8500 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; case CPUINFO_PTR_SM8500_INTERNAL_RAM: info->p = cpustate->internal_ram; break; - case CPUINFO_STR_NAME: strcpy( info->s, "sm8500" ); break; - case CPUINFO_STR_CORE_FAMILY: strcpy( info->s, "Sharp SM8500" ); break; - case CPUINFO_STR_CORE_VERSION: strcpy( info->s, "0.1" ); break; - case CPUINFO_STR_CORE_FILE: strcpy( info->s, __FILE__ ); break; - case CPUINFO_STR_CORE_CREDITS: strcpy( info->s, "Copyright The MESS Team." ); break; + case DEVINFO_STR_NAME: strcpy( info->s, "sm8500" ); break; + case DEVINFO_STR_FAMILY: strcpy( info->s, "Sharp SM8500" ); break; + case DEVINFO_STR_VERSION: strcpy( info->s, "0.1" ); break; + case DEVINFO_STR_SOURCE_FILE: strcpy( info->s, __FILE__ ); break; + case DEVINFO_STR_CREDITS: strcpy( info->s, "Copyright The MESS Team." ); break; case CPUINFO_STR_FLAGS: sprintf( info->s, "%c%c%c%c%c%c%c%c", cpustate->PS1 & FLAG_C ? 'C' : '.', diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c index dff3222e57b..5a6260422b3 100644 --- a/src/emu/cpu/spc700/spc700.c +++ b/src/emu/cpu/spc700/spc700.c @@ -1643,7 +1643,7 @@ CPU_GET_INFO( spc700 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(spc700i_cpu); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1685,11 +1685,11 @@ CPU_GET_INFO( spc700 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->ICount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "SPC700"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Sony SPC700"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.1"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME team, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "SPC700"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Sony SPC700"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.1"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME team, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/ssem/ssem.c b/src/emu/cpu/ssem/ssem.c index 3a755fc31c1..8e9d37fd79a 100644 --- a/src/emu/cpu/ssem/ssem.c +++ b/src/emu/cpu/ssem/ssem.c @@ -271,7 +271,7 @@ CPU_GET_INFO( ssem ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(ssem_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -305,11 +305,11 @@ CPU_GET_INFO( ssem ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "SSEM"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "SSEM"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "SSEM"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "SSEM"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Nicola Salmoria and the MAME Team"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c index a239633629d..38a947c51ed 100644 --- a/src/emu/cpu/ssp1601/ssp1601.c +++ b/src/emu/cpu/ssp1601/ssp1601.c @@ -823,7 +823,7 @@ CPU_GET_INFO( ssp1601 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(ssp1601_state_t); break; case CPUINFO_INT_INPUT_LINES: info->i = 3; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -883,11 +883,11 @@ CPU_GET_INFO( ssp1601 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_IO: info->internal_map16 = NULL; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, CHIP_NAME); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "SSP1601 DSP"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Grazvydas Ignotas"); break; + case DEVINFO_STR_NAME: strcpy(info->s, CHIP_NAME); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "SSP1601 DSP"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Grazvydas Ignotas"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c", (rST&SSP_FLAG_N)?'N':'.', (rST&SSP_FLAG_V)?'V':'.', diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c index 92541973bb4..01d52d2f3f5 100644 --- a/src/emu/cpu/t11/t11.c +++ b/src/emu/cpu/t11/t11.c @@ -420,7 +420,7 @@ CPU_GET_INFO( t11 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(t11_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 4; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = -1; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -466,11 +466,11 @@ CPU_GET_INFO( t11 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "T11"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "DEC T-11"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "T11"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "DEC T-11"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c index a83d16b7b57..893267d712f 100644 --- a/src/emu/cpu/tlcs90/tlcs90.c +++ b/src/emu/cpu/tlcs90/tlcs90.c @@ -2752,7 +2752,7 @@ CPU_GET_INFO( tmp90840 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(t90_Regs); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -2810,11 +2810,11 @@ 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_CORE_FAMILY: strcpy(info->s, "Toshiba TLCS-90"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Luca Elia"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TMP90840"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Toshiba TLCS-90"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Luca Elia"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", @@ -2856,7 +2856,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 DEVINFO_STR_NAME: strcpy(info->s, "TMP90841"); return; } CPU_GET_INFO_CALL(tmp90840); @@ -2872,7 +2872,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 DEVINFO_STR_NAME: strcpy(info->s, "TMP91640"); return; } CPU_GET_INFO_CALL(tmp90840); @@ -2888,7 +2888,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 DEVINFO_STR_NAME: 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 ee7a1bd23dd..eb803d86ceb 100644 --- a/src/emu/cpu/tlcs900/tlcs900.c +++ b/src/emu/cpu/tlcs900/tlcs900.c @@ -1130,7 +1130,7 @@ CPU_GET_INFO( tlcs900h ) switch( state ) { case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tlcs900_state); break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1183,7 +1183,7 @@ CPU_GET_INFO( tlcs900h ) case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(tlcs900); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(tlcs900); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; - case CPUINFO_PTR_INTERNAL_MEMORY_MAP: info->internal_map8 = ADDRESS_MAP_NAME(tlcs900_mem); break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tlcs900_mem); break; case CPUINFO_STR_REGISTER + TLCS900_PC: sprintf( info->s, "PC:%08x", cpustate->pc.d ); break; case CPUINFO_STR_REGISTER + TLCS900_SR: sprintf( info->s, "SR:%c%d%c%d%c%c%c%c%c%c%c%c", @@ -1238,11 +1238,11 @@ CPU_GET_INFO( tlcs900h ) case CPUINFO_STR_REGISTER + TLCS900_DMAC3: sprintf( info->s, "DMAC0:%04x", cpustate->dmac[3].w.l ); break; 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_CORE_FAMILY: strcpy( info->s, "Toshiba TLCS-900" ); break; - case CPUINFO_STR_CORE_VERSION: strcpy( info->s, "0.1" ); break; - case CPUINFO_STR_CORE_FILE: strcpy( info->s, __FILE__ ); break; - case CPUINFO_STR_CORE_CREDITS: strcpy( info->s, "Copyright Wilbert Pol" ); break; + case DEVINFO_STR_NAME: strcpy( info->s, "TLCS-900/H" ); break; + case DEVINFO_STR_FAMILY: strcpy( info->s, "Toshiba TLCS-900" ); break; + case DEVINFO_STR_VERSION: strcpy( info->s, "0.1" ); break; + case DEVINFO_STR_SOURCE_FILE: strcpy( info->s, __FILE__ ); break; + case DEVINFO_STR_CREDITS: strcpy( info->s, "Copyright Wilbert Pol" ); break; } } diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c index 9a9e6ae6eff..0e10a5c2775 100644 --- a/src/emu/cpu/tms0980/tms0980.c +++ b/src/emu/cpu/tms0980/tms0980.c @@ -819,7 +819,7 @@ CPU_GET_INFO( tms0980 ) { case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tms0980_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -827,12 +827,12 @@ CPU_GET_INFO( tms0980 ) case CPUINFO_INT_MIN_CYCLES: info->i = 1; break; case CPUINFO_INT_MAX_CYCLES: info->i = 6; break; - case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16 /* 9 */; break; - case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 12; break; - case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break; - case CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8 /* 4 */; break; - case CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 7; break; - case CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break; + case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16 /* 9 */; break; + case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 12; break; + case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break; + case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8 /* 4 */; break; + case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 7; break; + case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break; case CPUINFO_INT_PREVIOUSPC: info->i = ( ( cpustate->prev_pa << 7 ) | cpustate->prev_pc ) << 1; break; case CPUINFO_INT_PC: info->i = ( ( cpustate->pa << 7 ) | cpustate->pc ) << 1; break; @@ -846,8 +846,8 @@ CPU_GET_INFO( tms0980 ) case CPUINFO_INT_REGISTER + TMS0980_Y: info->i = cpustate->y; break; case CPUINFO_INT_REGISTER + TMS0980_STATUS: info->i = cpustate->status; break; - case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME( tms0980_internal_rom ); break; - case CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME( tms0980_internal_ram ); break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME( tms0980_internal_rom ); break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map8 = ADDRESS_MAP_NAME( tms0980_internal_ram ); break; case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME( tms0980 ); break; case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME( tms0980 ); break; @@ -856,11 +856,11 @@ CPU_GET_INFO( tms0980 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME( tms0980 ); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; - case CPUINFO_STR_NAME: strcpy( info->s, "TMS0980" ); break; - case CPUINFO_STR_CORE_FAMILY: strcpy( info->s, "Texas Instruments TMS0980" ); break; - case CPUINFO_STR_CORE_VERSION: strcpy( info->s, "0.1" ); break; - case CPUINFO_STR_CORE_FILE: strcpy( info->s, __FILE__ ); break; - case CPUINFO_STR_CORE_CREDITS: strcpy( info->s, "Copyright the MESS and MAME teams" ); break; + case DEVINFO_STR_NAME: strcpy( info->s, "TMS0980" ); break; + case DEVINFO_STR_FAMILY: strcpy( info->s, "Texas Instruments TMS0980" ); break; + case DEVINFO_STR_VERSION: strcpy( info->s, "0.1" ); break; + case DEVINFO_STR_SOURCE_FILE: strcpy( info->s, __FILE__ ); break; + case DEVINFO_STR_CREDITS: strcpy( info->s, "Copyright the MESS and MAME teams" ); break; case CPUINFO_STR_FLAGS: strcpy( info->s, "N/A" ); break; diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c index 8c3e6913cad..6c81fb7bc26 100644 --- a/src/emu/cpu/tms32010/tms32010.c +++ b/src/emu/cpu/tms32010/tms32010.c @@ -951,7 +951,7 @@ CPU_GET_INFO( tms32010 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tms32010_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 4; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -997,11 +997,11 @@ CPU_GET_INFO( tms32010 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map16 = ADDRESS_MAP_NAME(tms32010_ram); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TMS32010"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Texas Instruments TMS32010"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.22"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Tony La Porta"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TMS32010"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Texas Instruments TMS32010"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.22"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Tony La Porta"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c index 81eb53ee976..b8596cfb74c 100644 --- a/src/emu/cpu/tms32025/tms32025.c +++ b/src/emu/cpu/tms32025/tms32025.c @@ -2318,7 +2318,7 @@ CPU_GET_INFO( tms32025 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tms32025_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 6; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -2393,11 +2393,11 @@ CPU_GET_INFO( tms32025 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TMS32025"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Texas Instruments TMS320x25"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.10"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Tony La Porta"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TMS32025"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Texas Instruments TMS320x25"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.10"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Tony La Porta"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "arp%d%c%c%c%cdp%03x arb%d%c%c%c%c%c%c%c%c%c%c%cpm%d", @@ -2469,7 +2469,7 @@ CPU_GET_INFO( tms32026 ) case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(tms32026); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TMS32026"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TMS32026"); break; default: CPU_GET_INFO_CALL(tms32025); break; } diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c index 6b425fea362..409edf8609d 100644 --- a/src/emu/cpu/tms32031/tms32031.c +++ b/src/emu/cpu/tms32031/tms32031.c @@ -710,7 +710,7 @@ CPU_GET_INFO( tms32031 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tms32031_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 11; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -796,11 +796,11 @@ CPU_GET_INFO( tms32031 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(internal_32031); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TMS32031"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Texas Instruments TMS32031"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TMS32031"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Texas Instruments TMS32031"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Aaron Giles"); break; case CPUINFO_STR_FLAGS: { @@ -867,7 +867,7 @@ CPU_GET_INFO( tms32032 ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(internal_32032); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TMS32032"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TMS32032"); break; default: CPU_GET_INFO_CALL(tms32031); break; } diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c index 39b796801d3..bc49284b044 100644 --- a/src/emu/cpu/tms32051/tms32051.c +++ b/src/emu/cpu/tms32051/tms32051.c @@ -584,7 +584,7 @@ static CPU_GET_INFO( tms ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tms32051_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 6; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -645,10 +645,10 @@ static CPU_GET_INFO( tms ) case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: info->internal_map16 = ADDRESS_MAP_NAME(internal_data); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "TMS3205x"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Ville Linde"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "TMS3205x"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Ville Linde"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; @@ -726,7 +726,7 @@ CPU_GET_INFO( tms32051 ) case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(tms32051); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TMS32051"); break; + case DEVINFO_STR_NAME: 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 4598a8874dc..c5aac6e6b6c 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -1750,7 +1750,7 @@ CPU_GET_INFO( tms34010 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tms34010_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 8; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -1779,11 +1779,11 @@ CPU_GET_INFO( tms34010 ) case CPUINFO_PTR_STATE_TABLE: info->state_table = &tms->state; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TMS34010"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Texas Instruments 340x0"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Alex Pasadyn/Zsolt Vasvari\nParts based on code by Aaron Giles"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TMS34010"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Texas Instruments 340x0"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Alex Pasadyn/Zsolt Vasvari\nParts based on code by Aaron Giles"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c", @@ -1826,7 +1826,7 @@ CPU_GET_INFO( tms34020 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(tms34020); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TMS34020"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TMS34020"); break; default: CPU_GET_INFO_CALL(tms34010); break; } diff --git a/src/emu/cpu/tms57002/tms57002.c b/src/emu/cpu/tms57002/tms57002.c index 966450c16a7..901a9c5b208 100644 --- a/src/emu/cpu/tms57002/tms57002.c +++ b/src/emu/cpu/tms57002/tms57002.c @@ -1441,7 +1441,7 @@ CPU_GET_INFO(tms57002) switch(state) { case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tms57002_t); break; case CPUINFO_INT_INPUT_LINES: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 4; break; @@ -1463,11 +1463,11 @@ CPU_GET_INFO(tms57002) case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(tms57002); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(tms57002); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &s->icount; break; - case CPUINFO_PTR_INTERNAL_MEMORY_MAP: info->internal_map32 = ADDRESS_MAP_NAME(internal_pgm); break; - case CPUINFO_STR_NAME: strcpy( info->s, "TMS57002" ); break; - case CPUINFO_STR_CORE_FAMILY: strcpy( info->s, "Texas Instruments TMS57002 (DASP)" ); break; - case CPUINFO_STR_CORE_VERSION: strcpy( info->s, "1.0" ); break; - case CPUINFO_STR_CORE_FILE: strcpy( info->s, __FILE__ ); break; - case CPUINFO_STR_CORE_CREDITS: strcpy( info->s, "Copyright Olivier Galibert" ); break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM:info->internal_map32 = ADDRESS_MAP_NAME(internal_pgm); break; + case DEVINFO_STR_NAME: strcpy( info->s, "TMS57002" ); break; + case DEVINFO_STR_FAMILY: strcpy( info->s, "Texas Instruments TMS57002 (DASP)" ); break; + case DEVINFO_STR_VERSION: strcpy( info->s, "1.0" ); break; + case DEVINFO_STR_SOURCE_FILE: strcpy( info->s, __FILE__ ); break; + case DEVINFO_STR_CREDITS: strcpy( info->s, "Copyright Olivier Galibert" ); break; } } diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c index 6dc9b9d9808..356fa39a36e 100644 --- a/src/emu/cpu/tms7000/tms7000.c +++ b/src/emu/cpu/tms7000/tms7000.c @@ -274,7 +274,7 @@ CPU_GET_INFO( tms7000 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tms7000_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 3; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -316,14 +316,14 @@ CPU_GET_INFO( tms7000 ) case CPUINFO_FCT_BURN: info->burn = NULL; /* Not supported */break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(tms7000); break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; - case CPUINFO_PTR_INTERNAL_MEMORY_MAP: info->internal_map8 = ADDRESS_MAP_NAME(tms7000_mem); break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tms7000_mem); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "TMS7000"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Texas Instriuments TMS7000"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright tim lindner"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "TMS7000"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Texas Instriuments TMS7000"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright tim lindner"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h index e39098c6a36..df6905ea60d 100644 --- a/src/emu/cpu/tms9900/99xxcore.h +++ b/src/emu/cpu/tms9900/99xxcore.h @@ -4646,7 +4646,7 @@ void TMS99XX_GET_INFO(const device_config *device, UINT32 state, cpuinfo *info) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(tms99xx_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 3; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -4772,11 +4772,11 @@ void TMS99XX_GET_INFO(const device_config *device, UINT32 state, cpuinfo *info) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, TMS99XX_cpu_get_name); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Texas Instruments 9900"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "2.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "C TMS9900 emulator by Edward Swartz, initially converted for Mame by M.Coates, updated by R. Nabet"); break; + case DEVINFO_STR_NAME: strcpy(info->s, TMS99XX_cpu_get_name); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Texas Instruments 9900"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "2.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "C TMS9900 emulator by Edward Swartz, initially converted for Mame by M.Coates, updated by R. Nabet"); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c index 829691f49e4..cddbdf572cb 100644 --- a/src/emu/cpu/upd7810/upd7810.c +++ b/src/emu/cpu/upd7810/upd7810.c @@ -2021,7 +2021,7 @@ CPU_GET_INFO( upd7810 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(upd7810_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -2110,11 +2110,11 @@ CPU_GET_INFO( upd7810 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "uPD7810"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "NEC uPD7810"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "0.3"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "uPD7810"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "NEC uPD7810"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "0.3"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%s:%s:%s:%s:%s:%s", @@ -2195,7 +2195,7 @@ CPU_GET_INFO( upd7807 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(upd7807); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "uPD7807"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "uPD7807"); break; default: CPU_GET_INFO_CALL(upd7810); break; } @@ -2206,7 +2206,7 @@ CPU_GET_INFO( upd7801 ) { case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(upd7801); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(upd7801); break; - case CPUINFO_STR_NAME: strcpy(info->s, "uPD7801"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "uPD7801"); break; default: CPU_GET_INFO_CALL(upd7810); break; } @@ -2219,7 +2219,7 @@ CPU_GET_INFO( upd78c05 ) { case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(upd78c05); break; case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(upd78c05); break; - case CPUINFO_STR_NAME: strcpy(info->s, "uPD78C05"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "uPD78C05"); break; /* These registers are not present in the uPD78C05 cpu */ case CPUINFO_STR_REGISTER + UPD7810_A2: @@ -2263,7 +2263,7 @@ CPU_GET_INFO( upd78c06 ) { switch ( state ) { case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(upd78c06); break; - case CPUINFO_STR_NAME: strcpy(info->s, "uPD78C06"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "uPD78C06"); break; default: CPU_GET_INFO_CALL(upd78c05); break; } diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c index 2652ff328fd..88819d37a42 100644 --- a/src/emu/cpu/v30mz/v30mz.c +++ b/src/emu/cpu/v30mz/v30mz.c @@ -1051,7 +1051,7 @@ CPU_GET_INFO( v30mz ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(v30mz_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -1103,10 +1103,10 @@ CPU_GET_INFO( v30mz ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "NEC V-Series"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.5"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "NEC emulator v1.5 by Bryan McPhail"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "NEC V-Series"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.5"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "NEC emulator v1.5 by Bryan McPhail"); break; case CPUINFO_STR_FLAGS: flags = CompressFlags(); @@ -1153,7 +1153,7 @@ CPU_GET_INFO( v30mz ) break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "V30MZ"); + case DEVINFO_STR_NAME: strcpy(info->s, "V30MZ"); break; } } diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c index 15e96510cf2..df2ffa0f845 100644 --- a/src/emu/cpu/v60/v60.c +++ b/src/emu/cpu/v60/v60.c @@ -580,7 +580,7 @@ CPU_GET_INFO( v60 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(v60_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -675,11 +675,11 @@ CPU_GET_INFO( v60 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "V60"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "NEC V60"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Farfetch'd and R.Belmont"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "V60"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "NEC V60"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Farfetch'd and R.Belmont"); break; case CPUINFO_STR_FLAGS: strcpy(info->s, " "); break; @@ -763,7 +763,7 @@ CPU_GET_INFO( v70 ) case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(v70); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "V70"); break; + case DEVINFO_STR_NAME: 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 d1ebb8b7f34..fbaabda6670 100644 --- a/src/emu/cpu/v810/v810.c +++ b/src/emu/cpu/v810/v810.c @@ -1155,7 +1155,7 @@ CPU_GET_INFO( v810 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(v810_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 9; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -1236,11 +1236,11 @@ CPU_GET_INFO( v810 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "V810"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "NEC V810"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.0"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Tomasz Slanina"); break; + case DEVINFO_STR_NAME: strcpy(info->s, "V810"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "NEC V810"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.0"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Tomasz Slanina"); break; case CPUINFO_STR_REGISTER + V810_PC: sprintf(info->s, "PC:%08X", cpustate->PC); break; case CPUINFO_STR_REGISTER + V810_R0: sprintf(info->s, "R0 :%08X", cpustate->R0); break; diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c index 5ddc56e1f04..2e05c4899d0 100644 --- a/src/emu/cpu/z180/z180.c +++ b/src/emu/cpu/z180/z180.c @@ -2540,7 +2540,7 @@ CPU_GET_INFO( z180 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(z180_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 3; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -2583,11 +2583,11 @@ CPU_GET_INFO( z180 ) case CPUINFO_PTR_Z180_CYCLE_TABLE + Z180_TABLE_ex: info->p = (void *)cc[Z180_TABLE_ex]; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Z180"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Zilog Z8x180"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "0.4"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Z180"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Zilog Z8x180"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "0.4"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c index 646e713954d..94681aa93cd 100644 --- a/src/emu/cpu/z80/z80.c +++ b/src/emu/cpu/z80/z80.c @@ -3665,7 +3665,7 @@ CPU_GET_INFO( z80 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(z80_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 1; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_LITTLE; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break; @@ -3698,11 +3698,11 @@ CPU_GET_INFO( z80 ) case CPUINFO_PTR_STATE_TABLE: info->state_table = &z80->state; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Z80"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Zilog Z80"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "3.8"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Z80"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Zilog Z80"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "3.8"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c index cf7c304b849..639cfacadcf 100644 --- a/src/emu/cpu/z8000/z8000.c +++ b/src/emu/cpu/z8000/z8000.c @@ -524,7 +524,7 @@ CPU_GET_INFO( z8000 ) case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(z8000_state); break; case CPUINFO_INT_INPUT_LINES: info->i = 2; break; case CPUINFO_INT_DEFAULT_IRQ_VECTOR: info->i = 0xff; break; - case CPUINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; + case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break; case CPUINFO_INT_CLOCK_MULTIPLIER: info->i = 1; break; case CPUINFO_INT_CLOCK_DIVIDER: info->i = 1; break; case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break; @@ -586,11 +586,11 @@ CPU_GET_INFO( z8000 ) case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; /* --- the following bits of info are returned as NULL-terminated strings --- */ - case CPUINFO_STR_NAME: strcpy(info->s, "Z8002"); break; - case CPUINFO_STR_CORE_FAMILY: strcpy(info->s, "Zilog Z8000"); break; - case CPUINFO_STR_CORE_VERSION: strcpy(info->s, "1.1"); break; - case CPUINFO_STR_CORE_FILE: strcpy(info->s, __FILE__); break; - case CPUINFO_STR_CORE_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; + case DEVINFO_STR_NAME: strcpy(info->s, "Z8002"); break; + case DEVINFO_STR_FAMILY: strcpy(info->s, "Zilog Z8000"); break; + case DEVINFO_STR_VERSION: strcpy(info->s, "1.1"); break; + case DEVINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break; + case DEVINFO_STR_CREDITS: strcpy(info->s, "Copyright Juergen Buchmueller, all rights reserved."); break; case CPUINFO_STR_FLAGS: sprintf(info->s, "%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c", diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c index 721fe97d9ec..3cd9e9a6136 100644 --- a/src/emu/cpuexec.c +++ b/src/emu/cpuexec.c @@ -446,8 +446,8 @@ static DEVICE_START( cpu ) cpu_class_data *classdata; const cpu_config *config; cpu_init_func init; - int spacenum, line; int num_regs; + int line; /* validate some basic stuff */ assert(device != NULL); @@ -466,9 +466,6 @@ static DEVICE_START( cpu ) /* build the header */ header->debug = NULL; - for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++) - header->space[spacenum] = memory_find_address_space(device, spacenum); - header->set_info = (cpu_set_info_func)device_get_info_fct(device, CPUINFO_FCT_SET_INFO); /* fill in the input states and IRQ callback information */ diff --git a/src/emu/cpuexec.h b/src/emu/cpuexec.h index 79fdb59ca89..ddc39bd9b7b 100644 --- a/src/emu/cpuexec.h +++ b/src/emu/cpuexec.h @@ -76,7 +76,6 @@ typedef struct _cpu_class_header cpu_class_header; struct _cpu_class_header { cpu_debug_data * debug; /* debugging data */ - const address_space * space[ADDRESS_SPACES]; /* address spaces */ cpu_set_info_func set_info; /* this CPU's set_info function */ }; @@ -346,12 +345,9 @@ INLINE cpu_debug_data *cpu_get_debug_data(const device_config *device) INLINE const address_space *cpu_get_address_space(const device_config *device, int spacenum) { - /* it is faster to pull this from the class header, but only after we've started */ + /* it is faster to pull this from the pre-fetched data, but only after we've started */ if (device->token != NULL) - { - cpu_class_header *classheader = cpu_get_class_header(device); - return classheader->space[spacenum]; - } + return device->space[spacenum]; return memory_find_address_space(device, spacenum); } diff --git a/src/emu/cpuintrf.h b/src/emu/cpuintrf.h index 8ed7112e3b4..ab76e0494d3 100644 --- a/src/emu/cpuintrf.h +++ b/src/emu/cpuintrf.h @@ -81,12 +81,22 @@ enum /* --- the following bits of info are returned as 64-bit signed integers --- */ CPUINFO_INT_FIRST = DEVINFO_INT_FIRST, + /* useful aliases */ + CPUINFO_INT_DATABUS_WIDTH_PROGRAM = DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM, + CPUINFO_INT_DATABUS_WIDTH_DATA = DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA, + CPUINFO_INT_DATABUS_WIDTH_IO = DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO, + CPUINFO_INT_ADDRBUS_WIDTH_PROGRAM = DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM, + CPUINFO_INT_ADDRBUS_WIDTH_DATA = DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA, + CPUINFO_INT_ADDRBUS_WIDTH_IO = DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO, + CPUINFO_INT_ADDRBUS_SHIFT_PROGRAM = DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM, + CPUINFO_INT_ADDRBUS_SHIFT_DATA = DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA, + CPUINFO_INT_ADDRBUS_SHIFT_IO = DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO, + /* CPU-specific additions */ CPUINFO_INT_CONTEXT_SIZE = DEVINFO_INT_CLASS_SPECIFIC, /* R/O: size of CPU context in bytes */ CPUINFO_INT_INPUT_LINES, /* R/O: number of input lines */ CPUINFO_INT_OUTPUT_LINES, /* R/O: number of output lines */ CPUINFO_INT_DEFAULT_IRQ_VECTOR, /* R/O: default IRQ vector */ - CPUINFO_INT_ENDIANNESS, /* R/O: either ENDIANNESS_BIG or ENDIANNESS_LITTLE */ CPUINFO_INT_CLOCK_MULTIPLIER, /* R/O: internal clock multiplier */ CPUINFO_INT_CLOCK_DIVIDER, /* R/O: internal clock divider */ CPUINFO_INT_MIN_INSTRUCTION_BYTES, /* R/O: minimum bytes per instruction */ @@ -94,21 +104,6 @@ enum CPUINFO_INT_MIN_CYCLES, /* R/O: minimum cycles for a single instruction */ CPUINFO_INT_MAX_CYCLES, /* R/O: maximum cycles for a single instruction */ - CPUINFO_INT_DATABUS_WIDTH, /* R/O: data bus size for each address space (8,16,32,64) */ - CPUINFO_INT_DATABUS_WIDTH_PROGRAM = CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM, - CPUINFO_INT_DATABUS_WIDTH_DATA = CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA, - CPUINFO_INT_DATABUS_WIDTH_IO = CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO, - CPUINFO_INT_DATABUS_WIDTH_LAST = CPUINFO_INT_DATABUS_WIDTH + ADDRESS_SPACES - 1, - CPUINFO_INT_ADDRBUS_WIDTH, /* R/O: address bus size for each address space (12-32) */ - CPUINFO_INT_ADDRBUS_WIDTH_PROGRAM = CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM, - CPUINFO_INT_ADDRBUS_WIDTH_DATA = CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA, - CPUINFO_INT_ADDRBUS_WIDTH_IO = CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO, - CPUINFO_INT_ADDRBUS_WIDTH_LAST = CPUINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACES - 1, - CPUINFO_INT_ADDRBUS_SHIFT, /* R/O: shift applied to addresses each address space (+3 means >>3, -1 means <<1) */ - CPUINFO_INT_ADDRBUS_SHIFT_PROGRAM = CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM, - CPUINFO_INT_ADDRBUS_SHIFT_DATA = CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA, - CPUINFO_INT_ADDRBUS_SHIFT_IO = CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO, - CPUINFO_INT_ADDRBUS_SHIFT_LAST = CPUINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACES - 1, CPUINFO_INT_LOGADDR_WIDTH, /* R/O: address bus size for logical accesses in each space (0=same as physical) */ CPUINFO_INT_LOGADDR_WIDTH_PROGRAM = CPUINFO_INT_LOGADDR_WIDTH + ADDRESS_SPACE_PROGRAM, CPUINFO_INT_LOGADDR_WIDTH_DATA = CPUINFO_INT_LOGADDR_WIDTH + ADDRESS_SPACE_DATA, @@ -135,14 +130,14 @@ enum /* --- the following bits of info are returned as pointers to data or functions --- */ CPUINFO_PTR_FIRST = DEVINFO_PTR_FIRST, + /* useful aliases */ + CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM = DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM, + CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA = DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA, + CPUINFO_PTR_INTERNAL_MEMORY_MAP_IO = DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO, + /* CPU-specific additions */ CPUINFO_PTR_INSTRUCTION_COUNTER = DEVINFO_PTR_CLASS_SPECIFIC, /* R/O: int *icount */ - CPUINFO_PTR_INTERNAL_MEMORY_MAP, /* R/O: const addrmap_token *map */ - CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM = CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM, - CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA = CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA, - CPUINFO_PTR_INTERNAL_MEMORY_MAP_IO = CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO, - CPUINFO_PTR_INTERNAL_MEMORY_MAP_LAST = CPUINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACES - 1, CPUINFO_PTR_STATE_TABLE, /* R/O: cpu_state_table *state */ CPUINFO_PTR_CPU_SPECIFIC = DEVINFO_PTR_DEVICE_SPECIFIC, /* R/W: CPU-specific values start here */ @@ -174,13 +169,6 @@ enum /* --- the following bits of info are returned as NULL-terminated strings --- */ CPUINFO_STR_FIRST = DEVINFO_STR_FIRST, - /* direct map to device data */ - CPUINFO_STR_NAME = DEVINFO_STR_NAME, /* R/O: name of the CPU */ - CPUINFO_STR_CORE_FAMILY = DEVINFO_STR_FAMILY, /* R/O: family of the CPU */ - CPUINFO_STR_CORE_VERSION = DEVINFO_STR_VERSION, /* R/O: version of the CPU core */ - CPUINFO_STR_CORE_FILE = DEVINFO_STR_SOURCE_FILE, /* R/O: file containing the CPU core */ - CPUINFO_STR_CORE_CREDITS = DEVINFO_STR_CREDITS, /* R/O: credits for the CPU core */ - /* CPU-specific additions */ CPUINFO_STR_FLAGS = DEVINFO_STR_CLASS_SPECIFIC, /* R/O: string representation of the main flags value */ CPUINFO_STR_REGISTER, /* R/O: string representation of up to MAX_REGs registers */ @@ -323,16 +311,12 @@ enum #define cpu_get_input_lines(cpu) device_get_info_int(cpu, CPUINFO_INT_INPUT_LINES) #define cpu_get_output_lines(cpu) device_get_info_int(cpu, CPUINFO_INT_OUTPUT_LINES) #define cpu_get_default_irq_vector(cpu) device_get_info_int(cpu, CPUINFO_INT_DEFAULT_IRQ_VECTOR) -#define cpu_get_endianness(cpu) device_get_info_int(cpu, CPUINFO_INT_ENDIANNESS) #define cpu_get_clock_multiplier(cpu) device_get_info_int(cpu, CPUINFO_INT_CLOCK_MULTIPLIER) #define cpu_get_clock_divider(cpu) device_get_info_int(cpu, CPUINFO_INT_CLOCK_DIVIDER) #define cpu_get_min_opcode_bytes(cpu) device_get_info_int(cpu, CPUINFO_INT_MIN_INSTRUCTION_BYTES) #define cpu_get_max_opcode_bytes(cpu) device_get_info_int(cpu, CPUINFO_INT_MAX_INSTRUCTION_BYTES) #define cpu_get_min_cycles(cpu) device_get_info_int(cpu, CPUINFO_INT_MIN_CYCLES) #define cpu_get_max_cycles(cpu) device_get_info_int(cpu, CPUINFO_INT_MAX_CYCLES) -#define cpu_get_databus_width(cpu, space) device_get_info_int(cpu, CPUINFO_INT_DATABUS_WIDTH + (space)) -#define cpu_get_addrbus_width(cpu, space) device_get_info_int(cpu, CPUINFO_INT_ADDRBUS_WIDTH + (space)) -#define cpu_get_addrbus_shift(cpu, space) device_get_info_int(cpu, CPUINFO_INT_ADDRBUS_SHIFT + (space)) #define cpu_get_logaddr_width(cpu, space) device_get_info_int(cpu, CPUINFO_INT_LOGADDR_WIDTH + (space)) #define cpu_get_page_shift(cpu, space) device_get_info_int(cpu, CPUINFO_INT_PAGE_SHIFT + (space)) #define cpu_get_reg(cpu, reg) device_get_info_int(cpu, CPUINFO_INT_REGISTER + (reg)) @@ -341,17 +325,23 @@ enum #define cpu_get_sp(cpu) cpu_get_reg(cpu, REG_GENSP) #define cpu_get_icount_ptr(cpu) (int *)device_get_info_ptr(cpu, CPUINFO_PTR_INSTRUCTION_COUNTER) #define cpu_get_state_table(cpu) (const cpu_state_table *)device_get_info_ptr(cpu, CPUINFO_PTR_STATE_TABLE) -#define cpu_get_name(cpu) device_get_info_string(cpu, CPUINFO_STR_NAME) -#define cpu_get_core_family(cpu) device_get_info_string(cpu, CPUINFO_STR_CORE_FAMILY) -#define cpu_get_core_version(cpu) device_get_info_string(cpu, CPUINFO_STR_CORE_VERSION) -#define cpu_get_core_file(cpu) device_get_info_string(cpu, CPUINFO_STR_CORE_FILE) -#define cpu_get_core_credits(cpu) device_get_info_string(cpu, CPUINFO_STR_CORE_CREDITS) #define cpu_get_flags_string(cpu) device_get_info_string(cpu, CPUINFO_STR_FLAGS) #define cpu_get_irq_string(cpu, irq) device_get_info_string(cpu, CPUINFO_STR_IRQ_STATE + (irq)) #define cpu_get_reg_string(cpu, reg) device_get_info_string(cpu, CPUINFO_STR_REGISTER + (reg)) #define cpu_set_reg(cpu, reg, val) cpu_set_info(cpu, CPUINFO_INT_REGISTER + (reg), (val)) +/* helpers that map directly to device helpers */ +#define cpu_get_endianness(cpu) device_get_endianness(cpu) +#define cpu_get_databus_width(cpu, space) device_get_databus_width(cpu, space) +#define cpu_get_addrbus_width(cpu, space) device_get_addrbus_width(cpu, space) +#define cpu_get_addrbus_shift(cpu, space) device_get_addrbus_shift(cpu, space) +#define cpu_get_name(cpu) device_get_name(cpu) +#define cpu_get_core_family(cpu) device_get_family(cpu) +#define cpu_get_core_version(cpu) device_get_version(cpu) +#define cpu_get_core_file(cpu) device_get_source_file(cpu) +#define cpu_get_core_credits(cpu) device_get_credits(cpu) + /*************************************************************************** diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index d1cfd348e55..c2c7435bcb5 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -209,12 +209,12 @@ void debug_cpu_init(running_machine *machine) /* add a global symbol for the current instruction pointer */ symtable_add_register(info->symtable, "cycles", NULL, get_cycles, NULL); - if (classheader->space[ADDRESS_SPACE_PROGRAM] != NULL) - symtable_add_register(info->symtable, "logunmap", (void *)classheader->space[ADDRESS_SPACE_PROGRAM], get_logunmap, set_logunmap); - if (classheader->space[ADDRESS_SPACE_DATA] != NULL) - symtable_add_register(info->symtable, "logunmapd", (void *)classheader->space[ADDRESS_SPACE_DATA], get_logunmap, set_logunmap); - if (classheader->space[ADDRESS_SPACE_IO] != NULL) - symtable_add_register(info->symtable, "logunmapi", (void *)classheader->space[ADDRESS_SPACE_IO], get_logunmap, set_logunmap); + if (cpu->space[ADDRESS_SPACE_PROGRAM] != NULL) + symtable_add_register(info->symtable, "logunmap", (void *)cpu->space[ADDRESS_SPACE_PROGRAM], get_logunmap, set_logunmap); + if (cpu->space[ADDRESS_SPACE_DATA] != NULL) + symtable_add_register(info->symtable, "logunmapd", (void *)cpu->space[ADDRESS_SPACE_DATA], get_logunmap, set_logunmap); + if (cpu->space[ADDRESS_SPACE_IO] != NULL) + symtable_add_register(info->symtable, "logunmapi", (void *)cpu->space[ADDRESS_SPACE_IO], get_logunmap, set_logunmap); /* add all registers into it */ for (regnum = 0; regnum < MAX_REGS; regnum++) diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index 93f65677d0b..8d4b9366b58 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -122,7 +122,6 @@ device_config *device_list_add(device_config **listheadptr, const device_config /* populate device properties */ device->type = type; device->devclass = (device_class)(INT32)devtype_get_info_int(type, DEVINFO_INT_CLASS); - device->execute = NULL; /* populate device configuration */ device->clock = clock; @@ -142,6 +141,8 @@ device_config *device_list_add(device_config **listheadptr, const device_config device->tokenbytes = 0; device->region = NULL; device->regionbytes = 0; + memset(device->space, 0, sizeof(device->space)); + device->execute = NULL; /* append the tag */ strcpy(device->tag, tag); @@ -569,6 +570,8 @@ void device_list_start(running_machine *machine) /* iterate over devices and allocate memory for them */ for (device = (device_config *)machine->config->devicelist; device != NULL; device = device->next) { + int spacenum; + assert(!device->started); assert(device->machine == machine); assert(device->token == NULL); @@ -585,10 +588,11 @@ void device_list_start(running_machine *machine) device->token = alloc_array_clear_or_die(UINT8, device->tokenbytes); /* fill in the remaining runtime fields */ - device->execute = (device_execute_func)device_get_info_fct(device, DEVINFO_FCT_EXECUTE); - device->machine = machine; device->region = memory_region(machine, device->tag); device->regionbytes = memory_region_length(machine, device->tag); + for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++) + device->space[spacenum] = memory_find_address_space(device, spacenum); + device->execute = (device_execute_func)device_get_info_fct(device, DEVINFO_FCT_EXECUTE); } /* iterate until we've started everything */ diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h index 38959bf402a..48fe055d5fb 100644 --- a/src/emu/devintrf.h +++ b/src/emu/devintrf.h @@ -52,6 +52,14 @@ enum DEVINFO_INT_INLINE_CONFIG_BYTES, /* R/O: bytes to allocate for the inline configuration */ DEVINFO_INT_CLASS, /* R/O: the device's class */ + DEVINFO_INT_ENDIANNESS, /* R/O: either ENDIANNESS_BIG or ENDIANNESS_LITTLE */ + DEVINFO_INT_DATABUS_WIDTH, /* R/O: data bus size for each address space (8,16,32,64) */ + DEVINFO_INT_DATABUS_WIDTH_LAST = DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACES - 1, + DEVINFO_INT_ADDRBUS_WIDTH, /* R/O: address bus size for each address space (12-32) */ + DEVINFO_INT_ADDRBUS_WIDTH_LAST = DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACES - 1, + DEVINFO_INT_ADDRBUS_SHIFT, /* R/O: shift applied to addresses each address space (+3 means >>3, -1 means <<1) */ + DEVINFO_INT_ADDRBUS_SHIFT_LAST = DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACES - 1, + DEVINFO_INT_CLASS_SPECIFIC = 0x04000, /* R/W: device-specific values start here */ DEVINFO_INT_DEVICE_SPECIFIC = 0x08000, /* R/W: device-specific values start here */ DEVINFO_INT_LAST = 0x0ffff, @@ -63,6 +71,9 @@ enum DEVINFO_PTR_MACHINE_CONFIG, /* R/O: pointer to device-specific machine config */ DEVINFO_PTR_CONTRACT_LIST, /* R/O: pointer to list of supported device contracts */ + DEVINFO_PTR_INTERNAL_MEMORY_MAP, /* R/O: const addrmap_token *map */ + DEVINFO_PTR_INTERNAL_MEMORY_MAP_LAST = DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACES - 1, + DEVINFO_PTR_CLASS_SPECIFIC = 0x14000, /* R/W: device-specific values start here */ DEVINFO_PTR_DEVICE_SPECIFIC = 0x18000, /* R/W: device-specific values start here */ DEVINFO_PTR_LAST = 0x1ffff, @@ -151,6 +162,7 @@ enum #define devtag_get_device(mach,tag) device_list_find_by_tag((mach)->config->devicelist, tag) #define devtag_reset(mach,tag) device_reset(devtag_get_device(mach, tag)) +#define devtag_get_address_space(mach,tag,space) #define devtag_get_info_int(mach,tag,state) device_get_info_int(devtag_get_device(mach, tag), state) #define devtag_get_info_ptr(mach,tag,state) device_get_info_ptr(devtag_get_device(mach, tag), state) @@ -159,6 +171,10 @@ enum /* shorthand for getting standard data about device types */ +#define devtype_get_endianness(type) devtype_get_info_int(type, DEVINFO_INT_ENDIANNESS) +#define devtype_get_databus_width(type,space) devtype_get_info_int(type, DEVINFO_INT_DATABUS_WIDTH + (space)) +#define devtype_get_addrbus_width(type,space) devtype_get_info_int(type, DEVINFO_INT_ADDRBUS_WIDTH + (space)) +#define devtype_get_addrbus_shift(type,space) devtype_get_info_int(type, DEVINFO_INT_ADDRBUS_SHIFT + (space)) #define devtype_get_name(type) devtype_get_info_string(type, DEVINFO_STR_NAME) #define devtype_get_family(type) devtype_get_info_string(type, DEVINFO_STR_FAMILY) #define devtype_get_version(type) devtype_get_info_string(type, DEVINFO_STR_VERSION) @@ -167,6 +183,10 @@ enum /* shorthand for getting standard data about devices */ +#define device_get_endianness(dev) device_get_info_int(dev, DEVINFO_INT_ENDIANNESS) +#define device_get_databus_width(dev,space) device_get_info_int(dev, DEVINFO_INT_DATABUS_WIDTH + (space)) +#define device_get_addrbus_width(dev,space) device_get_info_int(dev, DEVINFO_INT_ADDRBUS_WIDTH + (space)) +#define device_get_addrbus_shift(dev,space) device_get_info_int(dev, DEVINFO_INT_ADDRBUS_SHIFT + (space)) #define device_get_name(dev) device_get_info_string(dev, DEVINFO_STR_NAME) #define device_get_family(dev) device_get_info_string(dev, DEVINFO_STR_FAMILY) #define device_get_version(dev) device_get_info_string(dev, DEVINFO_STR_VERSION) @@ -175,6 +195,10 @@ enum /* shorthand for getting standard data about devices by machine/type/tag */ +#define devtag_get_endianness(mach,tag) devtag_get_info_int(mach, tag, DEVINFO_INT_ENDIANNESS) +#define devtag_get_databus_width(mach,tag,space) devtag_get_info_int(mach, tag, DEVINFO_INT_DATABUS_WIDTH + (space)) +#define devtag_get_addrbus_width(mach,tag,space) devtag_get_info_int(mach, tag, DEVINFO_INT_ADDRBUS_WIDTH + (space)) +#define devtag_get_addrbus_shift(mach,tag,space) devtag_get_info_int(mach, tag, DEVINFO_INT_ADDRBUS_SHIFT + (space)) #define devtag_get_name(mach,tag) devtag_get_info_string(mach, tag, DEVINFO_STR_NAME) #define devtag_get_family(mach,tag) devtag_get_info_string(mach, tag, DEVINFO_STR_FAMILY) #define devtag_get_version(mach,tag) devtag_get_info_string(mach, tag, DEVINFO_STR_VERSION) @@ -265,6 +289,7 @@ struct _device_config UINT32 tokenbytes; /* size of the token data allocated */ UINT8 * region; /* pointer to region with the device's tag, or NULL */ UINT32 regionbytes; /* size of the region, in bytes */ + const address_space * space[ADDRESS_SPACES]; /* auto-discovered address spaces */ device_execute_func execute; /* quick pointer to execute callback */ /* tag (always valid; at end because it is variable-length) */ diff --git a/src/emu/memory.c b/src/emu/memory.c index 3da0caba3f1..7a868a9ffbb 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -2,7 +2,7 @@ memory.c - Functions which handle the CPU memory access. + Functions which handle device memory access. Copyright Nicola Salmoria and the MAME Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -186,7 +186,7 @@ typedef enum _read_or_write read_or_write; TYPE DEFINITIONS ***************************************************************************/ -/* a memory block is a chunk of RAM associated with a range of memory in a CPU's address space */ +/* a memory block is a chunk of RAM associated with a range of memory in a device's address space */ typedef struct _memory_block memory_block; struct _memory_block { @@ -197,7 +197,7 @@ struct _memory_block UINT8 * data; /* pointer to the data for this block */ }; -/* a bank is a global pointer to memory that can be shared across CPUs and changed dynamically */ +/* a bank is a global pointer to memory that can be shared across devices and changed dynamically */ typedef struct _bank_reference bank_reference; struct _bank_reference { @@ -316,7 +316,7 @@ static void memory_init_locate(running_machine *machine); static void memory_exit(running_machine *machine); /* address map helpers */ -static void map_detokenize(address_map *map, const game_driver *driver, const char *cputag, const addrmap_token *tokens); +static void map_detokenize(address_map *map, const game_driver *driver, const char *devtag, const addrmap_token *tokens); /* memory mapping helpers */ static void space_map_range_private(address_space *space, read_or_write readorwrite, int handlerbits, int handlerunitmask, offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, genf *handler, void *object, const char *handler_name); @@ -714,7 +714,7 @@ void memory_init(running_machine *machine) /* allocate our private data */ memdata = machine->memory_data = auto_alloc_clear(machine, memory_private); - /* build up the cpudata array with info about all CPUs and address spaces */ + /* build up the list of address spaces */ memory_init_spaces(machine); /* preflight the memory handlers and check banks */ @@ -737,16 +737,16 @@ void memory_init(running_machine *machine) /*------------------------------------------------- memory_find_address_space - find an address space in our internal list; for faster access - use cpu_get_address_space() + use device->space[] after device is started -------------------------------------------------*/ -const address_space *memory_find_address_space(const device_config *cpu, int spacenum) +const address_space *memory_find_address_space(const device_config *device, int spacenum) { - memory_private *memdata = cpu->machine->memory_data; + memory_private *memdata = device->machine->memory_data; const address_space *space; for (space = memdata->spacelist; space != NULL; space = space->next) - if (space->cpu == cpu && space->spacenum == spacenum) + if (space->cpu == device && space->spacenum == spacenum) return space; return NULL; } @@ -759,7 +759,7 @@ const address_space *memory_find_address_space(const device_config *cpu, int spa /*------------------------------------------------- address_map_alloc - build and allocate an - address map for a CPU's address space + address map for a device's address space -------------------------------------------------*/ address_map *address_map_alloc(const device_config *device, const game_driver *driver, int spacenum) @@ -769,8 +769,8 @@ address_map *address_map_alloc(const device_config *device, const game_driver *d map = alloc_clear_or_die(address_map); - /* append the internal CPU map (first so it takes priority) */ - internal_map = (const addrmap_token *)device_get_info_ptr(device, CPUINFO_PTR_INTERNAL_MEMORY_MAP + spacenum); + /* append the internal device map (first so it takes priority) */ + internal_map = (const addrmap_token *)device_get_info_ptr(device, DEVINFO_PTR_INTERNAL_MEMORY_MAP + spacenum); if (internal_map != NULL) map_detokenize(map, driver, device->tag, internal_map); @@ -847,20 +847,20 @@ void memory_set_decrypted_region(const address_space *space, offs_t addrstart, o /* fatal error if the decrypted region straddles the bank */ else if (bank->bytestart < byteend && bank->byteend > bytestart) - fatalerror("memory_set_decrypted_region found straddled region %08X-%08X for CPU '%s'", bytestart, byteend, space->cpu->tag); + fatalerror("memory_set_decrypted_region found straddled region %08X-%08X for device '%s'", bytestart, byteend, space->cpu->tag); } } /* fatal error as well if we didn't find any relevant memory banks */ if (!found) - fatalerror("memory_set_decrypted_region unable to find matching region %08X-%08X for CPU '%s'", bytestart, byteend, space->cpu->tag); + fatalerror("memory_set_decrypted_region unable to find matching region %08X-%08X for device '%s'", bytestart, byteend, space->cpu->tag); } /*------------------------------------------------- memory_set_direct_update_handler - register a handler for opcode base changes on a given - CPU + device -------------------------------------------------*/ direct_update_func memory_set_direct_update_handler(const address_space *space, direct_update_func function) @@ -873,8 +873,9 @@ direct_update_func memory_set_direct_update_handler(const address_space *space, /*------------------------------------------------- - memory_set_direct_region - called by CPU cores to - update the opcode base for the given address + memory_set_direct_region - called by deivce + cores to update the opcode base for the given + address -------------------------------------------------*/ int memory_set_direct_region(const address_space *space, offs_t *byteaddress) @@ -914,7 +915,7 @@ int memory_set_direct_region(const address_space *space, offs_t *byteaddress) spacerw->direct.byteend = 0; spacerw->direct.bytestart = 1; if (!spacerw->debugger_access) - logerror("CPU '%s': warning - attempt to direct-map address %08X in %s space\n", space->cpu->tag, overrideaddress, space->name); + logerror("Device '%s': warning - attempt to direct-map address %08X in %s space\n", space->cpu->tag, overrideaddress, space->name); return FALSE; } @@ -1458,13 +1459,13 @@ void memory_dump(running_machine *machine, FILE *file) { fprintf(file, "\n\n" "====================================================\n" - "CPU '%s' %s address space read handler dump\n" + "Device '%s' %s address space read handler dump\n" "====================================================\n", space->cpu->tag, space->name); dump_map(file, space, &space->read); fprintf(file, "\n\n" "====================================================\n" - "CPU '%s' %s address space write handler dump\n" + "Device '%s' %s address space write handler dump\n" "====================================================\n", space->cpu->tag, space->name); dump_map(file, space, &space->read); } @@ -1492,17 +1493,17 @@ static void memory_init_spaces(running_machine *machine) memdata->wptable = auto_alloc_array(machine, UINT8, 1 << LEVEL1_BITS); memset(memdata->wptable, STATIC_WATCHPOINT, 1 << LEVEL1_BITS); - /* loop over CPUs */ - for (device = machine->cpu[0]; device != NULL; device = device->typenext) + /* loop over devices */ + for (device = machine->config->devicelist; device != NULL; device = device->next) for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++) - if (cpu_get_addrbus_width(device, spacenum) > 0) + if (device_get_addrbus_width(device, spacenum) > 0) { address_space *space = alloc_clear_or_die(address_space); int logbits = cpu_get_logaddr_width(device, spacenum); - int ashift = cpu_get_addrbus_shift(device, spacenum); - int abits = cpu_get_addrbus_width(device, spacenum); - int dbits = cpu_get_databus_width(device, spacenum); - int endianness = cpu_get_endianness(device); + int ashift = device_get_addrbus_shift(device, spacenum); + int abits = device_get_addrbus_width(device, spacenum); + int dbits = device_get_databus_width(device, spacenum); + int endianness = device_get_endianness(device); int accessorindex = (dbits == 8) ? 0 : (dbits == 16) ? 1 : (dbits == 32) ? 2 : 3; int entrynum; @@ -1522,7 +1523,6 @@ static void memory_init_spaces(running_machine *machine) space->spacenum = spacenum; space->endianness = endianness; space->ashift = ashift; - space->pageshift = cpu_get_page_shift(device, spacenum); space->abits = abits; space->dbits = dbits; space->addrchars = (abits + 3) / 4; @@ -1615,7 +1615,7 @@ static void memory_init_preflight(running_machine *machine) space->bytemask = memory_address_to_byte_end(space, space->addrmask); } - /* make a pass over the address map, adjusting for the CPU and getting memory pointers */ + /* make a pass over the address map, adjusting for the device and getting memory pointers */ for (entry = space->map->entrylist; entry != NULL; entry = entry->next) { /* computed adjusted addresses first */ @@ -1644,9 +1644,9 @@ static void memory_init_preflight(running_machine *machine) /* validate the region */ if (base == NULL) - fatalerror("Error: CPU '%s' %s space memory map entry %X-%X references non-existant region \"%s\"", space->cpu->tag, space->name, entry->addrstart, entry->addrend, entry->region); + fatalerror("Error: device '%s' %s space memory map entry %X-%X references non-existant region \"%s\"", space->cpu->tag, space->name, entry->addrstart, entry->addrend, entry->region); if (entry->rgnoffs + (entry->byteend - entry->bytestart + 1) > length) - fatalerror("Error: CPU '%s' %s space memory map entry %X-%X extends beyond region \"%s\" size (%X)", space->cpu->tag, space->name, entry->addrstart, entry->addrend, entry->region, length); + fatalerror("Error: device '%s' %s space memory map entry %X-%X extends beyond region \"%s\" size (%X)", space->cpu->tag, space->name, entry->addrstart, entry->addrend, entry->region, length); } /* convert any region-relative entries to their memory pointers */ @@ -1753,7 +1753,7 @@ static void memory_init_populate(running_machine *machine) /*------------------------------------------------- memory_init_allocate - allocate memory for - CPU address spaces + device address spaces -------------------------------------------------*/ static void memory_init_allocate(running_machine *machine) @@ -1988,7 +1988,7 @@ static void memory_exit(running_machine *machine) fatalerror("%s: %s AM_RANGE(0x%x, 0x%x) setting %s already set!\n", driver->source_file, driver->name, entry->addrstart, entry->addrend, #field); \ } while (0) -static void map_detokenize(address_map *map, const game_driver *driver, const char *cputag, const addrmap_token *tokens) +static void map_detokenize(address_map *map, const game_driver *driver, const char *devtag, const addrmap_token *tokens) { address_map_entry **entryptr; address_map_entry *entry; @@ -2027,7 +2027,7 @@ static void map_detokenize(address_map *map, const game_driver *driver, const ch /* including */ case ADDRMAP_TOKEN_INCLUDE: - map_detokenize(map, driver, cputag, TOKEN_GET_PTR(tokens, tokenptr)); + map_detokenize(map, driver, devtag, TOKEN_GET_PTR(tokens, tokenptr)); for (entryptr = &map->entrylist; *entryptr != NULL; entryptr = &(*entryptr)->next) ; entry = NULL; break; @@ -2090,7 +2090,7 @@ static void map_detokenize(address_map *map, const game_driver *driver, const ch entry->read_name = TOKEN_GET_STRING(tokens); if (entry->read_devtag_string == NULL) entry->read_devtag_string = astring_alloc(); - entry->read_devtag = device_inherit_tag(entry->read_devtag_string, cputag, TOKEN_GET_STRING(tokens)); + entry->read_devtag = device_inherit_tag(entry->read_devtag_string, devtag, TOKEN_GET_STRING(tokens)); break; case ADDRMAP_TOKEN_DEVICE_WRITE: @@ -2101,7 +2101,7 @@ static void map_detokenize(address_map *map, const game_driver *driver, const ch entry->write_name = TOKEN_GET_STRING(tokens); if (entry->write_devtag_string == NULL) entry->write_devtag_string = astring_alloc(); - entry->write_devtag = device_inherit_tag(entry->write_devtag_string, cputag, TOKEN_GET_STRING(tokens)); + entry->write_devtag = device_inherit_tag(entry->write_devtag_string, devtag, TOKEN_GET_STRING(tokens)); break; case ADDRMAP_TOKEN_READ_PORT: @@ -2115,7 +2115,7 @@ static void map_detokenize(address_map *map, const game_driver *driver, const ch TOKEN_GET_UINT64_UNPACK2(tokens, entrytype, 8, entry->rgnoffs, 32); if (entry->region_string == NULL) entry->region_string = astring_alloc(); - entry->region = device_inherit_tag(entry->region_string, cputag, TOKEN_GET_STRING(tokens)); + entry->region = device_inherit_tag(entry->region_string, devtag, TOKEN_GET_STRING(tokens)); break; case ADDRMAP_TOKEN_SHARE: @@ -2262,8 +2262,8 @@ static void space_map_range(address_space *space, read_or_write readorwrite, int /*------------------------------------------------- space_find_backing_memory - return a pointer to - the base of RAM associated with the given CPU - and offset + the base of RAM associated with the given + device and offset -------------------------------------------------*/ static void *space_find_backing_memory(const address_space *space, offs_t byteaddress) @@ -2400,7 +2400,7 @@ static genf *bank_assign_dynamic(const address_space *space, read_or_write reado } /* if we got here, we failed */ - fatalerror("CPU '%s': ran out of banks for RAM/ROM regions!", space->cpu->tag); + fatalerror("Device '%s': ran out of banks for RAM/ROM regions!", space->cpu->tag); return NULL; } @@ -3187,40 +3187,40 @@ static address_map_entry *block_assign_intersecting(address_space *space, offs_t static READ8_HANDLER( unmap_read8 ) { - if (space->log_unmap && !space->debugger_access) logerror("CPU '%s' (PC=%08X): unmapped %s memory byte read from %08X\n", space->cpu->tag, cpu_get_pc(space->cpu), space->name, memory_byte_to_address(space, offset)); + if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory byte read from %08X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset)); return space->unmap; } static READ16_HANDLER( unmap_read16 ) { - if (space->log_unmap && !space->debugger_access) logerror("CPU '%s' (PC=%08X): unmapped %s memory word read from %08X & %04X\n", space->cpu->tag, cpu_get_pc(space->cpu), space->name, memory_byte_to_address(space, offset*2), mem_mask); + if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory word read from %08X & %04X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*2), mem_mask); return space->unmap; } static READ32_HANDLER( unmap_read32 ) { - if (space->log_unmap && !space->debugger_access) logerror("CPU '%s' (PC=%08X): unmapped %s memory dword read from %08X & %08X\n", space->cpu->tag, cpu_get_pc(space->cpu), space->name, memory_byte_to_address(space, offset*4), mem_mask); + if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory dword read from %08X & %08X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*4), mem_mask); return space->unmap; } static READ64_HANDLER( unmap_read64 ) { - if (space->log_unmap && !space->debugger_access) logerror("CPU '%s' (PC=%08X): unmapped %s memory qword read from %08X & %08X%08X\n", space->cpu->tag, cpu_get_pc(space->cpu), space->name, memory_byte_to_address(space, offset*8), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); + if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory qword read from %08X & %08X%08X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*8), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); return space->unmap; } static WRITE8_HANDLER( unmap_write8 ) { - if (space->log_unmap && !space->debugger_access) logerror("CPU '%s' (PC=%08X): unmapped %s memory byte write to %08X = %02X\n", space->cpu->tag, cpu_get_pc(space->cpu), space->name, memory_byte_to_address(space, offset), data); + if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory byte write to %08X = %02X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset), data); } static WRITE16_HANDLER( unmap_write16 ) { - if (space->log_unmap && !space->debugger_access) logerror("CPU '%s' (PC=%08X): unmapped %s memory word write to %08X = %04X & %04X\n", space->cpu->tag, cpu_get_pc(space->cpu), space->name, memory_byte_to_address(space, offset*2), data, mem_mask); + if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory word write to %08X = %04X & %04X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*2), data, mem_mask); } static WRITE32_HANDLER( unmap_write32 ) { - if (space->log_unmap && !space->debugger_access) logerror("CPU '%s' (PC=%08X): unmapped %s memory dword write to %08X = %08X & %08X\n", space->cpu->tag, cpu_get_pc(space->cpu), space->name, memory_byte_to_address(space, offset*4), data, mem_mask); + if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory dword write to %08X = %08X & %08X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*4), data, mem_mask); } static WRITE64_HANDLER( unmap_write64 ) { - if (space->log_unmap && !space->debugger_access) logerror("CPU '%s' (PC=%08X): unmapped %s memory qword write to %08X = %08X%08X & %08X%08X\n", space->cpu->tag, cpu_get_pc(space->cpu), space->name, memory_byte_to_address(space, offset*8), (int)(data >> 32), (int)(data & 0xffffffff), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); + if (space->log_unmap && !space->debugger_access) logerror("%s: unmapped %s memory qword write to %08X = %08X%08X & %08X%08X\n", cpuexec_describe_context(space->machine), space->name, memory_byte_to_address(space, offset*8), (int)(data >> 32), (int)(data & 0xffffffff), (int)(mem_mask >> 32), (int)(mem_mask & 0xffffffff)); } diff --git a/src/emu/memory.h b/src/emu/memory.h index 098be1cf20f..06661c744de 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -2,7 +2,7 @@ memory.h - Functions which handle the CPU memory accesses. + Functions which handle device memory accesses. Copyright Nicola Salmoria and the MAME Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -274,7 +274,7 @@ struct _address_space { address_space * next; /* next address space in the global list */ running_machine * machine; /* reference to the owning machine */ - const device_config * cpu; /* reference to the owning CPU */ + const device_config * cpu; /* reference to the owning device */ address_map * map; /* original memory map */ const char * name; /* friendly name of the address space */ UINT8 * readlookup; /* live lookup table for reads */ @@ -290,7 +290,6 @@ struct _address_space UINT8 spacenum; /* address space index */ UINT8 endianness; /* endianness of this space */ INT8 ashift; /* address shift */ - UINT8 pageshift; /* page shift */ UINT8 abits; /* address bits */ UINT8 dbits; /* data bits */ UINT8 addrchars; /* number of characters to use for physical addresses */ @@ -804,14 +803,14 @@ extern const char *const address_space_names[ADDRESS_SPACES]; /* initialize the memory system */ void memory_init(running_machine *machine); -/* find an address space in our internal list; for faster access use cpu_get_address_space() */ -const address_space *memory_find_address_space(const device_config *cpu, int spacenum); +/* find an address space in our internal list; for faster access use device->space[] after device is started */ +const address_space *memory_find_address_space(const device_config *device, int spacenum); /* ----- address maps ----- */ -/* build and allocate an address map for a CPU's address space */ +/* build and allocate an address map for a device's address space */ address_map *address_map_alloc(const device_config *device, const game_driver *driver, int spacenum); /* release allocated memory for an address map */ @@ -824,10 +823,10 @@ void address_map_free(address_map *map); /* registers an address range as having a decrypted data pointer */ void memory_set_decrypted_region(const address_space *space, offs_t addrstart, offs_t addrend, void *base) ATTR_NONNULL(1, 4); -/* register a handler for opcode base changes on a given CPU */ +/* register a handler for opcode base changes on a given device */ direct_update_func memory_set_direct_update_handler(const address_space *space, direct_update_func function) ATTR_NONNULL(1); -/* called by CPU cores to update the opcode base for the given address */ +/* called by device cores to update the opcode base for the given address */ int memory_set_direct_region(const address_space *space, offs_t *byteaddress) ATTR_NONNULL(1, 2); /* return a pointer the memory byte provided in the given address space, or NULL if it is not mapped to a bank */ |