Firehawk52-backup/dolphin
28
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-01-15 16:33:15 -03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14239 from JoshuaVandaele/error-warns-forkedoff4

Browse Source 
Fix two warnings
This commit is contained in:
Dentomologist
2025-12-29 17:23:15 -08:00
committed by GitHub
parent 6c7b60250d 74b1930da4
commit e639d565f7
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp
View File

@@ -182,12 +182,9 @@ Arm64GPRCache::GuestRegInfo Arm64GPRCache::GetGuestCR(size_t preg)
Arm64GPRCache::GuestRegInfo Arm64GPRCache::GetGuestByIndex(size_t index)
{
// We do not need to test for `index >= GUEST_GPR_OFFSET` because
// GUEST_GPR_OFFSET is always 0. This otherwise raises a warning.
static_assert(GUEST_GPR_OFFSET == 0);
if (index < GUEST_GPR_OFFSET + GUEST_GPR_COUNT)
if (IsIndexGPR(index))
return GetGuestGPR(index - GUEST_GPR_OFFSET);
if (index >= GUEST_CR_OFFSET && index < GUEST_CR_OFFSET + GUEST_CR_COUNT)
if (IsIndexCR(index))
return GetGuestCR(index - GUEST_CR_OFFSET);
ASSERT_MSG(DYNA_REC, false, "Invalid index for guest register");
return GetGuestGPR(0);
@@ -198,7 +195,7 @@ void Arm64GPRCache::FlushRegister(size_t index, FlushMode mode, ARM64Reg tmp_reg
GuestRegInfo guest_reg = GetGuestByIndex(index);
OpArg& reg = guest_reg.reg;
size_t bitsize = guest_reg.bitsize;
const bool is_gpr = index >= GUEST_GPR_OFFSET && index < GUEST_GPR_OFFSET + GUEST_GPR_COUNT;
const bool is_gpr = IsIndexGPR(index);
if (reg.IsInHostRegister())
{
@@ -349,7 +346,7 @@ ARM64Reg Arm64GPRCache::BindForRead(size_t index)
GuestRegInfo guest_reg = GetGuestByIndex(index);
OpArg& reg = guest_reg.reg;
size_t bitsize = guest_reg.bitsize;
const bool is_gpr = index >= GUEST_GPR_OFFSET && index < GUEST_GPR_OFFSET + GUEST_GPR_COUNT;
const bool is_gpr = IsIndexGPR(index);
IncrementAllUsed();
reg.ResetLastUsed();
@@ -392,7 +389,7 @@ void Arm64GPRCache::BindForWrite(size_t index, bool will_read, bool will_write)
GuestRegInfo guest_reg = GetGuestByIndex(index);
OpArg& reg = guest_reg.reg;
const size_t bitsize = guest_reg.bitsize;
const bool is_gpr = index >= GUEST_GPR_OFFSET && index < GUEST_GPR_OFFSET + GUEST_GPR_COUNT;
const bool is_gpr = IsIndexGPR(index);
reg.ResetLastUsed();

13
Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h
View File

@@ -419,6 +419,19 @@ private:
GuestRegInfo GetGuestCR(size_t preg);
GuestRegInfo GetGuestByIndex(size_t index);
constexpr bool IsIndexGPR(size_t index)
{
// We do not need to test for `index >= GUEST_GPR_OFFSET` because
// GUEST_GPR_OFFSET is always 0. This otherwise raises a warning.
static_assert(GUEST_GPR_OFFSET == 0);
return index < GUEST_GPR_OFFSET + GUEST_GPR_COUNT;
}
constexpr bool IsIndexCR(size_t index)
{
return index >= GUEST_CR_OFFSET && index < GUEST_CR_OFFSET + GUEST_CR_COUNT;
}
Arm64Gen::ARM64Reg BindForRead(size_t index);
void SetImmediateInternal(size_t index, u32 imm, bool dirty);
void BindForWrite(size_t index, bool will_read, bool will_write = true);

4
Source/Core/VideoCommon/Assets/ShaderAsset.cpp
View File

@@ -256,7 +256,7 @@ bool RasterSurfaceShaderData::FromJson(const VideoCommon::CustomAssetLibrary::As
const auto parse_samplers =
[&](const char* name,
std::vector<VideoCommon::RasterSurfaceShaderData::SamplerData>* samplers) -> bool {
std::vector<VideoCommon::RasterSurfaceShaderData::SamplerData>* samplers_out) -> bool {
const auto samplers_iter = json.find(name);
if (samplers_iter == json.end())
{
@@ -309,7 +309,7 @@ bool RasterSurfaceShaderData::FromJson(const VideoCommon::CustomAssetLibrary::As
asset_id);
return false;
}
samplers->push_back(std::move(sampler));
samplers_out->push_back(std::move(sampler));
}
return true;