Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-28 16:43:04 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

PTR -> FCT naming for a few remaining items in CPU cores. [Duke, Aaron Giles]

Browse Source
This commit is contained in:
Aaron Giles 2008-12-31 03:08:34 +00:00
parent 88f4221231
commit 379e2e1fdc
10 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/cpu/g65816/g65816.c
View File

@ -389,7 +389,7 @@ static CPU_SET_INFO( g65816 )
case CPUINFO_INT_REGISTER + G65816_IRQ_STATE: g65816_set_reg(cpustate, G65816_IRQ_STATE, info->i); break;
/* --- the following bits of info are set as pointers to data or functions --- */
case CPUINFO_PTR_G65816_READVECTOR_CALLBACK: READ_VECTOR = (read8_space_func) info->f; break;
case CPUINFO_FCT_G65816_READVECTOR_CALLBACK: READ_VECTOR = (read8_space_func) info->f; break;
}
}
@ -461,7 +461,7 @@ CPU_GET_INFO( g65816 )
case CPUINFO_FCT_BURN: info->burn = NULL; break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(g65816); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->ICount; break;
case CPUINFO_PTR_G65816_READVECTOR_CALLBACK: info->f = (genf *) READ_VECTOR; break;
case CPUINFO_FCT_G65816_READVECTOR_CALLBACK: info->f = (genf *) READ_VECTOR; break;
case CPUINFO_FCT_READOP: info->readop = CPU_READOP_NAME(g65816); break;

2
src/emu/cpu/g65816/g65816.h
View File

@ -60,7 +60,7 @@ enum
enum
{
CPUINFO_PTR_G65816_READVECTOR_CALLBACK = CPUINFO_PTR_CPU_SPECIFIC
CPUINFO_FCT_G65816_READVECTOR_CALLBACK = CPUINFO_FCT_CPU_SPECIFIC
};
/* Main interface function */

16
src/emu/cpu/m6502/m4510.c
View File

@ -419,10 +419,10 @@ static CPU_SET_INFO( m4510 )
case CPUINFO_INT_REGISTER + M4510_MEM7: cpustate->mem[7] = info->i; break;
/* --- the following bits of info are set as pointers to data or functions --- */
case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: cpustate->rdmem_id = (m6502_read_indexed_func) info->f; break;
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: cpustate->wrmem_id = (m6502_write_indexed_func) info->f; break;
case CPUINFO_PTR_M6510_PORTREAD: cpustate->port_read = (m6510_port_read_func) info->f; break;
case CPUINFO_PTR_M6510_PORTWRITE: cpustate->port_write = (m6510_port_write_func) info->f; break;
case CPUINFO_FCT_M6502_READINDEXED_CALLBACK: cpustate->rdmem_id = (m6502_read_indexed_func) info->f; break;
case CPUINFO_FCT_M6502_WRITEINDEXED_CALLBACK: cpustate->wrmem_id = (m6502_write_indexed_func) info->f; break;
case CPUINFO_FCT_M6510_PORTREAD: cpustate->port_read = (m6510_port_read_func) info->f; break;
case CPUINFO_FCT_M6510_PORTWRITE: cpustate->port_write = (m6510_port_write_func) info->f; break;
}
}
@ -502,10 +502,10 @@ CPU_GET_INFO( m4510 )
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_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(m4510); break;
case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: info->f = (genf *) cpustate->rdmem_id; break;
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) cpustate->wrmem_id; break;
case CPUINFO_PTR_M6510_PORTREAD: info->f = (genf *) cpustate->port_read; break;
case CPUINFO_PTR_M6510_PORTWRITE: info->f = (genf *) cpustate->port_write; break;
case CPUINFO_FCT_M6502_READINDEXED_CALLBACK: info->f = (genf *) cpustate->rdmem_id; break;
case CPUINFO_FCT_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) cpustate->wrmem_id; break;
case CPUINFO_FCT_M6510_PORTREAD: info->f = (genf *) cpustate->port_read; break;
case CPUINFO_FCT_M6510_PORTWRITE: info->f = (genf *) cpustate->port_write; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M4510"); break;

16
src/emu/cpu/m6502/m6502.c
View File

