piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

PPCCache: Make use of std::array where applicable

Browse Source 
Allows simplifying a bunch of initialization and filling code.
This commit is contained in:
Lioncash 2019-12-02 23:19:00 -05:00
parent 15fc71cfcf
commit 1d5ce4708f
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Source/Core/Core/PowerPC/PPCCache.cpp
View File

@ -4,7 +4,7 @@
#include "Core/PowerPC/PPCCache.h" #include "Core/PowerPC/PPCCache.h"
#include <cstring> #include <array>
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/Swap.h" #include "Common/Swap.h"
@ -15,8 +15,15 @@
namespace PowerPC namespace PowerPC
{ {
static const u32 s_plru_mask[8] = {11, 11, 19, 19, 37, 37, 69, 69}; namespace
static const u32 s_plru_value[8] = {11, 3, 17, 1, 36, 4, 64, 0}; {
constexpr std::array<u32, 8> s_plru_mask{
11, 11, 19, 19, 37, 37, 69, 69,
};
constexpr std::array<u32, 8> s_plru_value{
11, 3, 17, 1, 36, 4, 64, 0,
};
} // Anonymous namespace
InstructionCache::InstructionCache() InstructionCache::InstructionCache()
{ {
@ -59,19 +66,18 @@ InstructionCache::InstructionCache()
void InstructionCache::Reset() void InstructionCache::Reset()
{ {
memset(valid, 0, sizeof(valid)); valid.fill(0);
memset(plru, 0, sizeof(plru)); plru.fill(0);
memset(lookup_table, 0xff, sizeof(lookup_table)); lookup_table.fill(0xFF);
memset(lookup_table_ex, 0xff, sizeof(lookup_table_ex)); lookup_table_ex.fill(0xFF);
memset(lookup_table_vmem, 0xff, sizeof(lookup_table_vmem)); lookup_table_vmem.fill(0xFF);
JitInterface::ClearSafe(); JitInterface::ClearSafe();
} }
void InstructionCache::Init() void InstructionCache::Init()
{ {
memset(data, 0, sizeof(data)); data.fill({});
memset(tags, 0, sizeof(tags)); tags.fill({});
Reset(); Reset();
} }
@ -79,10 +85,12 @@ void InstructionCache::Invalidate(u32 addr)
{ {
if (!HID0.ICE) if (!HID0.ICE)
return; return;
// invalidates the whole set
u32 set = (addr >> 5) & 0x7f; // Invalidates the whole set
for (int i = 0; i < 8; i++) const u32 set = (addr >> 5) & 0x7f;
if (valid[set] & (1 << i)) for (size_t i = 0; i < 8; i++)
{
if (valid[set] & (1U << i))
{ {
if (tags[set][i] & (ICACHE_VMEM_BIT >> 12)) if (tags[set][i] & (ICACHE_VMEM_BIT >> 12))
lookup_table_vmem[((tags[set][i] << 7) | set) & 0xfffff] = 0xff; lookup_table_vmem[((tags[set][i] << 7) | set) & 0xfffff] = 0xff;
@ -91,6 +99,7 @@ void InstructionCache::Invalidate(u32 addr)
else else
lookup_table[((tags[set][i] << 7) | set) & 0xfffff] = 0xff; lookup_table[((tags[set][i] << 7) | set) & 0xfffff] = 0xff;
} }
}
valid[set] = 0; valid[set] = 0;
JitInterface::InvalidateICache(addr & ~0x1f, 32, false); JitInterface::InvalidateICache(addr & ~0x1f, 32, false);
} }
@ -126,7 +135,7 @@ u32 InstructionCache::ReadInstruction(u32 addr)
else else
t = way_from_plru[plru[set]]; t = way_from_plru[plru[set]];
// load // load
Memory::CopyFromEmu((u8*)data[set][t], (addr & ~0x1f), 32); Memory::CopyFromEmu(reinterpret_cast<u8*>(data[set][t].data()), (addr & ~0x1f), 32);
if (valid[set] & (1 << t)) if (valid[set] & (1 << t))
{ {
if (tags[set][t] & (ICACHE_VMEM_BIT >> 12)) if (tags[set][t] & (ICACHE_VMEM_BIT >> 12))

30
Source/Core/Core/PowerPC/PPCCache.h
View File

@ -4,33 +4,35 @@
#pragma once #pragma once
#include <array>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
class PointerWrap; class PointerWrap;
namespace PowerPC namespace PowerPC
{ {
const u32 ICACHE_SETS = 128; constexpr u32 ICACHE_SETS = 128;
const u32 ICACHE_WAYS = 8; constexpr u32 ICACHE_WAYS = 8;
// size of an instruction cache block in words // size of an instruction cache block in words
const u32 ICACHE_BLOCK_SIZE = 8; constexpr u32 ICACHE_BLOCK_SIZE = 8;
const u32 ICACHE_EXRAM_BIT = 0x10000000; constexpr u32 ICACHE_EXRAM_BIT = 0x10000000;
const u32 ICACHE_VMEM_BIT = 0x20000000; constexpr u32 ICACHE_VMEM_BIT = 0x20000000;
struct InstructionCache struct InstructionCache
{ {
u32 data[ICACHE_SETS][ICACHE_WAYS][ICACHE_BLOCK_SIZE]; std::array<std::array<std::array<u32, ICACHE_BLOCK_SIZE>, ICACHE_WAYS>, ICACHE_SETS> data;
u32 tags[ICACHE_SETS][ICACHE_WAYS]; std::array<std::array<u32, ICACHE_WAYS>, ICACHE_SETS> tags;
u32 plru[ICACHE_SETS]; std::array<u32, ICACHE_SETS> plru;
u32 valid[ICACHE_SETS]; std::array<u32, ICACHE_SETS> valid;
u32 way_from_valid[255]; std::array<u32, 255> way_from_valid;
u32 way_from_plru[128]; std::array<u32, 128> way_from_plru;
u8 lookup_table[1 << 20]; std::array<u8, 1 << 20> lookup_table;
u8 lookup_table_ex[1 << 21]; std::array<u8, 1 << 21> lookup_table_ex;
u8 lookup_table_vmem[1 << 20]; std::array<u8, 1 << 20> lookup_table_vmem;
InstructionCache(); InstructionCache();
u32 ReadInstruction(u32 addr); u32 ReadInstruction(u32 addr);