dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-10-08 16:43:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FifoAnalyzer: Convert FifoRecordAnalyzer to namespace.

Browse Source 
And a few minor cleanups.
This commit is contained in:
Scott Mansell 2015-11-08 02:50:09 +13:00
parent 9b60fd2381
commit da7fb568de
4 changed files with 37 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp
View File

@ -15,26 +15,25 @@
using namespace FifoAnalyzer; using namespace FifoAnalyzer;
static bool s_DrawingObject;
FifoAnalyzer::CPMemory s_CpMem;
FifoRecordAnalyzer::FifoRecordAnalyzer() : static void DecodeOpcode(u8* data);
m_DrawingObject(false), static void ProcessLoadIndexedXf(u32 val, int array);
m_BpMem(nullptr) static void ProcessVertexArrays(u8* data, u8 vtxAttrGroup);
static void WriteVertexArray(int arrayIndex, u8* vertexData, int vertexSize, int numVertices);
void FifoRecordAnalyzer::Initialize(u32* cpMem)
{ {
} s_DrawingObject = false;
void FifoRecordAnalyzer::Initialize(u32* bpMem, u32* cpMem) FifoAnalyzer::LoadCPReg(0x50, *(cpMem + 0x50), s_CpMem);
{ FifoAnalyzer::LoadCPReg(0x60, *(cpMem + 0x60), s_CpMem);
m_DrawingObject = false;
m_BpMem = (BPMemory*)bpMem;
FifoAnalyzer::LoadCPReg(0x50, *(cpMem + 0x50), m_CpMem);
FifoAnalyzer::LoadCPReg(0x60, *(cpMem + 0x60), m_CpMem);
for (int i = 0; i < 8; ++i) for (int i = 0; i < 8; ++i)
FifoAnalyzer::LoadCPReg(0x70 + i, *(cpMem + 0x70 + i), m_CpMem); FifoAnalyzer::LoadCPReg(0x70 + i, *(cpMem + 0x70 + i), s_CpMem);
memcpy(m_CpMem.arrayBases, cpMem + 0xA0, 16 * 4); memcpy(s_CpMem.arrayBases, cpMem + 0xA0, 16 * 4);
memcpy(m_CpMem.arrayStrides, cpMem + 0xB0, 16 * 4); memcpy(s_CpMem.arrayStrides, cpMem + 0xB0, 16 * 4);
} }
void FifoRecordAnalyzer::AnalyzeGPCommand(u8* data) void FifoRecordAnalyzer::AnalyzeGPCommand(u8* data)
@ -42,7 +41,7 @@ void FifoRecordAnalyzer::AnalyzeGPCommand(u8* data)
DecodeOpcode(data); DecodeOpcode(data);
} }
void FifoRecordAnalyzer::DecodeOpcode(u8* data) static void DecodeOpcode(u8* data)
{ {
int cmd = ReadFifo8(data); int cmd = ReadFifo8(data);
@ -55,33 +54,33 @@ void FifoRecordAnalyzer::DecodeOpcode(u8* data)
case GX_LOAD_CP_REG: case GX_LOAD_CP_REG:
{ {
m_DrawingObject = false; s_DrawingObject = false;
u32 cmd2 = ReadFifo8(data); u32 cmd2 = ReadFifo8(data);
u32 value = ReadFifo32(data); u32 value = ReadFifo32(data);
FifoAnalyzer::LoadCPReg(cmd2, value, m_CpMem); FifoAnalyzer::LoadCPReg(cmd2, value, s_CpMem);
} }
break; break;
case GX_LOAD_XF_REG: case GX_LOAD_XF_REG:
m_DrawingObject = false; s_DrawingObject = false;
break; break;
case GX_LOAD_INDX_A: case GX_LOAD_INDX_A:
m_DrawingObject = false; s_DrawingObject = false;
ProcessLoadIndexedXf(ReadFifo32(data), 0xc); ProcessLoadIndexedXf(ReadFifo32(data), 0xc);
break; break;
case GX_LOAD_INDX_B: case GX_LOAD_INDX_B:
m_DrawingObject = false; s_DrawingObject = false;
ProcessLoadIndexedXf(ReadFifo32(data), 0xd); ProcessLoadIndexedXf(ReadFifo32(data), 0xd);
break; break;
case GX_LOAD_INDX_C: case GX_LOAD_INDX_C:
m_DrawingObject = false; s_DrawingObject = false;
ProcessLoadIndexedXf(ReadFifo32(data), 0xe); ProcessLoadIndexedXf(ReadFifo32(data), 0xe);
break; break;
case GX_LOAD_INDX_D: case GX_LOAD_INDX_D:
m_DrawingObject = false; s_DrawingObject = false;
ProcessLoadIndexedXf(ReadFifo32(data), 0xf); ProcessLoadIndexedXf(ReadFifo32(data), 0xf);
break; break;
@ -94,16 +93,16 @@ void FifoRecordAnalyzer::DecodeOpcode(u8* data)
break; break;
case GX_LOAD_BP_REG: case GX_LOAD_BP_REG:
m_DrawingObject = false; s_DrawingObject = false;
ReadFifo32(data); ReadFifo32(data);
break; break;
default: default:
if (cmd & 0x80) if (cmd & 0x80)
{ {
if (!m_DrawingObject) if (!s_DrawingObject)
{ {
m_DrawingObject = true; s_DrawingObject = true;
} }
ProcessVertexArrays(data, cmd & GX_VAT_MASK); ProcessVertexArrays(data, cmd & GX_VAT_MASK);
@ -115,20 +114,20 @@ void FifoRecordAnalyzer::DecodeOpcode(u8* data)
} }
} }
void FifoRecordAnalyzer::ProcessLoadIndexedXf(u32 val, int array) static void ProcessLoadIndexedXf(u32 val, int array)
{ {
int index = val >> 16; int index = val >> 16;
int size = ((val >> 12) & 0xF) + 1; int size = ((val >> 12) & 0xF) + 1;
u32 address = m_CpMem.arrayBases[array] + m_CpMem.arrayStrides[array] * index; u32 address = s_CpMem.arrayBases[array] + s_CpMem.arrayStrides[array] * index;
FifoRecorder::GetInstance().UseMemory(address, size * 4, MemoryUpdate::XF_DATA); FifoRecorder::GetInstance().UseMemory(address, size * 4, MemoryUpdate::XF_DATA);
} }
void FifoRecordAnalyzer::ProcessVertexArrays(u8* data, u8 vtxAttrGroup) static void ProcessVertexArrays(u8* data, u8 vtxAttrGroup)
{ {
int sizes[21]; int sizes[21];
FifoAnalyzer::CalculateVertexElementSizes(sizes, vtxAttrGroup, m_CpMem); FifoAnalyzer::CalculateVertexElementSizes(sizes, vtxAttrGroup, s_CpMem);
// Determine offset of each element from start of vertex data // Determine offset of each element from start of vertex data
int offsets[12]; int offsets[12];
@ -151,10 +150,10 @@ void FifoRecordAnalyzer::ProcessVertexArrays(u8* data, u8 vtxAttrGroup)
} }
} }
void FifoRecordAnalyzer::WriteVertexArray(int arrayIndex, u8* vertexData, int vertexSize, int numVertices) static void WriteVertexArray(int arrayIndex, u8* vertexData, int vertexSize, int numVertices)
{ {
// Skip if not indexed array // Skip if not indexed array
int arrayType = (m_CpMem.vtxDesc.Hex >> (9 + (arrayIndex * 2))) & 3; int arrayType = (s_CpMem.vtxDesc.Hex >> (9 + (arrayIndex * 2))) & 3;
if (arrayType < 2) if (arrayType < 2)
return; return;
@ -192,8 +191,8 @@ void FifoRecordAnalyzer::WriteVertexArray(int arrayIndex, u8* vertexData, int ve
} }
} }
u32 arrayStart = m_CpMem.arrayBases[arrayIndex]; u32 arrayStart = s_CpMem.arrayBases[arrayIndex];
u32 arraySize = m_CpMem.arrayStrides[arrayIndex] * (maxIndex + 1); u32 arraySize = s_CpMem.arrayStrides[arrayIndex] * (maxIndex + 1);
FifoRecorder::GetInstance().UseMemory(arrayStart, arraySize, MemoryUpdate::VERTEX_STREAM); FifoRecorder::GetInstance().UseMemory(arrayStart, arraySize, MemoryUpdate::VERTEX_STREAM);
} }