@ -680,8 +680,8 @@ static CPU_SET_INFO( m6502 )
case CPUINFO_INT_REGISTER + M6502_ZP: cpustate->zp.w.l = info->i; break;
/* --- the following bits of info are set as pointers to data or functions --- */
case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: cpustate->rdmem_id = (m6502_read_indexed_func) info->f; break;
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: cpustate->wrmem_id = (m6502_write_indexed_func) info->f; break;
case CPUINFO_FCT_M6502_READINDEXED_CALLBACK: cpustate->rdmem_id = (m6502_read_indexed_func) info->f; break;
case CPUINFO_FCT_M6502_WRITEINDEXED_CALLBACK: cpustate->wrmem_id = (m6502_write_indexed_func) info->f; break;
}
}
@ -746,8 +746,8 @@ CPU_GET_INFO( m6502 )
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_M6502_READINDEXED_CALLBACK: info->f = (genf *) cpustate->rdmem_id; break;
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) cpustate->wrmem_id; break;
case CPUINFO_FCT_M6502_READINDEXED_CALLBACK: info->f = (genf *) cpustate->rdmem_id; break;
case CPUINFO_FCT_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) cpustate->wrmem_id; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M6502"); break;
@ -813,8 +813,8 @@ static CPU_SET_INFO( m6510 )
switch (state)
{
/* --- the following bits of info are set as pointers to data or functions --- */
case CPUINFO_PTR_M6510_PORTREAD: cpustate->port_read = (m6510_port_read_func) info->f; break;
case CPUINFO_PTR_M6510_PORTWRITE: cpustate->port_write = (m6510_port_write_func) info->f; break;
case CPUINFO_FCT_M6510_PORTREAD: cpustate->port_read = (m6510_port_read_func) info->f; break;
case CPUINFO_FCT_M6510_PORTWRITE: cpustate->port_write = (m6510_port_write_func) info->f; break;
default: CPU_SET_INFO_CALL(m6502); break;
}
@ -832,8 +832,8 @@ CPU_GET_INFO( m6510 )
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_M6510_PORTREAD: info->f = (genf *) cpustate->port_read; break;
case CPUINFO_PTR_M6510_PORTWRITE: info->f = (genf *) cpustate->port_write; break;
case CPUINFO_FCT_M6510_PORTREAD: info->f = (genf *) cpustate->port_read; break;
case CPUINFO_FCT_M6510_PORTWRITE: info->f = (genf *) cpustate->port_write; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M6510"); break;

8
src/emu/cpu/m6502/m6502.h
View File

@ -70,10 +70,10 @@ typedef void (*m6510_port_write_func)(const device_config *device, UINT8 directi
enum
{
CPUINFO_PTR_M6502_READINDEXED_CALLBACK = CPUINFO_PTR_CPU_SPECIFIC,
CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK,
CPUINFO_PTR_M6510_PORTREAD,
CPUINFO_PTR_M6510_PORTWRITE,
CPUINFO_FCT_M6502_READINDEXED_CALLBACK = CPUINFO_FCT_CPU_SPECIFIC,
CPUINFO_FCT_M6502_WRITEINDEXED_CALLBACK,
CPUINFO_FCT_M6510_PORTREAD,
CPUINFO_FCT_M6510_PORTWRITE,
CPUINFO_INT_M6510_PORT = CPUINFO_INT_CPU_SPECIFIC
};

8
src/emu/cpu/m6502/m6509.c
View File

@ -303,8 +303,8 @@ static CPU_SET_INFO( m6509 )
case CPUINFO_INT_REGISTER + M6509_ZP: cpustate->zp.w.l = info->i; break;
/* --- the following bits of info are set as pointers to data or functions --- */
case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: cpustate->rdmem_id = (m6502_read_indexed_func) info->f; break;
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: cpustate->wrmem_id = (m6502_write_indexed_func) info->f; break;
case CPUINFO_FCT_M6502_READINDEXED_CALLBACK: cpustate->rdmem_id = (m6502_read_indexed_func) info->f; break;
case CPUINFO_FCT_M6502_WRITEINDEXED_CALLBACK: cpustate->wrmem_id = (m6502_write_indexed_func) info->f; break;
}
}
@ -371,8 +371,8 @@ CPU_GET_INFO( m6509 )
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_M6502_READINDEXED_CALLBACK: info->f = (genf *) cpustate->rdmem_id; break;
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) cpustate->wrmem_id; break;
case CPUINFO_FCT_M6502_READINDEXED_CALLBACK: info->f = (genf *) cpustate->rdmem_id; break;
case CPUINFO_FCT_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) cpustate->wrmem_id; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M6509"); break;

8
src/emu/cpu/m6502/m65ce02.c
View File

