diff options
author | 2008-11-09 01:04:37 +0000 | |
---|---|---|
committer | 2008-11-09 01:04:37 +0000 | |
commit | 1e16c452121de8429e05b38d5a0306ebe15fcdd4 (patch) | |
tree | d84961b587774ad4e0c68078eaf5ffb0f9b02e56 /src/emu/cpu/m6502 | |
parent | ac7689264ec37623f67d18ca09ecd6ed88557672 (diff) |
Cleanups/version bump.mame0128u3
Diffstat (limited to 'src/emu/cpu/m6502')
-rw-r--r-- | src/emu/cpu/m6502/m4510.c | 26 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m6502.c | 30 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m6509.c | 24 | ||||
-rw-r--r-- | src/emu/cpu/m6502/m65ce02.c | 2 |
4 files changed, 41 insertions, 41 deletions
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c index c564a9b5771..e27a8240fce 100644 --- a/src/emu/cpu/m6502/m4510.c +++ b/src/emu/cpu/m6502/m4510.c @@ -141,11 +141,11 @@ struct _m4510_Regs { UINT8 irq_state; UINT16 low, high; UINT32 mem[8]; - + cpu_irq_callback irq_callback; const device_config *device; int icount; - + read8_machine_func rdmem_id; /* readmem callback for indexed instructions */ write8_machine_func wrmem_id; /* writemem callback for indexed instructions */ @@ -179,20 +179,20 @@ INLINE int m4510_cpu_readop_arg(m4510_Regs *m4510) static READ8_HANDLER( default_rdmem_id ) { m4510_Regs *m4510 = token; - return program_read_byte_8le(M4510_MEM(offset)); + return program_read_byte_8le(M4510_MEM(offset)); } -static WRITE8_HANDLER( default_wrmem_id ) +static WRITE8_HANDLER( default_wrmem_id ) { m4510_Regs *m4510 = token; - program_write_byte_8le(M4510_MEM(offset), data); + program_write_byte_8le(M4510_MEM(offset), data); } static CPU_INIT( m4510 ) { m4510_Regs *m4510 = device->token; - + token = device->token; - + m4510->interrupt_inhibit = 0; m4510->rdmem_id = default_rdmem_id; m4510->wrmem_id = default_wrmem_id; @@ -203,7 +203,7 @@ static CPU_INIT( m4510 ) static CPU_RESET( m4510 ) { m4510_Regs *m4510 = device->token; - + m4510->insn = insn4510; /* wipe out the rest of the m65ce02 structure */ @@ -276,7 +276,7 @@ INLINE void m4510_take_irq(m4510_Regs *m4510) static CPU_EXECUTE( m4510 ) { m4510_Regs *m4510 = token; - + m4510->icount = cycles; CHANGE_PC; @@ -378,7 +378,7 @@ static READ8_HANDLER( m4510_read_0000 ) static WRITE8_HANDLER( m4510_write_0000 ) { m4510_Regs *m4510 = token; - + switch(offset) { case 0x0000: /* DDR */ @@ -400,7 +400,7 @@ ADDRESS_MAP_END static CPU_TRANSLATE( m4510 ) { m4510_Regs *m4510 = token; - + if (space == ADDRESS_SPACE_PROGRAM) *address = M4510_MEM(*address); return TRUE; @@ -413,7 +413,7 @@ static CPU_TRANSLATE( m4510 ) static CPU_SET_INFO( m4510 ) { m4510_Regs *m4510 = token; - + switch (state) { /* --- the following bits of info are set as 64-bit signed integers --- */ @@ -460,7 +460,7 @@ static CPU_SET_INFO( m4510 ) CPU_GET_INFO( m4510 ) { m4510_Regs *m4510 = token; - + switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c index 02101f6f167..b68b770710c 100644 --- a/src/emu/cpu/m6502/m6502.c +++ b/src/emu/cpu/m6502/m6502.c @@ -137,7 +137,7 @@ static void m6502_common_init(const device_config *device, int index, int clock, m6502_Regs *m6502 = device->token; token = device->token; // temporary - + m6502->irq_callback = irqcallback; m6502->device = device; m6502->subtype = subtype; @@ -201,7 +201,7 @@ static CPU_GET_CONTEXT( m6502 ) static CPU_SET_CONTEXT( m6502 ) { m6502_Regs *m6502; - + if( src ) { token = src; @@ -233,7 +233,7 @@ INLINE void m6502_take_irq(m6502_Regs *m6502) static CPU_EXECUTE( m6502 ) { m6502_Regs *m6502 = device->token; - + m6502->icount = cycles; change_pc(PCD); @@ -367,7 +367,7 @@ static CPU_INIT( m6510 ) static CPU_RESET( m6510 ) { m6502_Regs *m6502 = device->token; - + CPU_RESET_CALL(m6502); m6502->port = 0xff; m6502->ddr = 0x00; @@ -400,7 +400,7 @@ static READ8_HANDLER( m6510_read_0000 ) static WRITE8_HANDLER( m6510_write_0000 ) { m6502_Regs *m6502 = token; - + switch(offset) { case 0x0000: /* DDR */ @@ -435,7 +435,7 @@ static CPU_INIT( m65c02 ) static CPU_RESET( m65c02 ) { m6502_Regs *m6502 = device->token; - + CPU_RESET_CALL(m6502); P &=~F_D; } @@ -463,7 +463,7 @@ INLINE void m65c02_take_irq(m6502_Regs *m6502) static CPU_EXECUTE( m65c02 ) { m6502_Regs *m6502 = device->token; - + m6502->icount = cycles; change_pc(PCD); @@ -557,7 +557,7 @@ static CPU_INIT( deco16 ) static CPU_RESET( deco16 ) { m6502_Regs *m6502 = device->token; - + CPU_RESET_CALL(m6502); m6502->subtype = SUBTYPE_DECO16; m6502->insn = insndeco16; @@ -638,7 +638,7 @@ static void deco16_set_irq_line(m6502_Regs *m6502, int irqline, int state) static CPU_EXECUTE( deco16 ) { m6502_Regs *m6502 = device->token; - + m6502->icount = cycles; change_pc(PCD); @@ -693,7 +693,7 @@ static CPU_EXECUTE( deco16 ) static CPU_SET_INFO( m6502 ) { m6502_Regs *m6502 = token; - + switch (state) { /* --- the following bits of info are set as 64-bit signed integers --- */ @@ -727,7 +727,7 @@ static CPU_SET_INFO( m6502 ) CPU_GET_INFO( m6502 ) { m6502_Regs *m6502 = token; - + switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ @@ -844,7 +844,7 @@ CPU_GET_INFO( n2a03 ) static CPU_SET_INFO( m6510 ) { m6502_Regs *m6502 = token; - + switch (state) { /* --- the following bits of info are set as pointers to data or functions --- */ @@ -858,7 +858,7 @@ static CPU_SET_INFO( m6510 ) CPU_GET_INFO( m6510 ) { m6502_Regs *m6502 = token; - + switch (state) { /* --- the following bits of info are returned as pointers to data or functions --- */ @@ -944,7 +944,7 @@ CPU_GET_INFO( m8502 ) static CPU_SET_INFO( m65c02 ) { m6502_Regs *m6502 = token; - + switch (state) { /* --- the following bits of info are set as 64-bit signed integers --- */ @@ -1008,7 +1008,7 @@ CPU_GET_INFO( m65sc02 ) static CPU_SET_INFO( deco16 ) { m6502_Regs *m6502 = token; - + switch (state) { /* --- the following bits of info are set as 64-bit signed integers --- */ diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c index 7abe73f5154..6a63a2b0eff 100644 --- a/src/emu/cpu/m6502/m6509.c +++ b/src/emu/cpu/m6502/m6509.c @@ -97,14 +97,14 @@ static void *token; static READ8_HANDLER( m6509_read_00000 ) { m6509_Regs *m6509 = token; - + return m6509->pc_bank.b.h2; } static READ8_HANDLER( m6509_read_00001 ) { m6509_Regs *m6509 = token; - + return m6509->ind_bank.b.h2; } @@ -112,7 +112,7 @@ static WRITE8_HANDLER( m6509_write_00000 ) { m6509_Regs *m6509 = token; m6509_Regs *m6502 = m6509; - + m6509->pc_bank.b.h2=data&0xf; m6509->pc.w.h=m6509->pc_bank.w.h; change_pc(PCD); @@ -122,7 +122,7 @@ static WRITE8_HANDLER( m6509_write_00000 ) static WRITE8_HANDLER( m6509_write_00001 ) { m6509_Regs *m6509 = token; - + m6509->ind_bank.b.h2=data&0xf; } @@ -137,9 +137,9 @@ static WRITE8_HANDLER( default_wdmem_id ) { program_write_byte_8le(offset, data) static CPU_INIT( m6509 ) { m6509_Regs *m6509 = device->token; - + token = device->token; // temporary - + m6509->rdmem_id = default_rdmem_id; m6509->wrmem_id = default_wdmem_id; m6509->irq_callback = irqcallback; @@ -150,7 +150,7 @@ static CPU_RESET( m6509 ) { m6509_Regs *m6509 = device->token; m6509_Regs *m6502 = m6509; - + m6509->insn = insn6509; m6509->pc_bank.d=m6509->ind_bank.d=0; @@ -182,7 +182,7 @@ static CPU_GET_CONTEXT( m6509 ) static CPU_SET_CONTEXT( m6509 ) { m6509_Regs *m6502; - + if( src ) { token = src; @@ -219,7 +219,7 @@ static CPU_EXECUTE( m6509 ) { m6509_Regs *m6502 = device->token; m6509_Regs *m6509 = m6502; - + m6502->icount = cycles; change_pc(PCD); @@ -265,7 +265,7 @@ static CPU_EXECUTE( m6509 ) static void m6509_set_irq_line(m6509_Regs *m6509, int irqline, int state) { m6509_Regs *m6502 = m6509; - + if (irqline == INPUT_LINE_NMI) { if (m6509->nmi_state == state) return; @@ -315,7 +315,7 @@ static CPU_SET_INFO( m6509 ) { m6509_Regs *m6509 = token; m6509_Regs *m6502 = m6509; - + switch (state) { /* --- the following bits of info are set as 64-bit signed integers --- */ @@ -352,7 +352,7 @@ CPU_GET_INFO( m6509 ) { m6509_Regs *m6502 = token; m6509_Regs *m6509 = m6502; - + switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c index 29d7d876334..be9641d197c 100644 --- a/src/emu/cpu/m6502/m65ce02.c +++ b/src/emu/cpu/m6502/m65ce02.c @@ -55,7 +55,7 @@ #define LOG(x) do { if (VERBOSE) logerror x; } while (0) -typedef struct _m65ce02_Regs m65ce02_Regs; +typedef struct _m65ce02_Regs m65ce02_Regs; struct _m65ce02_Regs { void (*const *insn)(void); /* pointer to the function pointer table */ PAIR ppc; /* previous program counter */ |