diff options
author | 2009-12-28 09:04:00 +0000 | |
---|---|---|
committer | 2009-12-28 09:04:00 +0000 | |
commit | bd24fb23c10ca9fbf63e2191dc8e58a87b83b325 (patch) | |
tree | 5ba5c3cffeb38fb8f492e030130268c4bcbafb4d /src/emu/cpu/dsp56k | |
parent | 6763b10bf005f0bcd1ba23e440d652b31dcac447 (diff) |
Results of running the latest srcclean.
Diffstat (limited to 'src/emu/cpu/dsp56k')
-rw-r--r-- | src/emu/cpu/dsp56k/dsp56k.c | 16 | ||||
-rw-r--r-- | src/emu/cpu/dsp56k/dsp56ops.c | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c index f690fe8c26e..524df464b1f 100644 --- a/src/emu/cpu/dsp56k/dsp56k.c +++ b/src/emu/cpu/dsp56k/dsp56k.c @@ -455,11 +455,11 @@ CPU_GET_INFO( dsp56k ) case CPUINFO_INT_ADDRBUS_WIDTH_PROGRAM: info->i = 16; break; /* 1-5 */ case CPUINFO_INT_ADDRBUS_SHIFT_PROGRAM: info->i = -1; break; case CPUINFO_INT_DATABUS_WIDTH_DATA: info->i = 16; break; - case CPUINFO_INT_ADDRBUS_WIDTH_DATA: info->i = 16; break; - case CPUINFO_INT_ADDRBUS_SHIFT_DATA: info->i = -1; break; + case CPUINFO_INT_ADDRBUS_WIDTH_DATA: info->i = 16; break; + case CPUINFO_INT_ADDRBUS_SHIFT_DATA: info->i = -1; break; case CPUINFO_INT_DATABUS_WIDTH_IO: info->i = 0; break; - case CPUINFO_INT_ADDRBUS_WIDTH_IO: info->i = 0; break; - case CPUINFO_INT_ADDRBUS_SHIFT_IO: info->i = 0; break; + case CPUINFO_INT_ADDRBUS_WIDTH_IO: info->i = 0; break; + case CPUINFO_INT_ADDRBUS_SHIFT_IO: info->i = 0; break; case CPUINFO_INT_INPUT_STATE + DSP56K_IRQ_MODA: info->i = DSP56K_IRQ_MODA; break; case CPUINFO_INT_INPUT_STATE + DSP56K_IRQ_MODB: info->i = DSP56K_IRQ_MODB; break; @@ -534,10 +534,10 @@ CPU_GET_INFO( dsp56k ) case CPUINFO_FCT_WRITE: info->write = NULL; break; case CPUINFO_FCT_READOP: info->readop = NULL; break; case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break; - case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: - info->internal_map16 = ADDRESS_MAP_NAME(dsp56156_x_data_map); break; - case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: - info->internal_map16 = ADDRESS_MAP_NAME(dsp56156_program_map); break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA: + info->internal_map16 = ADDRESS_MAP_NAME(dsp56156_x_data_map); break; + case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM: + info->internal_map16 = ADDRESS_MAP_NAME(dsp56156_program_map); break; /* --- the following bits of info are returned as NULL-terminated strings --- */ case DEVINFO_STR_NAME: strcpy(info->s, "DSP56156"); break; diff --git a/src/emu/cpu/dsp56k/dsp56ops.c b/src/emu/cpu/dsp56k/dsp56ops.c index 20a8ff10e51..a06fb24b089 100644 --- a/src/emu/cpu/dsp56k/dsp56ops.c +++ b/src/emu/cpu/dsp56k/dsp56ops.c @@ -2223,9 +2223,9 @@ static size_t dsp56k_op_asl4(dsp56k_core* cpustate, const UINT16 op, UINT8* cycl not the same. */ /* C - Set if bit 36 of source operand is set. Cleared otherwise. */ if (*((UINT64*)D.addr) & U64(0x0000008000000000)) N_SET(); else N_CLEAR(); - if (*((UINT64*)D.addr) == 0) Z_SET(); else Z_CLEAR(); + if (*((UINT64*)D.addr) == 0) Z_SET(); else Z_CLEAR(); if ( (*((UINT64*)D.addr) & U64(0x000000ff00000000)) != (p_accum & U64(0x000000ff00000000)) ) V_SET(); else V_CLEAR(); - if (p_accum & U64(0x0000001000000000)) C_SET(); else C_CLEAR(); + if (p_accum & U64(0x0000001000000000)) C_SET(); else C_CLEAR(); cycles += 2; return 1; @@ -2254,7 +2254,7 @@ static size_t dsp56k_op_asr4(dsp56k_core* cpustate, const UINT16 op, UINT8* cycl /* TODO: E, U */ /* C - Set if bit 3 of source operand is set. Cleared otherwise. */ if (*((UINT64*)D.addr) & U64(0x0000008000000000)) N_SET(); else N_CLEAR(); - if (*((UINT64*)D.addr) == 0) Z_SET(); else Z_CLEAR(); + if (*((UINT64*)D.addr) == 0) Z_SET(); else Z_CLEAR(); V_CLEAR(); if (p_accum & U64(0x0000000000000008)) C_SET(); else C_CLEAR(); @@ -2350,7 +2350,7 @@ static size_t dsp56k_op_bfop(dsp56k_core* cpustate, const UINT16 op, const UINT1 if ((iVal & previousValue) == 0x0000) C_SET(); else C_CLEAR(); break; } - cycles += 4; /* TODO: + mvb oscillator clock cycles */ + cycles += 4; /* TODO: + mvb oscillator clock cycles */ return 2; } @@ -2416,7 +2416,7 @@ static size_t dsp56k_op_bfop_1(dsp56k_core* cpustate, const UINT16 op, const UIN if ((iVal & previousValue) == 0x0000) C_SET(); else C_CLEAR(); break; } - cycles += 4; /* TODO: + mvb oscillator clock cycles */ + cycles += 4; /* TODO: + mvb oscillator clock cycles */ return 2; } @@ -2486,7 +2486,7 @@ static size_t dsp56k_op_bfop_2(dsp56k_core* cpustate, const UINT16 op, const UIN if ((iVal & previousValue) == 0x0000) C_SET(); else C_CLEAR(); break; } - cycles += 4; /* TODO: + mvb oscillator clock cycles */ + cycles += 4; /* TODO: + mvb oscillator clock cycles */ return 2; } |