diff --git a/src/emu/cpu/m6800/6800ops.c b/src/emu/cpu/m6800/6800ops.c index abdcfcd74f8..1948e325888 100644 --- a/src/emu/cpu/m6800/6800ops.c +++ b/src/emu/cpu/m6800/6800ops.c @@ -233,10 +233,10 @@ OP_HANDLER( bra ) } /* $21 BRN relative ----- */ +static UINT8 m6800_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE OP_HANDLER( brn ) { - UINT8 t; - IMMBYTE(t); + IMMBYTE(m6800_brn_t); } /* $22 BHI relative ----- */ diff --git a/src/emu/cpu/m68000/m68kfpu.c b/src/emu/cpu/m68000/m68kfpu.c index e3b49ccb044..27bf7c73a3e 100644 --- a/src/emu/cpu/m68000/m68kfpu.c +++ b/src/emu/cpu/m68000/m68kfpu.c @@ -257,9 +257,9 @@ INLINE void store_pack_float80(m68ki_cpu_core *m68k, UINT32 ea, int k, floatx80 INLINE void SET_CONDITION_CODES(m68ki_cpu_core *m68k, floatx80 reg) { - UINT64 *regi; +// UINT64 *regi; - regi = (UINT64 *)® +// regi = (UINT64 *)® REG_FPSR &= ~(FPCC_N|FPCC_Z|FPCC_I|FPCC_NAN); @@ -1341,7 +1341,7 @@ static void fpgen_rm_reg(m68ki_cpu_core *m68k, UINT16 w2) } case 0x1e: // FGETEXP { - floatx80 temp = source; +// floatx80 temp = source; INT16 temp2; temp2 = source.high; // get the exponent diff --git a/src/emu/cpu/m6805/6805ops.c b/src/emu/cpu/m6805/6805ops.c index 50c65abf4fc..0cb9f6e3baf 100644 --- a/src/emu/cpu/m6805/6805ops.c +++ b/src/emu/cpu/m6805/6805ops.c @@ -77,10 +77,10 @@ OP_HANDLER( bra ) } /* $21 BRN relative ---- */ +static UINT8 m6805_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE OP_HANDLER( brn ) { - UINT8 t; - IMMBYTE(t); + IMMBYTE(m6805_brn_t); } /* $22 BHI relative ---- */ diff --git a/src/emu/cpu/m6809/6809ops.c b/src/emu/cpu/m6809/6809ops.c index a691ccf2812..924ea78795d 100644 --- a/src/emu/cpu/m6809/6809ops.c +++ b/src/emu/cpu/m6809/6809ops.c @@ -371,10 +371,10 @@ OP_HANDLER( bra ) } /* $21 BRN relative ----- */ +static UINT8 m6809_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE OP_HANDLER( brn ) { - UINT8 t; - IMMBYTE(t); + IMMBYTE(m6809_brn_t); } /* $1021 LBRN relative ----- */ diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c index fc4597957ef..d0bc3321b2b 100644 --- a/src/emu/cpu/minx/minx.c +++ b/src/emu/cpu/minx/minx.c @@ -169,14 +169,14 @@ INLINE UINT16 rdop16( minx_state *minx ) static CPU_EXECUTE( minx ) { - UINT32 oldpc; +// UINT32 oldpc; UINT8 op; minx_state *minx = get_safe_token(device); do { debugger_instruction_hook(device, GET_MINX_PC); - oldpc = GET_MINX_PC; +// oldpc = GET_MINX_PC; if ( minx->interrupt_pending ) { diff --git a/src/emu/cpu/nec/necinstr.c b/src/emu/cpu/nec/necinstr.c index 47ea0432e14..1fb8ee1d195 100644 --- a/src/emu/cpu/nec/necinstr.c +++ b/src/emu/cpu/nec/necinstr.c @@ -152,12 +152,12 @@ OP( 0x60, i_pusha ) { PUSH(Wreg(IY)); CLKS(67,35,20); } +static unsigned nec_popa_tmp; OP( 0x61, i_popa ) { - unsigned tmp; POP(Wreg(IY)); POP(Wreg(IX)); POP(Wreg(BP)); - POP(tmp); + POP(nec_popa_tmp); POP(Wreg(BW)); POP(Wreg(DW)); POP(Wreg(CW)); @@ -529,8 +529,8 @@ OP( 0xd3, i_rotshft_wcl ) { } } -OP( 0xd4, i_aam ) { UINT32 mult=FETCH(); mult=0; Breg(AH) = Breg(AL) / 10; Breg(AL) %= 10; SetSZPF_Word(Wreg(AW)); CLKS(15,15,12); } -OP( 0xd5, i_aad ) { UINT32 mult=FETCH(); mult=0; Breg(AL) = Breg(AH) * 10 + Breg(AL); Breg(AH) = 0; SetSZPF_Byte(Breg(AL)); CLKS(7,7,8); } +OP( 0xd4, i_aam ) { FETCH(); Breg(AH) = Breg(AL) / 10; Breg(AL) %= 10; SetSZPF_Word(Wreg(AW)); CLKS(15,15,12); } +OP( 0xd5, i_aad ) { FETCH(); Breg(AL) = Breg(AH) * 10 + Breg(AL); Breg(AH) = 0; SetSZPF_Byte(Breg(AL)); CLKS(7,7,8); } OP( 0xd6, i_setalc ) { Breg(AL) = (CF)?0xff:0x00; nec_state->icount-=3; logerror("%06x: Undefined opcode (SETALC)\n",PC(nec_state)); } OP( 0xd7, i_trans ) { UINT32 dest = (Wreg(BW)+Breg(AL))&0xffff; Breg(AL) = GetMemB(DS0, dest); CLKS(9,9,5); } OP( 0xd8, i_fpo ) { GetModRM; nec_state->icount-=2; logerror("%06x: Unimplemented floating point control %04x\n",PC(nec_state),ModRM); } diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c index d56785e22ad..900a5616376 100644 --- a/src/emu/cpu/v30mz/v30mz.c +++ b/src/emu/cpu/v30mz/v30mz.c @@ -378,12 +378,12 @@ OP( 0x60, i_pusha ) { PUSH(cpustate->regs.w[IY]); CLK(9); } +static unsigned nec_v30mz_popa_tmp; OP( 0x61, i_popa ) { - unsigned tmp; POP(cpustate->regs.w[IY]); POP(cpustate->regs.w[IX]); POP(cpustate->regs.w[BP]); - POP(tmp); + POP(nec_v30mz_popa_tmp); POP(cpustate->regs.w[BW]); POP(cpustate->regs.w[DW]); POP(cpustate->regs.w[CW]); @@ -753,8 +753,8 @@ OP( 0xd3, i_rotshft_wcl ) { } } -OP( 0xd4, i_aam ) { UINT32 mult=FETCH; mult=0; cpustate->regs.b[AH] = cpustate->regs.b[AL] / 10; cpustate->regs.b[AL] %= 10; SetSZPF_Word(cpustate->regs.w[AW]); CLK(17); } -OP( 0xd5, i_aad ) { UINT32 mult=FETCH; mult=0; cpustate->regs.b[AL] = cpustate->regs.b[AH] * 10 + cpustate->regs.b[AL]; cpustate->regs.b[AH] = 0; SetSZPF_Byte(cpustate->regs.b[AL]); CLK(5); } +OP( 0xd4, i_aam ) { FETCH; cpustate->regs.b[AH] = cpustate->regs.b[AL] / 10; cpustate->regs.b[AL] %= 10; SetSZPF_Word(cpustate->regs.w[AW]); CLK(17); } +OP( 0xd5, i_aad ) { FETCH; cpustate->regs.b[AL] = cpustate->regs.b[AH] * 10 + cpustate->regs.b[AL]; cpustate->regs.b[AH] = 0; SetSZPF_Byte(cpustate->regs.b[AL]); CLK(5); } OP( 0xd6, i_setalc ) { cpustate->regs.b[AL] = (CF)?0xff:0x00; CLK(3); logerror("%06x: Undefined opcode (SETALC)\n",PC(cpustate)); } OP( 0xd7, i_trans ) { UINT32 dest = (cpustate->regs.w[BW]+cpustate->regs.b[AL])&0xffff; cpustate->regs.b[AL] = GetMemB(DS, dest); CLK(5); } OP( 0xd8, i_fpo ) { GetModRM; CLK(1); logerror("%06x: Unimplemented floating point control %04x\n",PC(cpustate),ModRM); } diff --git a/src/emu/hashfile.c b/src/emu/hashfile.c index 53c185d4bdf..ed392b6e90b 100644 --- a/src/emu/hashfile.c +++ b/src/emu/hashfile.c @@ -178,7 +178,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut hash_collection hashes; astring all_functions; char functions; - iodevice_t device; +// iodevice_t device; int i; switch(state->pos) @@ -198,7 +198,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut { // we are now examining a hash tag name = NULL; - device = IO_COUNT; +// device = IO_COUNT; while(attributes[0]) { @@ -230,7 +230,9 @@ static void start_handler(void *data, const char *tagname, const char **attribut if (i < 0) unknown_attribute_value(state, attributes[0], attributes[1]); else - device = (iodevice_t) i; + { + // device = (iodevice_t) i; + } } else {