SwitchEmu/dynarmic
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/dynarmic.git synced 2026-03-18 18:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

FPSCR: Make value constructor explicit (#13)

Browse Source 
Maintains consistency between the PSR helper.
This commit is contained in:
Mat M
2016-09-03 07:48:31 -04:00
committed by Merry
parent 3e03524658
commit 8c4df46580
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend_x64/interface_x64.cpp
View File

@@ -47,7 +47,7 @@ struct Jit::Impl {
size_t Execute(size_t cycle_count) {
u32 pc = jit_state.Reg[15];
Arm::LocationDescriptor descriptor{pc, Arm::PSR{jit_state.Cpsr}, jit_state.guest_FPSCR_mode};
Arm::LocationDescriptor descriptor{pc, Arm::PSR{jit_state.Cpsr}, Arm::FPSCR{jit_state.guest_FPSCR_mode}};
CodePtr code_ptr = GetBasicBlock(descriptor).code_ptr;
return block_of_code.RunCode(&jit_state, code_ptr, cycle_count);

2
src/frontend/arm/FPSCR.h
View File

@@ -28,7 +28,7 @@ public:
FPSCR() = default;
FPSCR(const FPSCR&) = default;
FPSCR(FPSCR&&) = default;
/* implicit */ FPSCR(u32 data) : value{data} {}
explicit FPSCR(u32 data) : value{data} {}
FPSCR& operator=(const FPSCR&) = default;
FPSCR& operator=(FPSCR&&) = default;

2
src/frontend/arm_types.h
View File

@@ -118,7 +118,7 @@ struct LocationDescriptor {
}
LocationDescriptor SetFPSCR(u32 new_fpscr) const {
return LocationDescriptor(arm_pc, cpsr, new_fpscr & FPSCR_MODE_MASK);
return LocationDescriptor(arm_pc, cpsr, Arm::FPSCR{new_fpscr & FPSCR_MODE_MASK});
}
u64 UniqueHash() const {