midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up command_processor.cpp.

Browse Source
This commit is contained in:
Tony Wasserka 2015-05-21 02:24:24 +02:00
parent 01a526e1c4
commit 0799b40caa
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/video_core/command_processor.cpp
View File

@ -135,27 +135,32 @@ static inline void WritePicaReg(u32 id, u32 value, u32 mask) {
} }
} }
// map physical start address to size class {
std::map<u32, u32> accessed_ranges; /// Combine overlapping and close ranges
static auto SimplifyRanges = [](std::map<u32, u32>& ranges) { void SimplifyRanges() {
for (auto it = ranges.begin(); it != ranges.end(); ++it) { for (auto it = ranges.begin(); it != ranges.end(); ++it) {
// NOTE: We add 32 to the range end address to make sure "close" ranges are combined, too
// Combine overlapping ranges ... artificially extend first range by 32 bytes to merge "close" ranges
auto it2 = std::next(it); auto it2 = std::next(it);
while (it2 != ranges.end() && it->first + it->second + 32 >= it2->first) { while (it2 != ranges.end() && it->first + it->second + 32 >= it2->first) {
it->second = std::max(it->second, it2->first + it2->second - it->first); it->second = std::max(it->second, it2->first + it2->second - it->first);
it2 = ranges.erase(it2); it2 = ranges.erase(it2);
} }
} }
}; }
static auto AddMemoryAccess = [](std::map<u32, u32>& ranges, u32 paddr, u32 size) { public:
/// Record a particular memory access in the list
void AddAccess(u32 paddr, u32 size) {
// Create new range or extend existing one // Create new range or extend existing one
ranges[paddr] = std::max(ranges[paddr], size); ranges[paddr] = std::max(ranges[paddr], size);
// Simplify ranges... // Simplify ranges...
SimplifyRanges(ranges); SimplifyRanges();
}; }
/// Map of accessed ranges (mapping start address to range size)
std::map<u32, u32> ranges;
} memory_accesses;
for (unsigned int index = 0; index < regs.num_vertices; ++index) for (unsigned int index = 0; index < regs.num_vertices; ++index)
{ {
@ -165,7 +170,7 @@ static inline void WritePicaReg(u32 id, u32 value, u32 mask) {
// TODO: Implement some sort of vertex cache! // TODO: Implement some sort of vertex cache!
if (g_debug_context && Pica::g_debug_context->recorder) { if (g_debug_context && Pica::g_debug_context->recorder) {
int size = index_u16 ? 2 : 1; int size = index_u16 ? 2 : 1;
AddMemoryAccess(accessed_ranges, base_address + index_info.offset + size*index, size); memory_accesses.AddAccess(base_address + index_info.offset + size * index, size);
} }
} }
@ -193,7 +198,7 @@ static inline void WritePicaReg(u32 id, u32 value, u32 mask) {
const u8* srcdata = Memory::GetPhysicalPointer(source_addr); const u8* srcdata = Memory::GetPhysicalPointer(source_addr);
if (g_debug_context && Pica::g_debug_context->recorder) { if (g_debug_context && Pica::g_debug_context->recorder) {
AddMemoryAccess(accessed_ranges, source_addr, memory_accesses.AddAccess(source_addr,
(vertex_attribute_formats[i] == Regs::VertexAttributeFormat::FLOAT) ? 4 (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::FLOAT) ? 4
: (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::SHORT) ? 2 : 1); : (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::SHORT) ? 2 : 1);
} }
@ -258,7 +263,7 @@ static inline void WritePicaReg(u32 id, u32 value, u32 mask) {
} }
} }
for (auto& range : accessed_ranges) { for (auto& range : memory_accesses.ranges) {
g_debug_context->recorder->MemoryAccessed(Memory::GetPhysicalPointer(range.first), g_debug_context->recorder->MemoryAccessed(Memory::GetPhysicalPointer(range.first),
range.second, range.first); range.second, range.first);
} }