Merge pull request #472 from lioncash/exception

general: Mark hash functions as noexcept
This commit is contained in:
Merry 2019-04-12 21:33:47 +01:00 committed by MerryMage
commit d7da53a74b
7 changed files with 19 additions and 19 deletions

View file

@ -196,7 +196,7 @@ void A32JitState::SetFpscr(u32 FPSCR) {
}
}
u64 A32JitState::GetUniqueHash() const {
u64 A32JitState::GetUniqueHash() const noexcept {
return CPSR_et | FPSCR_mode | (static_cast<u64>(Reg[15]) << 32);
}

View file

@ -76,7 +76,7 @@ struct A32JitState {
u32 Fpscr() const;
void SetFpscr(u32 FPSCR);
u64 GetUniqueHash() const;
u64 GetUniqueHash() const noexcept;
};
#ifdef _MSC_VER

View file

@ -10,9 +10,9 @@
namespace Dynarmic::BackendX64 {
u64 A64JitState::GetUniqueHash() const {
u64 fpcr_u64 = static_cast<u64>(fpcr & A64::LocationDescriptor::FPCR_MASK) << 37;
u64 pc_u64 = pc & A64::LocationDescriptor::PC_MASK;
u64 A64JitState::GetUniqueHash() const noexcept {
const u64 fpcr_u64 = static_cast<u64>(fpcr & A64::LocationDescriptor::FPCR_MASK) << 37;
const u64 pc_u64 = pc & A64::LocationDescriptor::PC_MASK;
return pc_u64 | fpcr_u64;
}

View file

@ -81,7 +81,7 @@ struct A64JitState {
void SetFpcr(u32 new_fpcr);
void SetFpsr(u32 new_fpcr);
u64 GetUniqueHash() const;
u64 GetUniqueHash() const noexcept;
};
#ifdef _MSC_VER