Merge pull request #5549 from xperia64/squash_reg_warnings
Silence some noisy switch case warning
This commit is contained in:
commit
df83449d21
3 changed files with 18 additions and 4 deletions
|
@ -277,6 +277,8 @@ private:
|
||||||
case VFP_FPSCR:
|
case VFP_FPSCR:
|
||||||
case VFP_FPEXC:
|
case VFP_FPEXC:
|
||||||
r = GetVFPSystemReg(reg);
|
r = GetVFPSystemReg(reg);
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
ar << r;
|
ar << r;
|
||||||
}
|
}
|
||||||
|
@ -287,6 +289,8 @@ private:
|
||||||
case CP15_THREAD_UPRW:
|
case CP15_THREAD_UPRW:
|
||||||
case CP15_THREAD_URO:
|
case CP15_THREAD_URO:
|
||||||
r = GetCP15Register(reg);
|
r = GetCP15Register(reg);
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
ar << r;
|
ar << r;
|
||||||
}
|
}
|
||||||
|
@ -321,6 +325,8 @@ private:
|
||||||
case VFP_FPSCR:
|
case VFP_FPSCR:
|
||||||
case VFP_FPEXC:
|
case VFP_FPEXC:
|
||||||
SetVFPSystemReg(reg, r);
|
SetVFPSystemReg(reg, r);
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (std::size_t i = 0; i < CP15Register::CP15_REGISTER_COUNT; i++) {
|
for (std::size_t i = 0; i < CP15Register::CP15_REGISTER_COUNT; i++) {
|
||||||
|
@ -330,6 +336,8 @@ private:
|
||||||
case CP15_THREAD_UPRW:
|
case CP15_THREAD_UPRW:
|
||||||
case CP15_THREAD_URO:
|
case CP15_THREAD_URO:
|
||||||
SetCP15Register(reg, r);
|
SetCP15Register(reg, r);
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -205,9 +205,10 @@ u32 ARM_Dynarmic::GetVFPSystemReg(VFPSystemRegister reg) const {
|
||||||
return jit->Fpscr();
|
return jit->Fpscr();
|
||||||
case VFP_FPEXC:
|
case VFP_FPEXC:
|
||||||
return 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) {
|
void ARM_Dynarmic::SetVFPSystemReg(VFPSystemRegister reg, u32 value) {
|
||||||
switch (reg) {
|
switch (reg) {
|
||||||
|
@ -217,9 +218,10 @@ void ARM_Dynarmic::SetVFPSystemReg(VFPSystemRegister reg, u32 value) {
|
||||||
case VFP_FPEXC:
|
case VFP_FPEXC:
|
||||||
fpexc = value;
|
fpexc = value;
|
||||||
return;
|
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 {
|
u32 ARM_Dynarmic::GetCPSR() const {
|
||||||
return jit->Cpsr();
|
return jit->Cpsr();
|
||||||
|
@ -235,9 +237,10 @@ u32 ARM_Dynarmic::GetCP15Register(CP15Register reg) const {
|
||||||
return cp15_state.cp15_thread_uprw;
|
return cp15_state.cp15_thread_uprw;
|
||||||
case CP15_THREAD_URO:
|
case CP15_THREAD_URO:
|
||||||
return cp15_state.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) {
|
void ARM_Dynarmic::SetCP15Register(CP15Register reg, u32 value) {
|
||||||
switch (reg) {
|
switch (reg) {
|
||||||
|
@ -247,9 +250,10 @@ void ARM_Dynarmic::SetCP15Register(CP15Register reg, u32 value) {
|
||||||
case CP15_THREAD_URO:
|
case CP15_THREAD_URO:
|
||||||
cp15_state.cp15_thread_uro = value;
|
cp15_state.cp15_thread_uro = value;
|
||||||
return;
|
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 {
|
std::unique_ptr<ARM_Interface::ThreadContext> ARM_Dynarmic::NewContext() const {
|
||||||
return std::make_unique<DynarmicThreadContext>();
|
return std::make_unique<DynarmicThreadContext>();
|
||||||
|
|
|
@ -189,6 +189,8 @@ private:
|
||||||
labels);
|
labels);
|
||||||
return exit_method = SeriesExit(both, after_call);
|
return exit_method = SeriesExit(both, after_call);
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return exit_method = ExitMethod::AlwaysReturn;
|
return exit_method = ExitMethod::AlwaysReturn;
|
||||||
|
|
Loading…
Reference in a new issue