R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup InterpretIntelCacheDescriptors

Browse Source 
Pass 'CPUInformation' by reference instead of using the static directly.
This commit is contained in:
Amos 2023-02-11 15:19:29 +01:00
parent 78288796e2
commit 9145030b77
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
r5dev/tier0/cpu.cpp
View File

@ -400,7 +400,7 @@ static void FindIntelCacheDesc(uint8_t nDesc, const IntelCacheDesc_t* pDesc, int
}
// See "Output of the CPUID instruction" from Intel, page 26.
static void InterpretIntelCacheDescriptors(uint32_t nPackedDesc)
static void InterpretIntelCacheDescriptors(uint32_t nPackedDesc, CPUInformation& pi)
{
if (nPackedDesc & 0x80000000)
{
@ -408,9 +408,9 @@ static void InterpretIntelCacheDescriptors(uint32_t nPackedDesc)
}
for (int i = 0; i < 4; ++i)
{
FindIntelCacheDesc(nPackedDesc & 0xFF, s_IntelL1DataCacheDesc, ARRAYSIZE(s_IntelL1DataCacheDesc), s_cpuInformation.m_nL1CacheSizeKb, s_cpuInformation.m_nL1CacheDesc);
FindIntelCacheDesc(nPackedDesc & 0xFF, s_IntelL2DataCacheDesc, ARRAYSIZE(s_IntelL2DataCacheDesc), s_cpuInformation.m_nL2CacheSizeKb, s_cpuInformation.m_nL2CacheDesc);
FindIntelCacheDesc(nPackedDesc & 0xFF, s_IntelL3DataCacheDesc, ARRAYSIZE(s_IntelL3DataCacheDesc), s_cpuInformation.m_nL3CacheSizeKb, s_cpuInformation.m_nL3CacheDesc);
FindIntelCacheDesc(nPackedDesc & 0xFF, s_IntelL1DataCacheDesc, ARRAYSIZE(s_IntelL1DataCacheDesc), pi.m_nL1CacheSizeKb, pi.m_nL1CacheDesc);
FindIntelCacheDesc(nPackedDesc & 0xFF, s_IntelL2DataCacheDesc, ARRAYSIZE(s_IntelL2DataCacheDesc), pi.m_nL2CacheSizeKb, pi.m_nL2CacheDesc);
FindIntelCacheDesc(nPackedDesc & 0xFF, s_IntelL3DataCacheDesc, ARRAYSIZE(s_IntelL3DataCacheDesc), pi.m_nL3CacheSizeKb, pi.m_nL3CacheDesc);
nPackedDesc >>= 8;
}
}
@ -539,10 +539,10 @@ const CPUInformation& GetCPUInformation(void)
CpuIdResult_t cpuid2 = cpuid(2);
for (int i = (cpuid2.eax & 0xFF); i-- > 0; )
{
InterpretIntelCacheDescriptors(cpuid2.eax & ~0xFF);
InterpretIntelCacheDescriptors(cpuid2.ebx);
InterpretIntelCacheDescriptors(cpuid2.ecx);
InterpretIntelCacheDescriptors(cpuid2.edx);
InterpretIntelCacheDescriptors(cpuid2.eax & ~0xFF, pi);
InterpretIntelCacheDescriptors(cpuid2.ebx, pi);
InterpretIntelCacheDescriptors(cpuid2.ecx, pi);
InterpretIntelCacheDescriptors(cpuid2.edx, pi);
cpuid2 = cpuid(2); // Read the next.
}
}