N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5549 from xperia64/squash_reg_warnings

Browse source 
Silence some noisy switch case warning
This commit is contained in:
Pengfei Zhu 2020-09-10 22:26:45 +08:00 committed by GitHub
commit df83449d21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/arm/arm_interface.h
View file

@ -277,6 +277,8 @@ private:
case VFP_FPSCR:
case VFP_FPEXC:
r = GetVFPSystemReg(reg);
default:
break;
}
ar << r;
}
@ -287,6 +289,8 @@ private:
case CP15_THREAD_UPRW:
case CP15_THREAD_URO:
r = GetCP15Register(reg);
default:
break;
}
ar << r;
}
@ -321,6 +325,8 @@ private:
case VFP_FPSCR:
case VFP_FPEXC:
SetVFPSystemReg(reg, r);
default:
break;
}
}
for (std::size_t i = 0; i < CP15Register::CP15_REGISTER_COUNT; i++) {
@ -330,6 +336,8 @@ private:
case CP15_THREAD_UPRW:
case CP15_THREAD_URO:
SetCP15Register(reg, r);
default:
break;
}
}
}

12
src/core/arm/dynarmic/arm_dynarmic.cpp
View file

@ -205,8 +205,9 @@ u32 ARM_Dynarmic::GetVFPSystemReg(VFPSystemRegister reg) const {
return jit->Fpscr();
case VFP_FPEXC:
return fpexc;
default:
UNREACHABLE_MSG("Unknown VFP system register: {}", static_cast<size_t>(reg));
}
UNREACHABLE_MSG("Unknown VFP system register: {}", static_cast<size_t>(reg));
}
void ARM_Dynarmic::SetVFPSystemReg(VFPSystemRegister reg, u32 value) {
@ -217,8 +218,9 @@ void ARM_Dynarmic::SetVFPSystemReg(VFPSystemRegister reg, u32 value) {
case VFP_FPEXC:
fpexc = value;
return;
default:
UNREACHABLE_MSG("Unknown VFP system register: {}", static_cast<size_t>(reg));
}
UNREACHABLE_MSG("Unknown VFP system register: {}", static_cast<size_t>(reg));
}
u32 ARM_Dynarmic::GetCPSR() const {
@ -235,8 +237,9 @@ u32 ARM_Dynarmic::GetCP15Register(CP15Register reg) const {
return cp15_state.cp15_thread_uprw;
case CP15_THREAD_URO:
return cp15_state.cp15_thread_uro;
default:
UNREACHABLE_MSG("Unknown CP15 register: {}", static_cast<size_t>(reg));
}
UNREACHABLE_MSG("Unknown CP15 register: {}", static_cast<size_t>(reg));
}
void ARM_Dynarmic::SetCP15Register(CP15Register reg, u32 value) {
@ -247,8 +250,9 @@ void ARM_Dynarmic::SetCP15Register(CP15Register reg, u32 value) {
case CP15_THREAD_URO:
cp15_state.cp15_thread_uro = value;
return;
default:
UNREACHABLE_MSG("Unknown CP15 register: {}", static_cast<size_t>(reg));
}
UNREACHABLE_MSG("Unknown CP15 register: {}", static_cast<size_t>(reg));
}
std::unique_ptr<ARM_Interface::ThreadContext> ARM_Dynarmic::NewContext() const {

2
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View file

@ -189,6 +189,8 @@ private:
labels);
return exit_method = SeriesExit(both, after_call);
}
default:
break;
}
}
return exit_method = ExitMethod::AlwaysReturn;