summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/pdp1
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2012-09-03 18:24:54 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2012-09-03 18:24:54 +0000
commit894a91d188239a6426bd70ffab1f275bdd78396b (patch)
treeeda10b2b878b973ac6a8fd5d5816c212de1f2fe2 /src/emu/cpu/pdp1
parentf3d1a457841b4790de2573e13bc8a7816ff8bd4b (diff)
DEVINFO_* to CPU_INFO_*, and some cleanups (no whatsnew)
Diffstat (limited to 'src/emu/cpu/pdp1')
-rw-r--r--src/emu/cpu/pdp1/pdp1.c30
-rw-r--r--src/emu/cpu/pdp1/tx0.c60
2 files changed, 45 insertions, 45 deletions
diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c
index db4222c994d..f2e68e67609 100644
--- a/src/emu/cpu/pdp1/pdp1.c
+++ b/src/emu/cpu/pdp1/pdp1.c
@@ -939,7 +939,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 DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break;
+ case CPUINFO_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;
@@ -947,15 +947,15 @@ CPU_GET_INFO( pdp1 )
case CPUINFO_INT_MIN_CYCLES: info->i = 5; /* 5us cycle time */ break;
case CPUINFO_INT_MAX_CYCLES: info->i = 31; /* we emulate individual 5us cycle, but MUL/DIV have longer timings */ break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 18; /*16+2 ignored bits to make double word address*/ break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 18; /*16+2 ignored bits to make double word address*/ break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_SP: info->i = 0; /* no SP */ break;
case CPUINFO_INT_PC: info->i = PC; break;
@@ -1026,11 +1026,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 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,
+ case CPUINFO_STR_NAME: strcpy(info->s, "PDP1"); break;
+ case CPUINFO_STR_FAMILY: strcpy(info->s, "DEC PDP-1"); break;
+ case CPUINFO_STR_VERSION: strcpy(info->s, "2.0"); break;
+ case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
+ case CPUINFO_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 78d43bc28df..43d59f42997 100644
--- a/src/emu/cpu/pdp1/tx0.c
+++ b/src/emu/cpu/pdp1/tx0.c
@@ -433,7 +433,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 DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break;
+ case CPUINFO_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;
@@ -441,15 +441,15 @@ CPU_GET_INFO( tx0_64kw )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 3; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -2; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -2; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_SP: info->i = 0; /* no SP */ break;
case CPUINFO_INT_PC: info->i = PC; break;
@@ -502,11 +502,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 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_NAME: strcpy(info->s, "TX-0"); break;
+ case CPUINFO_STR_FAMILY: strcpy(info->s, "TX-0"); break;
+ case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
+ case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
+ case CPUINFO_STR_CREDITS: strcpy(info->s, "Raphael Nabet"); break;
case CPUINFO_STR_FLAGS: strcpy(info->s, ""); break;
@@ -560,7 +560,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 DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; /*don't care*/ break;
+ case CPUINFO_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;
@@ -568,15 +568,15 @@ CPU_GET_INFO( tx0_8kw )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 3; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 13; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -2; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 13; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -2; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case CPUINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case CPUINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_SP: info->i = 0; /* no SP */ break;
case CPUINFO_INT_PC: info->i = PC; break;
@@ -629,11 +629,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 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_NAME: strcpy(info->s, "TX-0"); break;
+ case CPUINFO_STR_FAMILY: strcpy(info->s, "TX-0"); break;
+ case CPUINFO_STR_VERSION: strcpy(info->s, "1.0"); break;
+ case CPUINFO_STR_SOURCE_FILE: strcpy(info->s, __FILE__); break;
+ case CPUINFO_STR_CREDITS: strcpy(info->s, "Raphael Nabet"); break;
case CPUINFO_STR_FLAGS: strcpy(info->s, ""); break;