ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9518 from JosJuice/jitarm64-gcc-ice 

JitArm64: Workaround for GCC ICE
This commit is contained in:
Léo Lam 2021-02-16 13:14:12 +01:00 committed by GitHub
parent f9deb68aee 1e500d96b0
commit 9d94a31eae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/Core/Common/Arm64Emitter.cpp
View File

@ -2036,11 +2036,11 @@ void ARM64XEmitter::MOVI2RImpl(ARM64Reg Rd, T imm)
{ {
enum class Approach enum class Approach
{ {
MOVZ, MOVZBase,
MOVN, MOVNBase,
ADR, ADRBase,
ADRP, ADRPBase,
ORR, ORRBase,
}; };
struct Part struct Part
@ -2060,7 +2060,7 @@ void ARM64XEmitter::MOVI2RImpl(ARM64Reg Rd, T imm)
const auto instructions_required = [](const SmallVector<Part, max_parts>& parts, const auto instructions_required = [](const SmallVector<Part, max_parts>& parts,
Approach approach) { Approach approach) {
return parts.size() + (approach > Approach::MOVN); return parts.size() + (approach > Approach::MOVNBase);
}; };
const auto try_base = [&](T base, Approach approach, bool first_time) { const auto try_base = [&](T base, Approach approach, bool first_time) {
@ -2085,8 +2085,8 @@ void ARM64XEmitter::MOVI2RImpl(ARM64Reg Rd, T imm)
}; };
// Try MOVZ/MOVN // Try MOVZ/MOVN
try_base(T(0), Approach::MOVZ, true); try_base(T(0), Approach::MOVZBase, true);
try_base(~T(0), Approach::MOVN, false); try_base(~T(0), Approach::MOVNBase, false);
// Try PC-relative approaches // Try PC-relative approaches
const auto sext_21_bit = [](u64 x) { const auto sext_21_bit = [](u64 x) {
@ -2099,8 +2099,8 @@ void ARM64XEmitter::MOVI2RImpl(ARM64Reg Rd, T imm)
const u64 adr_base = pc + adr_offset; const u64 adr_base = pc + adr_offset;
if constexpr (sizeof(T) == 8) if constexpr (sizeof(T) == 8)
{ {
try_base(adrp_base, Approach::ADRP, false); try_base(adrp_base, Approach::ADRPBase, false);
try_base(adr_base, Approach::ADR, false); try_base(adr_base, Approach::ADRBase, false);
} }
// Try ORR (or skip it if we already have a 1-instruction encoding - these tests are non-trivial) // Try ORR (or skip it if we already have a 1-instruction encoding - these tests are non-trivial)
@ -2113,13 +2113,13 @@ void ARM64XEmitter::MOVI2RImpl(ARM64Reg Rd, T imm)
(imm << 48) | (imm & 0x0000'FFFF'FFFF'0000) | (imm >> 48)}) (imm << 48) | (imm & 0x0000'FFFF'FFFF'0000) | (imm >> 48)})
{ {
if (IsImmLogical(orr_imm, 64)) if (IsImmLogical(orr_imm, 64))
try_base(orr_imm, Approach::ORR, false); try_base(orr_imm, Approach::ORRBase, false);
} }
} }
else else
{ {
if (IsImmLogical(imm, 32)) if (IsImmLogical(imm, 32))
try_base(imm, Approach::ORR, false); try_base(imm, Approach::ORRBase, false);
} }
} }
@ -2128,7 +2128,7 @@ void ARM64XEmitter::MOVI2RImpl(ARM64Reg Rd, T imm)
// To kill any dependencies, we start with an instruction that overwrites the entire register // To kill any dependencies, we start with an instruction that overwrites the entire register
switch (best_approach) switch (best_approach)
{ {
case Approach::MOVZ: case Approach::MOVZBase:
if (best_parts.empty()) if (best_parts.empty())
best_parts.emplace_back(u16(0), ShiftAmount::Shift0); best_parts.emplace_back(u16(0), ShiftAmount::Shift0);
@ -2136,7 +2136,7 @@ void ARM64XEmitter::MOVI2RImpl(ARM64Reg Rd, T imm)
++parts_uploaded; ++parts_uploaded;
break; break;
case Approach::MOVN: case Approach::MOVNBase:
if (best_parts.empty()) if (best_parts.empty())
best_parts.emplace_back(u16(0xFFFF), ShiftAmount::Shift0); best_parts.emplace_back(u16(0xFFFF), ShiftAmount::Shift0);
@ -2144,15 +2144,15 @@ void ARM64XEmitter::MOVI2RImpl(ARM64Reg Rd, T imm)
++parts_uploaded; ++parts_uploaded;
break; break;
case Approach::ADR: case Approach::ADRBase:
ADR(Rd, adr_offset); ADR(Rd, adr_offset);
break; break;
case Approach::ADRP: case Approach::ADRPBase:
ADRP(Rd, adrp_offset); ADRP(Rd, adrp_offset);
break; break;
case Approach::ORR: case Approach::ORRBase:
constexpr ARM64Reg zero_reg = sizeof(T) == 8 ? ZR : WZR; constexpr ARM64Reg zero_reg = sizeof(T) == 8 ? ZR : WZR;
const bool success = TryORRI2R(Rd, zero_reg, best_base); const bool success = TryORRI2R(Rd, zero_reg, best_base);
ASSERT(success); ASSERT(success);
@ -2164,7 +2164,7 @@ void ARM64XEmitter::MOVI2RImpl(ARM64Reg Rd, T imm)
{ {
const Part& part = best_parts[parts_uploaded]; const Part& part = best_parts[parts_uploaded];
if (best_approach == Approach::ADRP && part.shift == ShiftAmount::Shift0) if (best_approach == Approach::ADRPBase && part.shift == ShiftAmount::Shift0)
{ {
// The combination of ADRP followed by ADD immediate is specifically optimized in hardware // The combination of ADRP followed by ADD immediate is specifically optimized in hardware
ASSERT(part.imm == (adrp_base & 0xF000) + (part.imm & 0xFFF)); ASSERT(part.imm == (adrp_base & 0xF000) + (part.imm & 0xFFF));