20
Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h
View File

@ -10,28 +10,12 @@
#include "VideoCommon/BPMemory.h" #include "VideoCommon/BPMemory.h"
class FifoRecordAnalyzer namespace FifoRecordAnalyzer
{ {
public:
FifoRecordAnalyzer();
// Must call this before analyzing GP commands // Must call this before analyzing GP commands
void Initialize(u32* bpMem, u32* cpMem); void Initialize(u32* cpMem);
// Assumes data contains all information for the command // Assumes data contains all information for the command
// Calls FifoRecorder::UseMemory // Calls FifoRecorder::UseMemory
void AnalyzeGPCommand(u8* data); void AnalyzeGPCommand(u8* data);
private:
void DecodeOpcode(u8* data);
void ProcessLoadIndexedXf(u32 val, int array);
void ProcessVertexArrays(u8* data, u8 vtxAttrGroup);
void WriteVertexArray(int arrayIndex, u8* vertexData, int vertexSize, int numVertices);
bool m_DrawingObject;
BPMemory* m_BpMem;
FifoAnalyzer::CPMemory m_CpMem;
}; };

4
Source/Core/Core/FifoPlayer/FifoRecorder.cpp
View File

@ -68,7 +68,7 @@ void FifoRecorder::WriteGPCommand(u8* data, u32 size)
{ {
if (!m_SkipNextData) if (!m_SkipNextData)
{ {
m_RecordAnalyzer.AnalyzeGPCommand(data); FifoRecordAnalyzer::AnalyzeGPCommand(data);
// Copy data to buffer // Copy data to buffer
size_t currentSize = m_FifoData.size(); size_t currentSize = m_FifoData.size();
@ -200,7 +200,7 @@ void FifoRecorder::SetVideoMemory(u32 *bpMem, u32 *cpMem, u32 *xfMem, u32 *xfReg
memcpy(m_File->GetXFRegs(), xfRegs, xfRegsCopySize * 4); memcpy(m_File->GetXFRegs(), xfRegs, xfRegsCopySize * 4);
} }
m_RecordAnalyzer.Initialize(bpMem, cpMem); FifoRecordAnalyzer::Initialize(cpMem);
sMutex.unlock(); sMutex.unlock();
} }

1
Source/Core/Core/FifoPlayer/FifoRecorder.h
View File

@ -65,5 +65,4 @@ private:
std::vector<u8> m_FifoData; std::vector<u8> m_FifoData;
std::vector<u8> m_Ram; std::vector<u8> m_Ram;
std::vector<u8> m_ExRam; std::vector<u8> m_ExRam;
FifoRecordAnalyzer m_RecordAnalyzer;
}; };