mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A64/location_descriptor: Fix -fpermissive warning on GCC

Browse source
This commit is contained in:
MerryMage 2018-01-10 18:56:12 +00:00
parent 243f06c613
commit 511215342b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/frontend/A32/location_descriptor.h
View file

@ -43,8 +43,8 @@ public:
bool TFlag() const { return cpsr.T(); } bool TFlag() const { return cpsr.T(); }
bool EFlag() const { return cpsr.E(); } bool EFlag() const { return cpsr.E(); }
PSR CPSR() const { return cpsr; } A32::PSR CPSR() const { return cpsr; }
FPSCR FPSCR() const { return fpscr; } A32::FPSCR FPSCR() const { return fpscr; }
bool operator == (const LocationDescriptor& o) const { bool operator == (const LocationDescriptor& o) const {
return std::tie(arm_pc, cpsr, fpscr) == std::tie(o.arm_pc, o.cpsr, o.fpscr); return std::tie(arm_pc, cpsr, fpscr) == std::tie(o.arm_pc, o.cpsr, o.fpscr);

2
src/frontend/A64/location_descriptor.h
View file

@ -34,7 +34,7 @@ public:
: pc(o.Value() & PC_MASK), fpcr((o.Value() >> 37) & FPCR_MASK) {} : pc(o.Value() & PC_MASK), fpcr((o.Value() >> 37) & FPCR_MASK) {}
u64 PC() const { return Common::SignExtend<56>(pc); } u64 PC() const { return Common::SignExtend<56>(pc); }
FPCR FPCR() const { return fpcr; } A64::FPCR FPCR() const { return fpcr; }
bool operator == (const LocationDescriptor& o) const { bool operator == (const LocationDescriptor& o) const {
return std::tie(pc, fpcr) == std::tie(o.pc, o.fpcr); return std::tie(pc, fpcr) == std::tie(o.pc, o.fpcr);