@ -249,8 +249,8 @@ static CPU_SET_INFO( m65ce02 )
case CPUINFO_INT_REGISTER + M65CE02_ZP: cpustate->zp.b.l = info->i; break;
/* --- the following bits of info are set as pointers to data or functions --- */
case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: cpustate->rdmem_id = (m6502_read_indexed_func) info->f; break;
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: cpustate->wrmem_id = (m6502_write_indexed_func) info->f; break;
case CPUINFO_FCT_M6502_READINDEXED_CALLBACK: cpustate->rdmem_id = (m6502_read_indexed_func) info->f; break;
case CPUINFO_FCT_M6502_WRITEINDEXED_CALLBACK: cpustate->wrmem_id = (m6502_write_indexed_func) info->f; break;
}
}
@ -315,8 +315,8 @@ CPU_GET_INFO( m65ce02 )
case CPUINFO_FCT_BURN: info->burn = NULL; break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m65ce02); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
case CPUINFO_PTR_M6502_READINDEXED_CALLBACK: info->f = (genf *) cpustate->rdmem_id; break;
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) cpustate->wrmem_id; break;
case CPUINFO_FCT_M6502_READINDEXED_CALLBACK: info->f = (genf *) cpustate->rdmem_id; break;
case CPUINFO_FCT_M6502_WRITEINDEXED_CALLBACK: info->f = (genf *) cpustate->wrmem_id; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case CPUINFO_STR_NAME: strcpy(info->s, "M65CE02"); break;

4
src/emu/cpu/sh2/sh2.c
View File

@ -2312,7 +2312,7 @@ static CPU_SET_INFO( sh2 )
case CPUINFO_INT_SH2_FRT_INPUT: sh2_set_frt_input(device, info->i); break;
/* --- the following bits of info are set as pointers to data or functions --- */
case CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK: sh2->ftcsr_read_callback = (void (*) (UINT32 ))info->f; break;
case CPUINFO_FCT_SH2_FTCSR_READ_CALLBACK: sh2->ftcsr_read_callback = (void (*) (UINT32 ))info->f; break;
}
}
@ -2446,7 +2446,7 @@ CPU_GET_INFO( sh2 )
case CPUINFO_STR_REGISTER + SH2_R15: sprintf(info->s, "R15 :%08X", sh2->r[15]); break;
case CPUINFO_STR_REGISTER + SH2_EA: sprintf(info->s, "EA :%08X", sh2->ea); break;
case CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK: info->f = (genf*)sh2->ftcsr_read_callback; break;
case CPUINFO_FCT_SH2_FTCSR_READ_CALLBACK: info->f = (genf*)sh2->ftcsr_read_callback; break;
}
}

4
src/emu/cpu/sh2/sh2.h
View File

@ -80,9 +80,9 @@ enum
enum
{
CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK = CPUINFO_PTR_CPU_SPECIFIC,
CPUINFO_FCT_SH2_FTCSR_READ_CALLBACK = CPUINFO_FCT_CPU_SPECIFIC,
CPUINFO_PTR_SH2_FASTRAM_BASE
CPUINFO_PTR_SH2_FASTRAM_BASE = CPUINFO_PTR_CPU_SPECIFIC
};
typedef struct _sh2_cpu_core sh2_cpu_core;

4
src/emu/cpu/sh2/sh2drc.c
View File

@ -3390,7 +3390,7 @@ static CPU_SET_INFO( sh2 )
case CPUINFO_INT_SH2_FRT_INPUT: sh2_set_frt_input(device, info->i); break;
/* --- the following bits of info are set as pointers to data or functions --- */
case CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK: sh2->ftcsr_read_callback = (void (*) (UINT32 ))info->f; break;
case CPUINFO_FCT_SH2_FTCSR_READ_CALLBACK: sh2->ftcsr_read_callback = (void (*) (UINT32 ))info->f; break;
}
}
@ -3530,7 +3530,7 @@ CPU_GET_INFO( sh2 )
case CPUINFO_STR_REGISTER + SH2_R15: sprintf(info->s, "R15 :%08X", sh2->r[15]); break;
case CPUINFO_STR_REGISTER + SH2_EA: sprintf(info->s, "EA :%08X", sh2->ea); break;
case CPUINFO_PTR_SH2_FTCSR_READ_CALLBACK: info->f = (genf*)sh2->ftcsr_read_callback; break;
case CPUINFO_FCT_SH2_FTCSR_READ_CALLBACK: info->f = (genf*)sh2->ftcsr_read_callback; break;
}
}