diff options
Diffstat (limited to 'src/emu/cpu')
61 files changed, 106 insertions, 106 deletions
diff --git a/src/emu/cpu/am29000/am29000.c b/src/emu/cpu/am29000/am29000.c index b4b27fd9f93..5506a668af6 100644 --- a/src/emu/cpu/am29000/am29000.c +++ b/src/emu/cpu/am29000/am29000.c @@ -75,7 +75,7 @@ STRUCTURES & TYPEDEFS ***************************************************************************/ -struct am29000_state +struct am29000_state { INT32 icount; UINT32 pc; diff --git a/src/emu/cpu/am29000/am29ops.h b/src/emu/cpu/am29000/am29ops.h index 972778904e4..d496bbb63e2 100644 --- a/src/emu/cpu/am29000/am29ops.h +++ b/src/emu/cpu/am29000/am29ops.h @@ -61,7 +61,7 @@ STRUCTS ***************************************************************************/ -struct op_info +struct op_info { void (*opcode)(am29000_state *); UINT32 flags; diff --git a/src/emu/cpu/apexc/apexcdsm.c b/src/emu/cpu/apexc/apexcdsm.c index fcc5650bffa..25a48f8a531 100644 --- a/src/emu/cpu/apexc/apexcdsm.c +++ b/src/emu/cpu/apexc/apexcdsm.c @@ -63,7 +63,7 @@ */ enum format_type {branch, shiftl, shiftr, multiply, store, swap, one_address, two_address}; -struct instr_desc +struct instr_desc { const char *mnemonic; format_type format; /* -> X and Y are format */ diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c index 7fce7199798..cb99f0347fa 100644 --- a/src/emu/cpu/arm/arm.c +++ b/src/emu/cpu/arm/arm.c @@ -227,7 +227,7 @@ enum /* Private Data */ /* sArmRegister defines the CPU state */ -struct ARM_REGS +struct ARM_REGS { int icount; UINT32 sArmRegister[kNumRegisters]; diff --git a/src/emu/cpu/arm7/arm7core.h b/src/emu/cpu/arm7/arm7core.h index 926c83726f7..14a7a8c9195 100644 --- a/src/emu/cpu/arm7/arm7core.h +++ b/src/emu/cpu/arm7/arm7core.h @@ -185,7 +185,7 @@ enum /* CPU state struct */ -struct arm_state +struct arm_state { ARM7CORE_REGS // these must be included in your cpu specific register implementation ARM7COPRO_REGS diff --git a/src/emu/cpu/cosmac/cosdasm.c b/src/emu/cpu/cosmac/cosdasm.c index c7a7aa31c9e..8f87d694bc1 100644 --- a/src/emu/cpu/cosmac/cosdasm.c +++ b/src/emu/cpu/cosmac/cosdasm.c @@ -24,7 +24,7 @@ #include "cosmac.h" -enum Adr +enum Adr { Ill, Imm, diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c index e88a5950561..bc4064093a5 100644 --- a/src/emu/cpu/cubeqcpu/cubeqcpu.c +++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c @@ -71,7 +71,7 @@ enum alu_dst STRUCTURES & TYPEDEFS ***************************************************************************/ -struct cquestsnd_state +struct cquestsnd_state { /* AM2901 internals */ UINT16 ram[16]; @@ -104,7 +104,7 @@ struct cquestsnd_state }; -struct cquestrot_state +struct cquestrot_state { /* AM2901 internals */ UINT16 ram[16]; @@ -146,7 +146,7 @@ struct cquestrot_state }; -struct cquestlin_state +struct cquestlin_state { /* 12-bit AM2901 internals */ UINT16 ram[16]; diff --git a/src/emu/cpu/drcbec.c b/src/emu/cpu/drcbec.c index 906ed3c5781..3a8648aa0e6 100644 --- a/src/emu/cpu/drcbec.c +++ b/src/emu/cpu/drcbec.c @@ -1121,7 +1121,7 @@ int drcbe_c::execute(code_handle &entry) case MAKE_OPCODE_SHORT(OP_SHL, 4, 1): shift = PARAM2 & 31; temp32 = PARAM1 << shift; - if (shift != 0) + if (shift != 0) { flags = FLAGS32_NZ(temp32); flags |= ((PARAM1 << (shift - 1)) >> 31) & FLAG_C; @@ -1136,7 +1136,7 @@ int drcbe_c::execute(code_handle &entry) case MAKE_OPCODE_SHORT(OP_SHR, 4, 1): shift = PARAM2 & 31; temp32 = PARAM1 >> shift; - if (shift != 0) + if (shift != 0) { flags = FLAGS32_NZ(temp32); flags |= (PARAM1 >> (shift - 1)) & FLAG_C; @@ -1167,7 +1167,7 @@ int drcbe_c::execute(code_handle &entry) case MAKE_OPCODE_SHORT(OP_ROL, 4, 1): shift = PARAM2 & 31; temp32 = (PARAM1 << shift) | (PARAM1 >> ((32 - shift) & 31)); - if (shift != 0) + if (shift != 0) { flags = FLAGS32_NZ(temp32); flags |= ((PARAM1 << (shift - 1)) >> 31) & FLAG_C; diff --git a/src/emu/cpu/dsp56k/dsp56k.h b/src/emu/cpu/dsp56k/dsp56k.h index 5a7715a5d65..7737de30d11 100644 --- a/src/emu/cpu/dsp56k/dsp56k.h +++ b/src/emu/cpu/dsp56k/dsp56k.h @@ -30,7 +30,7 @@ DECLARE_LEGACY_CPU_DEVICE(DSP56156, dsp56k); STRUCTURES & TYPEDEFS ***************************************************************************/ // 5-4 Host Interface -struct dsp56k_host_interface +struct dsp56k_host_interface { // **** Dsp56k side **** // // Host Control Register @@ -65,7 +65,7 @@ struct dsp56k_host_interface }; // 1-9 ALU -struct dsp56k_data_alu +struct dsp56k_data_alu { // Four 16-bit input registers (can be accessed as 2 32-bit registers) PAIR x; @@ -82,7 +82,7 @@ struct dsp56k_data_alu }; // 1-10 Address Generation Unit (AGU) -struct dsp56k_agu +struct dsp56k_agu { // Four address registers UINT16 r0; @@ -112,7 +112,7 @@ struct dsp56k_agu }; // 1-11 Program Control Unit (PCU) -struct dsp56k_pcu +struct dsp56k_pcu { // Program Counter UINT16 pc; @@ -149,7 +149,7 @@ struct dsp56k_pcu }; // 1-8 The dsp56156 CORE -struct dsp56k_core +struct dsp56k_core { // PROGRAM CONTROLLER dsp56k_pcu PCU; diff --git a/src/emu/cpu/dsp56k/dsp56pcu.c b/src/emu/cpu/dsp56k/dsp56pcu.c index cde4d69924e..be29585ec05 100644 --- a/src/emu/cpu/dsp56k/dsp56pcu.c +++ b/src/emu/cpu/dsp56k/dsp56pcu.c @@ -236,7 +236,7 @@ void pcu_reset(dsp56k_core* cpustate) /*************************************************************************** INTERRUPT HANDLING ***************************************************************************/ -struct dsp56k_irq_data +struct dsp56k_irq_data { UINT16 irq_vector; char irq_source[128]; diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c index 6f97a70d9b9..4afe1971d52 100644 --- a/src/emu/cpu/esrip/esrip.c +++ b/src/emu/cpu/esrip/esrip.c @@ -61,7 +61,7 @@ CPU_DISASSEMBLE( esrip ); STRUCTURES & TYPEDEFS ***************************************************************************/ -struct esrip_state +struct esrip_state { UINT16 ram[32]; UINT16 acc; diff --git a/src/emu/cpu/g65816/g65816ds.c b/src/emu/cpu/g65816/g65816ds.c index aefeab523cc..dd4a464e6c5 100644 --- a/src/emu/cpu/g65816/g65816ds.c +++ b/src/emu/cpu/g65816/g65816ds.c @@ -26,7 +26,7 @@ author (Karl Stenerud) at karl@higashiyama-unet.ocn.ne.jp. #define ADDRESS_65816(A) ((A)&0xffffff) -struct opcode_struct +struct opcode_struct { unsigned char name; unsigned char flag; diff --git a/src/emu/cpu/h6280/h6280.h b/src/emu/cpu/h6280/h6280.h index f2a3434fa45..d37253f3d8f 100644 --- a/src/emu/cpu/h6280/h6280.h +++ b/src/emu/cpu/h6280/h6280.h @@ -37,7 +37,7 @@ enum /**************************************************************************** * The 6280 registers. ****************************************************************************/ -struct h6280_Regs +struct h6280_Regs { int ICount; diff --git a/src/emu/cpu/h83002/h8priv.h b/src/emu/cpu/h83002/h8priv.h index 1453bd5ee72..9fa00488c3c 100644 --- a/src/emu/cpu/h83002/h8priv.h +++ b/src/emu/cpu/h83002/h8priv.h @@ -11,25 +11,25 @@ #define H8_MAX_PORTS (16) // number of I/O ports defined architecturally (1-9 and A-G = 16) -struct H8S2XXX_TPU_ITEM +struct H8S2XXX_TPU_ITEM { UINT32 tgr, irq, out; }; -struct H8S2XXX_TPU +struct H8S2XXX_TPU { emu_timer *timer; int cycles_per_tick; UINT64 timer_cycles; }; -struct H8S2XXX_SCI +struct H8S2XXX_SCI { emu_timer *timer; UINT32 bitrate; }; -struct H8S2XXX_TMR +struct H8S2XXX_TMR { emu_timer *timer; int cycles_per_tick; diff --git a/src/emu/cpu/h83002/h8speriph.c b/src/emu/cpu/h83002/h8speriph.c index df6ca015e65..916fa0b6d71 100644 --- a/src/emu/cpu/h83002/h8speriph.c +++ b/src/emu/cpu/h83002/h8speriph.c @@ -1158,7 +1158,7 @@ static TIMER_CALLBACK( h8s_tpu_callback) // SERIAL CONTROLLER INTERFACE // ///////////////////////////////// -struct H8S_SCI_ENTRY +struct H8S_SCI_ENTRY { UINT32 reg_smr, reg_brr, reg_scr, reg_tdr, reg_ssr, reg_rdr; UINT32 reg_pdr, reg_port; diff --git a/src/emu/cpu/hcd62121/hcd62121d.c b/src/emu/cpu/hcd62121/hcd62121d.c index ae7845be1fc..504d2edba49 100644 --- a/src/emu/cpu/hcd62121/hcd62121d.c +++ b/src/emu/cpu/hcd62121/hcd62121d.c @@ -32,7 +32,7 @@ enum _4, /* for nibble shifts */ }; -struct hcd62121_dasm +struct hcd62121_dasm { const char *str; UINT8 arg1; diff --git a/src/emu/cpu/hd61700/hd61700d.c b/src/emu/cpu/hd61700/hd61700d.c index 5243649f3dc..b06a16290d6 100644 --- a/src/emu/cpu/hd61700/hd61700d.c +++ b/src/emu/cpu/hd61700/hd61700d.c @@ -39,7 +39,7 @@ enum OP_RSIR, }; -struct hd61700_dasm +struct hd61700_dasm { const char *str; UINT8 arg1; diff --git a/src/emu/cpu/hd6309/6309dasm.c b/src/emu/cpu/hd6309/6309dasm.c index 07b28d6efa7..37d7f7b9a54 100644 --- a/src/emu/cpu/hd6309/6309dasm.c +++ b/src/emu/cpu/hd6309/6309dasm.c @@ -25,7 +25,7 @@ #include "hd6309.h" // Opcode structure -struct opcodeinfo +struct opcodeinfo { UINT8 opcode; // 8-bit opcode value UINT8 length; // Opcode length in bytes diff --git a/src/emu/cpu/i386/cycles.h b/src/emu/cpu/i386/cycles.h index 5ccaa928b62..2bbb75fec5f 100644 --- a/src/emu/cpu/i386/cycles.h +++ b/src/emu/cpu/i386/cycles.h @@ -3,7 +3,7 @@ #ifndef __CYCLES_H__ #define __CYCLES_H__ -enum X86_CYCLES +enum X86_CYCLES { CYCLES_MOV_REG_REG, CYCLES_MOV_REG_MEM, @@ -337,7 +337,7 @@ enum X86_CYCLES #define CPU_CYCLES_MEDIAGX 3 -struct X86_CYCLE_TABLE +struct X86_CYCLE_TABLE { X86_CYCLES op; UINT8 cpu_cycles[X86_NUM_CPUS][2]; diff --git a/src/emu/cpu/i386/i386priv.h b/src/emu/cpu/i386/i386priv.h index ee530363fb2..285e7fb1e17 100644 --- a/src/emu/cpu/i386/i386priv.h +++ b/src/emu/cpu/i386/i386priv.h @@ -19,7 +19,7 @@ extern int i386_dasm_one(char *buffer, UINT32 pc, const UINT8 *oprom, int mode); enum SREGS { ES, CS, SS, DS, FS, GS }; -enum BREGS +enum BREGS { AL = NATIVE_ENDIAN_VALUE_LE_BE(0,3), AH = NATIVE_ENDIAN_VALUE_LE_BE(1,2), @@ -31,7 +31,7 @@ enum BREGS BH = NATIVE_ENDIAN_VALUE_LE_BE(13,14) }; -enum WREGS +enum WREGS { AX = NATIVE_ENDIAN_VALUE_LE_BE(0,1), CX = NATIVE_ENDIAN_VALUE_LE_BE(2,3), @@ -206,7 +206,7 @@ struct I386_SREG { bool valid; }; -struct I386_CALL_GATE +struct I386_CALL_GATE { UINT16 segment; UINT16 selector; diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c index 0c3f9ab7a1b..be3832c73d2 100644 --- a/src/emu/cpu/i86/i286.c +++ b/src/emu/cpu/i86/i286.c @@ -26,7 +26,7 @@ /* cpu state */ /***************************************************************************/ /* I86 registers */ -union i80286basicregs +union i80286basicregs { /* eight general registers */ UINT16 w[8]; /* viewed as 16 bits registers */ UINT8 b[16]; /* or as 8 bit registers */ diff --git a/src/emu/cpu/i860/i860dis.c b/src/emu/cpu/i860/i860dis.c index 4e5b36d5649..b1386f7cefe 100644 --- a/src/emu/cpu/i860/i860dis.c +++ b/src/emu/cpu/i860/i860dis.c @@ -374,7 +374,7 @@ enum }; -struct decode_tbl_t +struct decode_tbl_t { /* Disassembly function for this opcode. Call with buffer, mnemonic, pc, insn. */ diff --git a/src/emu/cpu/i960/i960dis.c b/src/emu/cpu/i960/i960dis.c index 2523eb63278..eec297fdebd 100644 --- a/src/emu/cpu/i960/i960dis.c +++ b/src/emu/cpu/i960/i960dis.c @@ -8,7 +8,7 @@ #include "i960.h" #include "i960dis.h" -struct mnemonic_t +struct mnemonic_t { const char *mnem; unsigned short type; diff --git a/src/emu/cpu/lh5801/5801dasm.c b/src/emu/cpu/lh5801/5801dasm.c index 6d669000490..996d85c94ee 100644 --- a/src/emu/cpu/lh5801/5801dasm.c +++ b/src/emu/cpu/lh5801/5801dasm.c @@ -24,7 +24,7 @@ #include "lh5801.h" -enum Adr +enum Adr { Imp, Reg, @@ -46,7 +46,7 @@ enum Adr RelM }; -enum Regs +enum Regs { RegNone, A, @@ -64,7 +64,7 @@ static const char *const RegNames[]= { #undef SEC #endif -enum Ins +enum Ins { ILL, ILL2, PREFD, NOP, diff --git a/src/emu/cpu/m37710/m7700ds.c b/src/emu/cpu/m37710/m7700ds.c index 001198243e7..f531de100d4 100644 --- a/src/emu/cpu/m37710/m7700ds.c +++ b/src/emu/cpu/m37710/m7700ds.c @@ -16,7 +16,7 @@ Based on G65C816 CPU Emulator by Karl Stenerud #define ADDRESS_24BIT(A) ((A)&0xffffff) -struct opcode_struct +struct opcode_struct { unsigned char name; unsigned char flag; diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c index 203b07d313b..add50195952 100644 --- a/src/emu/cpu/m6502/m6502.c +++ b/src/emu/cpu/m6502/m6502.c @@ -147,7 +147,7 @@ static void m6502_common_init(legacy_cpu_device *device, device_irq_acknowledge_ cpustate->wrmem_id.resolve(intf->write_indexed_func, *device); cpustate->in_port_func.resolve(intf->in_port_func, *device); cpustate->out_port_func.resolve(intf->out_port_func, *device); - + cpustate->pullup = intf->external_port_pullup; cpustate->pulldown = intf->external_port_pulldown; } diff --git a/src/emu/cpu/m6502/m6502.h b/src/emu/cpu/m6502/m6502.h index eba57128ce8..7edf5be8ffc 100644 --- a/src/emu/cpu/m6502/m6502.h +++ b/src/emu/cpu/m6502/m6502.h @@ -54,7 +54,7 @@ enum /* Optional interface to set callbacks */ #define M6510_INTERFACE(name) \ - const m6502_interface (name) = + const m6502_interface (name) = struct m6502_interface { diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c index 1978c7483f3..a8ed661689c 100644 --- a/src/emu/cpu/m6502/m6509.c +++ b/src/emu/cpu/m6502/m6509.c @@ -155,7 +155,7 @@ static CPU_INIT( m6509 ) devcb_write8 nullwcb = DEVCB_NULL; cpustate->rdmem_id.resolve(nullrcb, *device); - cpustate->wrmem_id.resolve(nullwcb, *device); + cpustate->wrmem_id.resolve(nullwcb, *device); } } diff --git a/src/emu/cpu/m68000/m68k_in.c b/src/emu/cpu/m68000/m68k_in.c index 7eb1cb6cad2..9144143b6b0 100644 --- a/src/emu/cpu/m68000/m68k_in.c +++ b/src/emu/cpu/m68000/m68k_in.c @@ -128,7 +128,7 @@ void (*m68ki_instruction_jump_table[NUM_CPU_TYPES][0x10000])(m68ki_cpu_core *m68 unsigned char m68ki_cycles[NUM_CPU_TYPES][0x10000]; /* Cycles used by CPU type */ /* This is used to generate the opcode handler jump table */ -struct opcode_handler_struct +struct opcode_handler_struct { void (*opcode_handler)(m68ki_cpu_core *m68k); /* handler function */ unsigned int mask; /* mask on opcode */ diff --git a/src/emu/cpu/m68000/m68kdasm.c b/src/emu/cpu/m68000/m68kdasm.c index a43310db8cd..112ebbb29d2 100644 --- a/src/emu/cpu/m68000/m68kdasm.c +++ b/src/emu/cpu/m68000/m68kdasm.c @@ -174,7 +174,7 @@ static int valid_ea(UINT32 opcode, UINT32 mask); static int DECL_SPEC compare_nof_true_bits(const void *aptr, const void *bptr); /* used to build opcode handler jump table */ -struct opcode_struct +struct opcode_struct { void (*opcode_handler)(void); /* handler function */ UINT32 mask; /* mask on opcode */ diff --git a/src/emu/cpu/m68000/m68kmake.c b/src/emu/cpu/m68000/m68kmake.c index bb3179265fc..fd3322fa631 100644 --- a/src/emu/cpu/m68000/m68kmake.c +++ b/src/emu/cpu/m68000/m68kmake.c @@ -175,7 +175,7 @@ enum /* Everything we need to know about an opcode */ -struct opcode_struct +struct opcode_struct { char name[MAX_NAME_LENGTH]; /* opcode handler name */ unsigned char size; /* Size of operation */ @@ -192,7 +192,7 @@ struct opcode_struct /* All modifications necessary for a specific EA mode of an instruction */ -struct ea_info_struct +struct ea_info_struct { const char* fname_add; const char* ea_add; @@ -202,7 +202,7 @@ struct ea_info_struct /* Holds the body of a function */ -struct body_struct +struct body_struct { char body[MAX_BODY_LENGTH][MAX_LINE_LENGTH+1]; int length; @@ -210,7 +210,7 @@ struct body_struct /* Holds a sequence of search / replace strings */ -struct replace_struct +struct replace_struct { char replace[MAX_REPLACE_LENGTH][2][MAX_LINE_LENGTH+1]; int length; diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c index eb0796693ad..0ac3fb2b549 100644 --- a/src/emu/cpu/m6805/m6805.c +++ b/src/emu/cpu/m6805/m6805.c @@ -45,7 +45,7 @@ enum }; /* 6805 Registers */ -struct m6805_Regs +struct m6805_Regs { /* Pre-pointerafied public globals */ int iCount; diff --git a/src/emu/cpu/m6809/6809dasm.c b/src/emu/cpu/m6809/6809dasm.c index b0c74e869a4..43e732add8a 100644 --- a/src/emu/cpu/m6809/6809dasm.c +++ b/src/emu/cpu/m6809/6809dasm.c @@ -20,7 +20,7 @@ #include "m6809.h" // Opcode structure -struct opcodeinfo +struct opcodeinfo { UINT8 opcode; // 8-bit opcode value UINT8 length; // Opcode length in bytes diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c index 0f309f6be1a..28a69ed67bb 100644 --- a/src/emu/cpu/mb86233/mb86233.c +++ b/src/emu/cpu/mb86233/mb86233.c @@ -23,7 +23,7 @@ CPU_DISASSEMBLE( mb86233 ); STRUCTURES & TYPEDEFS ***************************************************************************/ -union MB86233_REG +union MB86233_REG { INT32 i; UINT32 u; diff --git a/src/emu/cpu/mips/mips3.c b/src/emu/cpu/mips/mips3.c index c40e7d03d30..932e659ab29 100644 --- a/src/emu/cpu/mips/mips3.c +++ b/src/emu/cpu/mips/mips3.c @@ -86,7 +86,7 @@ ***************************************************************************/ /* MIPS3 Registers */ -struct mips3_regs +struct mips3_regs { /* core state */ mips3_state core; diff --git a/src/emu/cpu/nec/necpriv.h b/src/emu/cpu/nec/necpriv.h index e3e3f4d6600..22a524a1074 100644 --- a/src/emu/cpu/nec/necpriv.h +++ b/src/emu/cpu/nec/necpriv.h @@ -19,7 +19,7 @@ enum }; /* interrupt sources */ -enum INTSOURCES +enum INTSOURCES { BRK = 0, INT_IRQ = 1, @@ -27,7 +27,7 @@ enum INTSOURCES }; /* NEC registers */ -union necbasicregs +union necbasicregs { /* eight general registers */ UINT16 w[8]; /* viewed as 16 bits registers */ UINT8 b[16]; /* or as 8 bit registers */ diff --git a/src/emu/cpu/nec/v25priv.h b/src/emu/cpu/nec/v25priv.h index 5b4fe851c55..39e1bf13f8b 100644 --- a/src/emu/cpu/nec/v25priv.h +++ b/src/emu/cpu/nec/v25priv.h @@ -35,7 +35,7 @@ enum }; /* interrupt sources */ -enum INTSOURCES +enum INTSOURCES { BRK = 0, INT_IRQ = 1, @@ -60,7 +60,7 @@ enum INTSOURCES }; /* internal RAM and register banks */ -union internalram +union internalram { UINT16 w[128]; UINT8 b[256]; diff --git a/src/emu/cpu/powerpc/ppc_dasm.c b/src/emu/cpu/powerpc/ppc_dasm.c index 0b0168efda4..35a42db092c 100644 --- a/src/emu/cpu/powerpc/ppc_dasm.c +++ b/src/emu/cpu/powerpc/ppc_dasm.c @@ -102,7 +102,7 @@ enum * Describes the layout of an instruction. */ -struct IDESCR +struct IDESCR { char mnem[32]; // mnemonic UINT32 match; // bit pattern of instruction after it has been masked diff --git a/src/emu/cpu/powerpc/ppccom.c b/src/emu/cpu/powerpc/ppccom.c index 7222ab7d55f..88c6500b3f0 100644 --- a/src/emu/cpu/powerpc/ppccom.c +++ b/src/emu/cpu/powerpc/ppccom.c @@ -1828,7 +1828,7 @@ static int ppc4xx_dma_decrement_count(powerpc_state *ppc, int dmachan) ppc->dcr[DCR4XX_DMASR] |= 1 << (7 - dmachan); break; } - + ppc4xx_dma_update_irq_states(ppc); INT64 numdata = dmaregs[DCR4XX_DMACT0]; @@ -1952,7 +1952,7 @@ static TIMER_CALLBACK( ppc4xx_buffered_dma_callback ) dmaregs[DCR4XX_DMADA0] += destinc; } while (!ppc4xx_dma_decrement_count(ppc, dmachan)); break; - } + } } } diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h index 8b8b1f7fdb7..91a8577fb0b 100644 --- a/src/emu/cpu/rsp/rsp.h +++ b/src/emu/cpu/rsp/rsp.h @@ -138,7 +138,7 @@ void rspdrc_add_imem(device_t *device, UINT32 *base); #define RSPDRC_STRICT_VERIFY 0x0001 /* verify all instructions */ -union VECTOR_REG +union VECTOR_REG { UINT64 d[2]; UINT32 l[4]; @@ -146,7 +146,7 @@ union VECTOR_REG UINT8 b[16]; }; -union ACCUMULATOR_REG +union ACCUMULATOR_REG { INT64 q; INT32 l[2]; diff --git a/src/emu/cpu/saturn/saturnds.c b/src/emu/cpu/saturn/saturnds.c index 1acfafa36ee..0db10df7768 100644 --- a/src/emu/cpu/saturn/saturnds.c +++ b/src/emu/cpu/saturn/saturnds.c @@ -71,7 +71,7 @@ static const char number_2_hex[]= // don't split branch and return, source relies on this ordering -enum MNEMONICS +enum MNEMONICS { Return, ReturnSetXM, ReturnSetCarry, ReturnClearCarry, ReturnFromInterrupt, jump3,jump4,jump, @@ -584,7 +584,7 @@ enum opcode_adr AdrImmCount }; -struct OPCODE +struct OPCODE { opcode_sel sel; opcode_adr adr; diff --git a/src/emu/cpu/sc61860/scdasm.c b/src/emu/cpu/sc61860/scdasm.c index 1ebe8005a73..dacdf7dcc63 100644 --- a/src/emu/cpu/sc61860/scdasm.c +++ b/src/emu/cpu/sc61860/scdasm.c @@ -79,7 +79,7 @@ */ -enum Adr +enum Adr { Ill, Imp, diff --git a/src/emu/cpu/sh2/sh2comn.h b/src/emu/cpu/sh2/sh2comn.h index 9355d9e00ec..88a9f17a6ce 100644 --- a/src/emu/cpu/sh2/sh2comn.h +++ b/src/emu/cpu/sh2/sh2comn.h @@ -90,7 +90,7 @@ do { \ sh2_exception(sh2,message,irq); \ } while(0) -struct sh2_state +struct sh2_state { UINT32 ppc; UINT32 pc; diff --git a/src/emu/cpu/sh4/sh4comn.h b/src/emu/cpu/sh4/sh4comn.h index b71e6fa826d..33fff77c0eb 100644 --- a/src/emu/cpu/sh4/sh4comn.h +++ b/src/emu/cpu/sh4/sh4comn.h @@ -49,7 +49,7 @@ class sh4_frontend; #endif -struct sh4_state +struct sh4_state { UINT32 ppc; UINT32 pc, spc; diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c index 58a08f13e49..19522662862 100644 --- a/src/emu/cpu/sharc/sharc.c +++ b/src/emu/cpu/sharc/sharc.c @@ -39,7 +39,7 @@ enum SHARC_B12, SHARC_B13, SHARC_B14, SHARC_B15, }; -struct SHARC_DAG +struct SHARC_DAG { UINT32 i[8]; UINT32 m[8]; @@ -47,13 +47,13 @@ struct SHARC_DAG UINT32 l[8]; }; -union SHARC_REG +union SHARC_REG { INT32 r; float f; }; -struct DMA_REGS +struct DMA_REGS { UINT32 control; UINT32 int_index; @@ -66,14 +66,14 @@ struct DMA_REGS UINT32 ext_count; }; -struct LADDR +struct LADDR { UINT32 addr; UINT32 code; UINT32 loop_type; }; -struct DMA_OP +struct DMA_OP { UINT32 src; UINT32 dst; @@ -580,7 +580,7 @@ static CPU_RESET( sharc ) sharc_dma_exec(cpustate, 6); dma_op(cpustate, 6); - + cpustate->dma_op[6].timer->adjust(attotime::never, 0); break; } @@ -766,7 +766,7 @@ static CPU_EXECUTE( sharc ) } } } - + sharc_op[(cpustate->opcode >> 39) & 0x1ff](cpustate); diff --git a/src/emu/cpu/sharc/sharc.h b/src/emu/cpu/sharc/sharc.h index 84bda15bb77..7e9f41bef8d 100644 --- a/src/emu/cpu/sharc/sharc.h +++ b/src/emu/cpu/sharc/sharc.h @@ -9,7 +9,7 @@ #define SHARC_INPUT_FLAG2 5 #define SHARC_INPUT_FLAG3 6 -enum SHARC_BOOT_MODE +enum SHARC_BOOT_MODE { BOOT_MODE_EPROM, BOOT_MODE_HOST, diff --git a/src/emu/cpu/sharc/sharcdma.c b/src/emu/cpu/sharc/sharcdma.c index 8f6abf1964c..ccae4b868bd 100644 --- a/src/emu/cpu/sharc/sharcdma.c +++ b/src/emu/cpu/sharc/sharcdma.c @@ -35,7 +35,7 @@ static void schedule_chained_dma_op(SHARC_REGS *cpustate, int channel, UINT32 dm } else // Receive from external { - cpustate->dma_op[channel].src = ext_index; + cpustate->dma_op[channel].src = ext_index; cpustate->dma_op[channel].src_modifier = ext_modifier; cpustate->dma_op[channel].src_count = ext_count; cpustate->dma_op[channel].dst = int_index; @@ -89,7 +89,7 @@ static void dma_op(SHARC_REGS *cpustate, int channel) int src_modifier = cpustate->dma_op[channel].src_modifier; int dst_modifier = cpustate->dma_op[channel].dst_modifier; int src_count = cpustate->dma_op[channel].src_count; - //int dst_count = cpustate->dma_op[channel].dst_count; + //int dst_count = cpustate->dma_op[channel].dst_count; int pmode = cpustate->dma_op[channel].pmode; //printf("dma_op: %08X, %08X, %08X, %08X, %08X, %08X, %d\n", src, dst, src_modifier, dst_modifier, src_count, dst_count, pmode); diff --git a/src/emu/cpu/sharc/sharcdsm.h b/src/emu/cpu/sharc/sharcdsm.h index c7edef8b7ac..9dff77fdebd 100644 --- a/src/emu/cpu/sharc/sharcdsm.h +++ b/src/emu/cpu/sharc/sharcdsm.h @@ -69,7 +69,7 @@ static const char mr_regnames[16][8] = "???", "???", "???", "???", "???", "???", "???", "???" }; -struct SHARC_DASM_OP +struct SHARC_DASM_OP { UINT32 op_mask; UINT32 op_bits; diff --git a/src/emu/cpu/sharc/sharcops.h b/src/emu/cpu/sharc/sharcops.h index 1152646f309..2fe5aab7fef 100644 --- a/src/emu/cpu/sharc/sharcops.h +++ b/src/emu/cpu/sharc/sharcops.h @@ -1,4 +1,4 @@ -struct SHARC_OP +struct SHARC_OP { UINT32 op_mask; UINT32 op_bits; diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c index c35ef4ad2ec..c716d1a8aa1 100644 --- a/src/emu/cpu/spc700/spc700.c +++ b/src/emu/cpu/spc700/spc700.c @@ -66,7 +66,7 @@ Address Function Register R/W When Reset Remarks #include "spc700.h" /* CPU Structure */ -struct spc700i_cpu +struct spc700i_cpu { uint a; /* Accumulator */ uint x; /* Index Register X */ diff --git a/src/emu/cpu/spc700/spc700ds.c b/src/emu/cpu/spc700/spc700ds.c index 5073154083e..7c53abcbc86 100644 --- a/src/emu/cpu/spc700/spc700ds.c +++ b/src/emu/cpu/spc700/spc700ds.c @@ -20,7 +20,7 @@ author (Karl Stenerud) at karl@higashiyama-unet.ocn.ne.jp. -struct opcode_struct +struct opcode_struct { unsigned char name; unsigned char args[2]; diff --git a/src/emu/cpu/superfx/superfx.c b/src/emu/cpu/superfx/superfx.c index 795934e11db..ef761deddf3 100644 --- a/src/emu/cpu/superfx/superfx.c +++ b/src/emu/cpu/superfx/superfx.c @@ -2,14 +2,14 @@ #include "debugger.h" #include "superfx.h" -struct pixelcache_t +struct pixelcache_t { UINT16 offset; UINT8 bitpend; UINT8 data[8]; }; -struct cache_t +struct cache_t { UINT8 buffer[0x200]; UINT8 valid[0x20]; diff --git a/src/emu/cpu/tlcs900/900tbl.c b/src/emu/cpu/tlcs900/900tbl.c index 40742589aa3..431b31f186a 100644 --- a/src/emu/cpu/tlcs900/900tbl.c +++ b/src/emu/cpu/tlcs900/900tbl.c @@ -3852,7 +3852,7 @@ static void _ZCF(tlcs900_state *cpustate) } -struct tlcs900inst +struct tlcs900inst { void (*opfunc)(tlcs900_state *cpustate); int operand1; diff --git a/src/emu/cpu/tlcs900/dasm900.c b/src/emu/cpu/tlcs900/dasm900.c index 063a9444c75..e33771bb374 100644 --- a/src/emu/cpu/tlcs900/dasm900.c +++ b/src/emu/cpu/tlcs900/dasm900.c @@ -88,7 +88,7 @@ enum e_operand }; -struct tlcs900inst +struct tlcs900inst { e_mnemonics mnemonic; e_operand operand1; diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c index c3429f54878..366335638c7 100644 --- a/src/emu/cpu/tms32051/tms32051.c +++ b/src/emu/cpu/tms32051/tms32051.c @@ -46,7 +46,7 @@ enum TMS32051_AR7, }; -struct PMST +struct PMST { UINT16 iptr; UINT16 avis; @@ -58,7 +58,7 @@ struct PMST UINT16 braf; }; -struct ST0 +struct ST0 { UINT16 dp; UINT16 intm; @@ -67,7 +67,7 @@ struct ST0 UINT16 arp; }; -struct ST1 +struct ST1 { UINT16 arb; UINT16 cnf; diff --git a/src/emu/cpu/tms9900/9900dasm.c b/src/emu/cpu/tms9900/9900dasm.c index 2391ac660cf..19fd5f5e6d7 100644 --- a/src/emu/cpu/tms9900/9900dasm.c +++ b/src/emu/cpu/tms9900/9900dasm.c @@ -27,7 +27,7 @@ #define MASK 0x0000ffff #define BITS(val,n1,n2) ((val>>(15-(n2))) & (MASK>>(15-((n2)-(n1))))) -enum format_t +enum format_t { format_1, /* 2 address instructions */ format_2a, /* jump instructions */ @@ -73,7 +73,7 @@ enum sd_11_15 = 0x200 /* bits 11-15 should be cleared in lwpi, limi, idle, rset, rtwp, ckon, ckof, lrex */ }; -struct description_t +struct description_t { const char *mnemonic; format_t format; diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h index 6d50dfb148b..2e8f7c06ba0 100644 --- a/src/emu/cpu/tms9900/99xxcore.h +++ b/src/emu/cpu/tms9900/99xxcore.h @@ -394,7 +394,7 @@ a ST_MASK */ #define R14 28 #define R15 30 -struct map_file_t +struct map_file_t { UINT16 L[3], B[3]; /* actual registers */ UINT32 limit[3], bias[3]; /* equivalent in a more convenient form */ @@ -1993,7 +1993,7 @@ static void set_flag1(tms99xx_state *cpustate, int val) #endif -enum cru_error_code +enum cru_error_code { CRU_OK = 0, CRU_PRIVILEGE_VIOLATION = -1 diff --git a/src/emu/cpu/tms9900/tms9900.h b/src/emu/cpu/tms9900/tms9900.h index 43f57c5e600..f80f452a5f9 100644 --- a/src/emu/cpu/tms9900/tms9900.h +++ b/src/emu/cpu/tms9900/tms9900.h @@ -109,7 +109,7 @@ static const char opname[][5] = "*int" }; -struct tms99xx_config +struct tms99xx_config { devcb_write8 external_callback; devcb_read8 irq_level; diff --git a/src/emu/cpu/tms9900/tms9900l.h b/src/emu/cpu/tms9900/tms9900l.h index 3ca20312bed..324d9ab02bc 100644 --- a/src/emu/cpu/tms9900/tms9900l.h +++ b/src/emu/cpu/tms9900/tms9900l.h @@ -61,7 +61,7 @@ DECLARE_LEGACY_CPU_DEVICE(TI990_10L, ti990_10l); structure with the parameters ti990_10_reset wants. */ -struct ti990_10reset_param +struct ti990_10reset_param { ti99xx_idle_func idle_callback; ti99xx_rset_func rset_callback; @@ -87,7 +87,7 @@ DECLARE_LEGACY_CPU_DEVICE(TMS9900L, tms9900l); /* structure with optional parameters for tms9900_reset. */ -struct tms9900reset_param +struct tms9900reset_param { ti99xx_idle_func idle_callback; }; @@ -99,7 +99,7 @@ struct tms9900reset_param /* structure with optional parameters for tms9940_reset. */ -struct tms9940reset_param +struct tms9940reset_param { ti99xx_idle_func idle_callback; }; @@ -111,7 +111,7 @@ DECLARE_LEGACY_CPU_DEVICE(TMS9980L, tms9980al); /* structure with optional parameters for tms9980a_reset. */ -struct tms9980areset_param +struct tms9980areset_param { ti99xx_idle_func idle_callback; }; @@ -123,7 +123,7 @@ struct tms9980areset_param /*// structure with optional parameters for tms9985_reset. */ -struct tms9985reset_param +struct tms9985reset_param { ti99xx_idle_func idle_callback; }; @@ -135,7 +135,7 @@ struct tms9985reset_param /* structure with optional parameters for tms9989_reset. */ -struct tms9989reset_param +struct tms9989reset_param { ti99xx_idle_func idle_callback; }; @@ -147,7 +147,7 @@ DECLARE_LEGACY_CPU_DEVICE(TMS9995L, tms9995l); /* structure with the parameters tms9995_reset wants. */ -struct tms9995reset_param +struct tms9995reset_param { /* auto_wait_state : a non-zero value makes tms9995 generate a wait state automatically on each memory access */ @@ -175,7 +175,7 @@ extern WRITE8_HANDLER(tms9995_internal2_w); /* structure with optional parameters for tms99000_reset. */ -struct tms99000reset_param +struct tms99000reset_param { ti99xx_idle_func idle_callback; }; @@ -187,7 +187,7 @@ struct tms99000reset_param /* structure with optional parameters for tms99105a_reset. */ -struct tms99105areset_param +struct tms99105areset_param { ti99xx_idle_func idle_callback; }; @@ -199,7 +199,7 @@ struct tms99105areset_param /* structure with optional parameters for tms99110a_reset. */ -struct tms99110areset_param +struct tms99110areset_param { ti99xx_idle_func idle_callback; }; diff --git a/src/emu/cpu/tms9900/tms9995.h b/src/emu/cpu/tms9900/tms9995.h index 72933e78c02..bf084773067 100644 --- a/src/emu/cpu/tms9900/tms9995.h +++ b/src/emu/cpu/tms9900/tms9995.h @@ -60,7 +60,7 @@ enum Configuration for the TMS9995. The connections are provided by the main board which contains the processor. */ -struct tms9995_config +struct tms9995_config { devcb_write8 external_callback; devcb_write_line iaq_line; diff --git a/src/emu/cpu/upd7810/upd7810.h b/src/emu/cpu/upd7810/upd7810.h index c2da1d43f70..ff4998adeae 100644 --- a/src/emu/cpu/upd7810/upd7810.h +++ b/src/emu/cpu/upd7810/upd7810.h @@ -11,7 +11,7 @@ */ // unfortunatly memory configuration differs with internal rom size -enum UPD7810_TYPE +enum UPD7810_TYPE { TYPE_7801, TYPE_78C05, |
