summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Oliver Stöneberg <firewave@users.noreply.github.com>2012-12-25 16:13:58 +0000
committer Oliver Stöneberg <firewave@users.noreply.github.com>2012-12-25 16:13:58 +0000
commit7899f6c6367082b5bf8821f71d635e8e7b01d10b (patch)
treeb053de0944ce4117b24f9b83575445a9ef4e385f
parent3ff105509cc7b5817f7b82c9051da0547e8e0228 (diff)
removed unreachable code detected by cppcheck (nw)
-rw-r--r--src/emu/cpu/arm7/arm7.c2
-rw-r--r--src/emu/cpu/dsp56k/inst.h6
-rw-r--r--src/emu/cpu/dsp56k/tables.c120
-rw-r--r--src/emu/cpu/hd61700/hd61700.c1
-rw-r--r--src/emu/cpu/i386/i386.c4
-rw-r--r--src/emu/cpu/i386/i386ops.c1
-rw-r--r--src/emu/cpu/i86/instr286.c3
-rw-r--r--src/emu/distate.c1
-rw-r--r--src/emu/machine/wd_fdc.c8
-rw-r--r--src/emu/rendlay.c2
-rw-r--r--src/mame/video/n64.c4
-rw-r--r--src/mess/machine/a2echoii.c1
12 files changed, 68 insertions, 85 deletions
diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c
index b02b005ab21..882b6f2ffc6 100644
--- a/src/emu/cpu/arm7/arm7.c
+++ b/src/emu/cpu/arm7/arm7.c
@@ -279,7 +279,6 @@ int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags)
cpustate->pendingAbtP = 1;
}
return FALSE;
- break;
case COPRO_TLB_COARSE_TABLE:
// Entry is the physical address of a coarse second-level table
if ((permission == 1) || (permission == 3))
@@ -349,7 +348,6 @@ int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags)
cpustate->pendingAbtP = 1;
}
return FALSE;
- break;
case COPRO_TLB_LARGE_PAGE:
// Large page descriptor
paddr = ( desc_lvl2 & COPRO_TLB_LARGE_PAGE_MASK ) | ( vaddr & ~COPRO_TLB_LARGE_PAGE_MASK );
diff --git a/src/emu/cpu/dsp56k/inst.h b/src/emu/cpu/dsp56k/inst.h
index b50bd09f592..847fe51245a 100644
--- a/src/emu/cpu/dsp56k/inst.h
+++ b/src/emu/cpu/dsp56k/inst.h
@@ -354,7 +354,7 @@ public:
case BBB_MIDDLE: m_iVal <<= 4; break;
case BBB_LOWER: m_iVal <<= 0; break;
- case BBB_INVALID: return false; break;
+ case BBB_INVALID: return false;
}
assemble_D_from_P_table(BITSn(word0,0x0020), BITSn(word0,0x001f), dString);
@@ -415,7 +415,7 @@ public:
case BBB_MIDDLE: m_iVal <<= 4; break;
case BBB_LOWER: m_iVal <<= 0; break;
- case BBB_INVALID: return false; break;
+ case BBB_INVALID: return false;
}
decode_RR_table(BITSn(word0,0x0003), m_r);
@@ -481,7 +481,7 @@ public:
case BBB_MIDDLE: m_iVal <<= 4; break;
case BBB_LOWER: m_iVal <<= 0; break;
- case BBB_INVALID: return false; break;
+ case BBB_INVALID: return false;
}
decode_DDDDD_table(BITSn(word0,0x001f), m_destination);
diff --git a/src/emu/cpu/dsp56k/tables.c b/src/emu/cpu/dsp56k/tables.c
index 4e6428d8c6b..7e816d7ef11 100644
--- a/src/emu/cpu/dsp56k/tables.c
+++ b/src/emu/cpu/dsp56k/tables.c
@@ -756,45 +756,45 @@ astring regIdAsString(const reg_id& regId)
{
switch(regId)
{
- case iX: return "X"; break;
- case iX0: return "X0"; break;
- case iX1: return "X1"; break;
- case iY: return "Y"; break;
- case iY0: return "Y0"; break;
- case iY1: return "Y1"; break;
- case iA: return "A"; break;
- case iA0: return "A0"; break;
- case iA1: return "A1"; break;
- case iA2: return "A2"; break;
- case iB: return "B"; break;
- case iB0: return "B0"; break;
- case iB1: return "B1"; break;
- case iB2: return "B2"; break;
- case iR0: return "R0"; break;
- case iR1: return "R1"; break;
- case iR2: return "R2"; break;
- case iR3: return "R3"; break;
- case iN0: return "N0"; break;
- case iN1: return "N1"; break;
- case iN2: return "N2"; break;
- case iN3: return "N3"; break;
- case iM0: return "M0"; break;
- case iM1: return "M1"; break;
- case iM2: return "M2"; break;
- case iM3: return "M3"; break;
- case iLC: return "LC"; break;
- case iSR: return "SR"; break;
- case iOMR: return "OMR"; break;
- case iSP: return "SP"; break;
- case iSSH: return "SSH"; break;
- case iSSL: return "SSL"; break;
- case iLA: return "LA"; break;
- case iMR: return "MR"; break;
- case iCCR: return "CCR"; break;
- case iF: return "F"; break;
- case iFHAT: return "^F"; break;
- case iINVALID: return "!!"; break;
- case iWEIRD: return "?"; break;
+ case iX: return "X";
+ case iX0: return "X0";
+ case iX1: return "X1";
+ case iY: return "Y";
+ case iY0: return "Y0";
+ case iY1: return "Y1";
+ case iA: return "A";
+ case iA0: return "A0";
+ case iA1: return "A1";
+ case iA2: return "A2";
+ case iB: return "B";
+ case iB0: return "B0";
+ case iB1: return "B1";
+ case iB2: return "B2";
+ case iR0: return "R0";
+ case iR1: return "R1";
+ case iR2: return "R2";
+ case iR3: return "R3";
+ case iN0: return "N0";
+ case iN1: return "N1";
+ case iN2: return "N2";
+ case iN3: return "N3";
+ case iM0: return "M0";
+ case iM1: return "M1";
+ case iM2: return "M2";
+ case iM3: return "M3";
+ case iLC: return "LC";
+ case iSR: return "SR";
+ case iOMR: return "OMR";
+ case iSP: return "SP";
+ case iSSH: return "SSH";
+ case iSSL: return "SSL";
+ case iLA: return "LA";
+ case iMR: return "MR";
+ case iCCR: return "CCR";
+ case iF: return "F";
+ case iFHAT: return "^F";
+ case iINVALID: return "!!";
+ case iWEIRD: return "?";
}
return "INVALID_REG_ID";
@@ -804,27 +804,27 @@ astring opMnemonicAsString(const op_mnem& mnem)
{
switch(mnem)
{
- case oCC: return "cc"; break;
- case oGE: return "ge"; break;
- case oNE: return "ne"; break;
- case oPL: return "pl"; break;
- case oNN: return "nn"; break;
- case oEC: return "ec"; break;
- case oLC: return "lc"; break;
- case oGT: return "gt"; break;
- case oCS: return "cs"; break;
- case oLT: return "lt"; break;
- case oEQ: return "eq"; break;
- case oMI: return "mi"; break;
- case oNR: return "nr"; break;
- case oES: return "es"; break;
- case oLS: return "ls"; break;
- case oLE: return "le"; break;
-
- case oSS: return "ss"; break;
- case oSU: return "su"; break;
- case oUU: return "uu"; break;
- case oINVALID: return "!!"; break;
+ case oCC: return "cc";
+ case oGE: return "ge";
+ case oNE: return "ne";
+ case oPL: return "pl";
+ case oNN: return "nn";
+ case oEC: return "ec";
+ case oLC: return "lc";
+ case oGT: return "gt";
+ case oCS: return "cs";
+ case oLT: return "lt";
+ case oEQ: return "eq";
+ case oMI: return "mi";
+ case oNR: return "nr";
+ case oES: return "es";
+ case oLS: return "ls";
+ case oLE: return "le";
+
+ case oSS: return "ss";
+ case oSU: return "su";
+ case oUU: return "uu";
+ case oINVALID: return "!!";
}
return "INVALID_OPCODE_MNEMONIC";
diff --git a/src/emu/cpu/hd61700/hd61700.c b/src/emu/cpu/hd61700/hd61700.c
index a2b0b863522..370437e27a1 100644
--- a/src/emu/cpu/hd61700/hd61700.c
+++ b/src/emu/cpu/hd61700/hd61700.c
@@ -2872,7 +2872,6 @@ inline int hd61700_cpu_device::check_cond(UINT32 op)
case 0x07: // unconditional
return 1;
- break;
}
return 0;
diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c
index 77487b61f9a..a56d4a1dcc2 100644
--- a/src/emu/cpu/i386/i386.c
+++ b/src/emu/cpu/i386/i386.c
@@ -1342,7 +1342,6 @@ static void i386_protected_mode_jump(i386_state *cpustate, UINT16 seg, UINT32 of
else
i286_task_switch(cpustate,desc.selector,0);
return;
- break;
case 0x04: // 286 Call Gate
case 0x0c: // 386 Call Gate
logerror("JMP: Call gate at %08x\n",cpustate->pc);
@@ -1479,7 +1478,6 @@ static void i386_protected_mode_jump(i386_state *cpustate, UINT16 seg, UINT32 of
else
i286_task_switch(cpustate,call_gate.selector,0);
return;
- break;
default: // invalid segment type
logerror("JMP: Invalid segment type (%i) to jump to.\n",desc.flags & 0x000f);
FAULT(FAULT_GP,segment & 0xfffc)
@@ -1631,7 +1629,6 @@ static void i386_protected_mode_call(i386_state *cpustate, UINT16 seg, UINT32 of
else
i286_task_switch(cpustate,desc.selector,1);
return;
- break;
case 0x04: // 286 call gate
case 0x0c: // 386 call gate
if((desc.flags & 0x000f) == 0x04)
@@ -1908,7 +1905,6 @@ static void i386_protected_mode_call(i386_state *cpustate, UINT16 seg, UINT32 of
else
i286_task_switch(cpustate,desc.selector,1);
return;
- break;
default:
logerror("CALL: Invalid special segment type (%i) to jump to.\n",desc.flags & 0x000f);
FAULT(FAULT_GP,selector & ~0x07) // #GP(selector)
diff --git a/src/emu/cpu/i386/i386ops.c b/src/emu/cpu/i386/i386ops.c
index a62376052ca..c51301ef22f 100644
--- a/src/emu/cpu/i386/i386ops.c
+++ b/src/emu/cpu/i386/i386ops.c
@@ -1105,7 +1105,6 @@ static void I386OP(repeat)(i386_state *cpustate, int invert_flag)
else
I386OP(decode_three_bytef2)(cpustate); // sse f2 0f
return;
- break;
case 0x26:
cpustate->segment_override=ES;
cpustate->segment_prefix=1;
diff --git a/src/emu/cpu/i86/instr286.c b/src/emu/cpu/i86/instr286.c
index 1afd5c13515..e1cd5759c66 100644
--- a/src/emu/cpu/i86/instr286.c
+++ b/src/emu/cpu/i86/instr286.c
@@ -570,7 +570,6 @@ static void PREFIX286(_0fpre)(i8086_state *cpustate)
break;
default:
throw TRAP(ILLEGAL_INSTRUCTION,-1);
- break;
}
break;
case 1:
@@ -609,7 +608,6 @@ static void PREFIX286(_0fpre)(i8086_state *cpustate)
break;
default:
throw TRAP(ILLEGAL_INSTRUCTION,-1);
- break;
}
break;
case 2: /* LAR */
@@ -695,7 +693,6 @@ static void PREFIX286(_0fpre)(i8086_state *cpustate)
break;
default:
throw TRAP(ILLEGAL_INSTRUCTION,-1);
- break;
}
}
diff --git a/src/emu/distate.c b/src/emu/distate.c
index f2e1f708b07..d08d6c93cdb 100644
--- a/src/emu/distate.c
+++ b/src/emu/distate.c
@@ -332,7 +332,6 @@ astring &device_state_entry::format(astring &dest, const char *string, bool maxo
// other formats unknown
default:
throw emu_fatalerror("Unknown format character '%c'\n", *fptr);
- break;
}
}
return dest;
diff --git a/src/emu/machine/wd_fdc.c b/src/emu/machine/wd_fdc.c
index 063f266979a..3be5e187404 100644
--- a/src/emu/machine/wd_fdc.c
+++ b/src/emu/machine/wd_fdc.c
@@ -1042,10 +1042,10 @@ void wd_fdc_t::gen_w(int reg, UINT8 val)
UINT8 wd_fdc_t::gen_r(int reg)
{
switch(reg) {
- case 0: return status_r(); break;
- case 1: return track_r(); break;
- case 2: return sector_r(); break;
- case 3: return data_r(); break;
+ case 0: return status_r();
+ case 1: return track_r();
+ case 2: return sector_r();
+ case 3: return data_r();
}
return 0xff;
}
diff --git a/src/emu/rendlay.c b/src/emu/rendlay.c
index eefae4956d6..49e8372e1b1 100644
--- a/src/emu/rendlay.c
+++ b/src/emu/rendlay.c
@@ -408,7 +408,7 @@ static void parse_orientation(running_machine &machine, xml_data_node *orientnod
case 90: orientation = ROT90; break;
case 180: orientation = ROT180; break;
case 270: orientation = ROT270; break;
- default: throw emu_fatalerror("Invalid rotation in XML orientation node: %d", rotate); break;
+ default: throw emu_fatalerror("Invalid rotation in XML orientation node: %d", rotate);
}
if (strcmp("yes", xml_get_attribute_string_with_subst(machine, *orientnode, "swapxy", "no")) == 0)
orientation ^= ORIENTATION_SWAP_XY;
diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c
index daf5eb755fc..3dcb51c8644 100644
--- a/src/mame/video/n64.c
+++ b/src/mame/video/n64.c
@@ -1127,16 +1127,12 @@ bool n64_rdp::ZCompare(UINT32 zcurpixel, UINT32 dzcurpixel, UINT32 sz, UINT16 dz
{
case 0:
return (max || (overflow ? infront : nearer));
- break;
case 1:
return (max || (overflow ? infront : nearer));
- break;
case 2:
return (infront || max);
- break;
case 3:
return (farther && nearer && !max);
- break;
}
return false;
diff --git a/src/mess/machine/a2echoii.c b/src/mess/machine/a2echoii.c
index 669074c4c4b..e59f3ba9c71 100644
--- a/src/mess/machine/a2echoii.c
+++ b/src/mess/machine/a2echoii.c
@@ -82,7 +82,6 @@ UINT8 a2bus_echoii_device::read_c0nx(address_space &space, UINT8 offset)
{
case 0:
return 0x1f | tms5220_status_r(m_tms, space, 0);
- break;
}
return 0;