From aa1fec6fc303eee7a510930c4d809bbe419a604d Mon Sep 17 00:00:00 2001 From: Scott Mansell Date: Sat, 12 Sep 2015 22:32:52 +1200 Subject: [PATCH] FifoPlayer: Fixup style of types. --- Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp | 18 +++++++++--------- Source/Core/Core/FifoPlayer/FifoAnalyzer.h | 18 +++++++++--------- Source/Core/Core/FifoPlayer/FifoDataFile.cpp | 10 +++++----- Source/Core/Core/FifoPlayer/FifoDataFile.h | 10 +++++----- .../Core/FifoPlayer/FifoPlaybackAnalyzer.cpp | 14 +++++++------- .../Core/FifoPlayer/FifoPlaybackAnalyzer.h | 6 +++--- Source/Core/Core/FifoPlayer/FifoPlayer.cpp | 12 ++++++------ Source/Core/Core/FifoPlayer/FifoPlayer.h | 8 ++++---- .../Core/FifoPlayer/FifoRecordAnalyzer.cpp | 10 +++++----- .../Core/Core/FifoPlayer/FifoRecordAnalyzer.h | 12 ++++++------ Source/Core/Core/FifoPlayer/FifoRecorder.cpp | 8 ++++---- Source/Core/Core/FifoPlayer/FifoRecorder.h | 10 +++++----- 12 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp index 5c8d956ab0..05eb13cce5 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.cpp @@ -19,34 +19,34 @@ void Init() VertexLoader_Normal::Init(); } -u8 ReadFifo8(u8 *&data) +u8 ReadFifo8(u8*& data) { u8 value = data[0]; data += 1; return value; } -u16 ReadFifo16(u8 *&data) +u16 ReadFifo16(u8*& data) { u16 value = Common::swap16(data); data += 2; return value; } -u32 ReadFifo32(u8 *&data) +u32 ReadFifo32(u8*& data) { u32 value = Common::swap32(data); data += 4; return value; } -void InitBPMemory(BPMemory *bpMem) +void InitBPMemory(BPMemory* bpMem) { memset(bpMem, 0, sizeof(BPMemory)); bpMem->bpMask = 0x00FFFFFF; } -BPCmd DecodeBPCmd(u32 value, const BPMemory &bpMem) +BPCmd DecodeBPCmd(u32 value, const BPMemory& bpMem) { //handle the mask register int opcode = value >> 24; @@ -59,7 +59,7 @@ BPCmd DecodeBPCmd(u32 value, const BPMemory &bpMem) return bp; } -void LoadBPReg(const BPCmd &bp, BPMemory &bpMem) +void LoadBPReg(const BPCmd& bp, BPMemory& bpMem) { ((u32*)&bpMem)[bp.address] = bp.newvalue; @@ -68,7 +68,7 @@ void LoadBPReg(const BPCmd &bp, BPMemory &bpMem) bpMem.bpMask = 0xFFFFFF; } -void LoadCPReg(u32 subCmd, u32 value, CPMemory &cpMem) +void LoadCPReg(u32 subCmd, u32 value, CPMemory& cpMem) { switch (subCmd & 0xF0) { @@ -107,7 +107,7 @@ void LoadCPReg(u32 subCmd, u32 value, CPMemory &cpMem) } } -u32 CalculateVertexSize(int vatIndex, const CPMemory &cpMem) +u32 CalculateVertexSize(int vatIndex, const CPMemory& cpMem) { u32 vertexSize = 0; @@ -120,7 +120,7 @@ u32 CalculateVertexSize(int vatIndex, const CPMemory &cpMem) return vertexSize; } -void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMem) +void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory& cpMem) { const TVtxDesc &vtxDesc = cpMem.vtxDesc; const VAT &vtxAttr = cpMem.vtxAttr[vatIndex]; diff --git a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h index 98234d00d3..fed230ba5c 100644 --- a/Source/Core/Core/FifoPlayer/FifoAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoAnalyzer.h @@ -13,15 +13,15 @@ namespace FifoAnalyzer { void Init(); - u8 ReadFifo8(u8 *&data); - u16 ReadFifo16(u8 *&data); - u32 ReadFifo32(u8 *&data); + u8 ReadFifo8(u8*& data); + u16 ReadFifo16(u8*& data); + u32 ReadFifo32(u8*& data); // TODO- move to video common - void InitBPMemory(BPMemory *bpMem); + void InitBPMemory(BPMemory* bpMem); BPCmd DecodeBPCmd(u32 value, const BPMemory &bpMem); - void LoadBPReg(const BPCmd &bp, BPMemory &bpMem); - void GetTlutLoadData(u32 &tlutAddr, u32 &memAddr, u32 &tlutXferCount, BPMemory &bpMem); + void LoadBPReg(const BPCmd& bp, BPMemory &bpMem); + void GetTlutLoadData(u32& tlutAddr, u32 &memAddr, u32 &tlutXferCount, BPMemory &bpMem); struct CPMemory { @@ -31,8 +31,8 @@ namespace FifoAnalyzer u32 arrayStrides[16]; }; - void LoadCPReg(u32 subCmd, u32 value, CPMemory &cpMem); + void LoadCPReg(u32 subCmd, u32 value, CPMemory& cpMem); - u32 CalculateVertexSize(int vatIndex, const CPMemory &cpMem); - void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory &cpMem); + u32 CalculateVertexSize(int vatIndex, const CPMemory& cpMem); + void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory& cpMem); } diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp index 8bc8b79f9c..1c9b029daf 100644 --- a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp +++ b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp @@ -43,7 +43,7 @@ bool FifoDataFile::GetIsWii() const return GetFlag(FLAG_IS_WII); } -void FifoDataFile::AddFrame(const FifoFrameInfo &frameInfo) +void FifoDataFile::AddFrame(const FifoFrameInfo& frameInfo) { m_Frames.push_back(frameInfo); } @@ -131,7 +131,7 @@ bool FifoDataFile::Save(const std::string& filename) return true; } -FifoDataFile *FifoDataFile::Load(const std::string &filename, bool flagsOnly) +FifoDataFile* FifoDataFile::Load(const std::string &filename, bool flagsOnly) { File::IOFile file; file.Open(filename, "rb"); @@ -219,7 +219,7 @@ bool FifoDataFile::GetFlag(u32 flag) const return !!(m_Flags & flag); } -u64 FifoDataFile::WriteMemoryUpdates(const std::vector &memUpdates, File::IOFile &file) +u64 FifoDataFile::WriteMemoryUpdates(const std::vector& memUpdates, File::IOFile& file) { // Add space for memory update list u64 updateListOffset = file.Tell(); @@ -249,7 +249,7 @@ u64 FifoDataFile::WriteMemoryUpdates(const std::vector &memUpdates return updateListOffset; } -void FifoDataFile::ReadMemoryUpdates(u64 fileOffset, u32 numUpdates, std::vector &memUpdates, File::IOFile &file) +void FifoDataFile::ReadMemoryUpdates(u64 fileOffset, u32 numUpdates, std::vector& memUpdates, File::IOFile& file) { memUpdates.resize(numUpdates); @@ -260,7 +260,7 @@ void FifoDataFile::ReadMemoryUpdates(u64 fileOffset, u32 numUpdates, std::vector FileMemoryUpdate srcUpdate; file.ReadBytes(&srcUpdate, sizeof(FileMemoryUpdate)); - MemoryUpdate &dstUpdate = memUpdates[i]; + MemoryUpdate& dstUpdate = memUpdates[i]; dstUpdate.address = srcUpdate.address; dstUpdate.fifoPosition = srcUpdate.fifoPosition; dstUpdate.size = srcUpdate.dataSize; diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.h b/Source/Core/Core/FifoPlayer/FifoDataFile.h index 1bfde6a0a0..d45e58f024 100644 --- a/Source/Core/Core/FifoPlayer/FifoDataFile.h +++ b/Source/Core/Core/FifoPlayer/FifoDataFile.h @@ -27,13 +27,13 @@ struct MemoryUpdate u32 fifoPosition; u32 address; u32 size; - u8 *data; + u8* data; Type type; }; struct FifoFrameInfo { - u8 *fifoData; + u8* fifoData; u32 fifoDataSize; u32 fifoStart; @@ -72,7 +72,7 @@ public: bool Save(const std::string& filename); - static FifoDataFile *Load(const std::string &filename, bool flagsOnly); + static FifoDataFile* Load(const std::string &filename, bool flagsOnly); private: enum @@ -85,8 +85,8 @@ private: void SetFlag(u32 flag, bool set); bool GetFlag(u32 flag) const; - u64 WriteMemoryUpdates(const std::vector &memUpdates, File::IOFile &file); - static void ReadMemoryUpdates(u64 fileOffset, u32 numUpdates, std::vector &memUpdates, File::IOFile &file); + u64 WriteMemoryUpdates(const std::vector& memUpdates, File::IOFile &file); + static void ReadMemoryUpdates(u64 fileOffset, u32 numUpdates, std::vector& memUpdates, File::IOFile& file); u32 m_BPMem[BP_MEM_SIZE]; u32 m_CPMem[CP_MEM_SIZE]; diff --git a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp index 910e9bdae0..4ca0335fe0 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlaybackAnalyzer.cpp @@ -20,7 +20,7 @@ struct CmdData { u32 size; u32 offset; - u8 *ptr; + u8* ptr; }; FifoPlaybackAnalyzer::FifoPlaybackAnalyzer() @@ -28,13 +28,13 @@ FifoPlaybackAnalyzer::FifoPlaybackAnalyzer() FifoAnalyzer::Init(); } -void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vector &frameInfo) +void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile* file, std::vector& frameInfo) { // Load BP memory - u32 *bpMem = file->GetBPMem(); + u32* bpMem = file->GetBPMem(); memcpy(&m_BpMem, bpMem, sizeof(BPMemory)); - u32 *cpMem = file->GetCPMem(); + u32* cpMem = file->GetCPMem(); FifoAnalyzer::LoadCPReg(0x50, cpMem[0x50], m_CpMem); FifoAnalyzer::LoadCPReg(0x60, cpMem[0x60], m_CpMem); @@ -110,7 +110,7 @@ void FifoPlaybackAnalyzer::AnalyzeFrames(FifoDataFile *file, std::vector &frameInfo); + void AnalyzeFrames(FifoDataFile* file, std::vector& frameInfo); private: struct MemoryRange @@ -31,9 +31,9 @@ private: u32 end; }; - void AddMemoryUpdate(MemoryUpdate memUpdate, AnalyzedFrameInfo &frameInfo); + void AddMemoryUpdate(MemoryUpdate memUpdate, AnalyzedFrameInfo& frameInfo); - u32 DecodeCommand(u8 *data); + u32 DecodeCommand(u8* data); void StoreEfbCopyRegion(); void StoreWrittenRegion(u32 address, u32 size); diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp index 3357fb3f25..f4bef742a7 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp @@ -153,7 +153,7 @@ void FifoPlayer::SetFrameRangeEnd(u32 end) } } -FifoPlayer &FifoPlayer::GetInstance() +FifoPlayer& FifoPlayer::GetInstance() { static FifoPlayer instance; return instance; @@ -173,7 +173,7 @@ FifoPlayer::FifoPlayer() : m_Loop = SConfig::GetInstance().bLoopFifoReplay; } -void FifoPlayer::WriteFrame(const FifoFrameInfo &frame, const AnalyzedFrameInfo &info) +void FifoPlayer::WriteFrame(const FifoFrameInfo& frame, const AnalyzedFrameInfo& info) { // Core timing information m_CyclesPerFrame = SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate; @@ -232,9 +232,9 @@ void FifoPlayer::WriteFrame(const FifoFrameInfo &frame, const AnalyzedFrameInfo FlushWGP(); } -void FifoPlayer::WriteFramePart(u32 dataStart, u32 dataEnd, u32 &nextMemUpdate, const FifoFrameInfo &frame, const AnalyzedFrameInfo &info) +void FifoPlayer::WriteFramePart(u32 dataStart, u32 dataEnd, u32& nextMemUpdate, const FifoFrameInfo& frame, const AnalyzedFrameInfo& info) { - u8 *data = frame.fifoData; + u8* data = frame.fifoData; while (nextMemUpdate < frame.memoryUpdates.size() && dataStart < dataEnd) { @@ -289,7 +289,7 @@ void FifoPlayer::WriteMemory(const MemoryUpdate& memUpdate) memcpy(mem, memUpdate.data, memUpdate.size); } -void FifoPlayer::WriteFifo(u8 *data, u32 start, u32 end) +void FifoPlayer::WriteFifo(u8* data, u32 start, u32 end) { u32 written = start; u32 lastBurstEnd = end - 1; @@ -452,7 +452,7 @@ void FifoPlayer::LoadXFReg(u16 reg, u32 value) GPFifo::Write32(value); } -void FifoPlayer::LoadXFMem16(u16 address, u32 *data) +void FifoPlayer::LoadXFMem16(u16 address, u32* data) { // Loads 16 * 4 bytes in xf memory starting at address GPFifo::Write8(0x10); // load XF reg diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.h b/Source/Core/Core/FifoPlayer/FifoPlayer.h index 24a3cb8c88..ff484dc6bb 100644 --- a/Source/Core/Core/FifoPlayer/FifoPlayer.h +++ b/Source/Core/Core/FifoPlayer/FifoPlayer.h @@ -87,15 +87,15 @@ public: private: FifoPlayer(); - void WriteFrame(const FifoFrameInfo &frame, const AnalyzedFrameInfo &info); - void WriteFramePart(u32 dataStart, u32 dataEnd, u32 &nextMemUpdate, const FifoFrameInfo &frame, const AnalyzedFrameInfo &info); + void WriteFrame(const FifoFrameInfo& frame, const AnalyzedFrameInfo &info); + void WriteFramePart(u32 dataStart, u32 dataEnd, u32 &nextMemUpdate, const FifoFrameInfo& frame, const AnalyzedFrameInfo& info); void WriteAllMemoryUpdates(); void WriteMemory(const MemoryUpdate &memUpdate); // writes a range of data to the fifo // start and end must be relative to frame's fifo data so elapsed cycles are figured correctly - void WriteFifo(u8 *data, u32 start, u32 end); + void WriteFifo(u8* data, u32 start, u32 end); void SetupFifo(); @@ -131,7 +131,7 @@ private: CallbackFunc m_FileLoadedCb; CallbackFunc m_FrameWrittenCb; - FifoDataFile *m_File; + FifoDataFile* m_File; std::vector m_FrameInfo; }; diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp index 67f878b209..754e2d87d2 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.cpp @@ -22,7 +22,7 @@ FifoRecordAnalyzer::FifoRecordAnalyzer() : { } -void FifoRecordAnalyzer::Initialize(u32 *bpMem, u32 *cpMem) +void FifoRecordAnalyzer::Initialize(u32* bpMem, u32* cpMem) { m_DrawingObject = false; @@ -37,12 +37,12 @@ void FifoRecordAnalyzer::Initialize(u32 *bpMem, u32 *cpMem) memcpy(m_CpMem.arrayStrides, cpMem + 0xB0, 16 * 4); } -void FifoRecordAnalyzer::AnalyzeGPCommand(u8 *data) +void FifoRecordAnalyzer::AnalyzeGPCommand(u8* data) { DecodeOpcode(data); } -void FifoRecordAnalyzer::DecodeOpcode(u8 *data) +void FifoRecordAnalyzer::DecodeOpcode(u8* data) { int cmd = ReadFifo8(data); @@ -129,7 +129,7 @@ void FifoRecordAnalyzer::ProcessLoadIndexedXf(u32 val, int array) FifoRecorder::GetInstance().UseMemory(address, size * 4, MemoryUpdate::XF_DATA); } -void FifoRecordAnalyzer::ProcessVertexArrays(u8 *data, u8 vtxAttrGroup) +void FifoRecordAnalyzer::ProcessVertexArrays(u8* data, u8 vtxAttrGroup) { int sizes[21]; FifoAnalyzer::CalculateVertexElementSizes(sizes, vtxAttrGroup, m_CpMem); @@ -155,7 +155,7 @@ void FifoRecordAnalyzer::ProcessVertexArrays(u8 *data, u8 vtxAttrGroup) } } -void FifoRecordAnalyzer::WriteVertexArray(int arrayIndex, u8 *vertexData, int vertexSize, int numVertices) +void FifoRecordAnalyzer::WriteVertexArray(int arrayIndex, u8* vertexData, int vertexSize, int numVertices) { // Skip if not indexed array int arrayType = (m_CpMem.vtxDesc.Hex >> (9 + (arrayIndex * 2))) & 3; diff --git a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h index 5ff8c8988e..28d815b31d 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h +++ b/Source/Core/Core/FifoPlayer/FifoRecordAnalyzer.h @@ -16,22 +16,22 @@ public: FifoRecordAnalyzer(); // Must call this before analyzing GP commands - void Initialize(u32 *bpMem, u32 *cpMem); + void Initialize(u32* bpMem, u32* cpMem); // Assumes data contains all information for the command // Calls FifoRecorder::UseMemory - void AnalyzeGPCommand(u8 *data); + void AnalyzeGPCommand(u8* data); private: - void DecodeOpcode(u8 *data); + void DecodeOpcode(u8* data); void ProcessLoadIndexedXf(u32 val, int array); - void ProcessVertexArrays(u8 *data, u8 vtxAttrGroup); + void ProcessVertexArrays(u8* data, u8 vtxAttrGroup); - void WriteVertexArray(int arrayIndex, u8 *vertexData, int vertexSize, int numVertices); + void WriteVertexArray(int arrayIndex, u8* vertexData, int vertexSize, int numVertices); bool m_DrawingObject; - BPMemory *m_BpMem; + BPMemory* m_BpMem; FifoAnalyzer::CPMemory m_CpMem; }; diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp index 7c2db3c10b..8906b04a82 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp @@ -64,7 +64,7 @@ void FifoRecorder::StopRecording() m_RequestedRecordingEnd = true; } -void FifoRecorder::WriteGPCommand(u8 *data, u32 size) +void FifoRecorder::WriteGPCommand(u8* data, u32 size) { if (!m_SkipNextData) { @@ -104,8 +104,8 @@ void FifoRecorder::WriteGPCommand(u8 *data, u32 size) void FifoRecorder::UseMemory(u32 address, u32 size, MemoryUpdate::Type type, bool dynamicUpdate) { - u8 *curData; - u8 *newData; + u8* curData; + u8* newData; if (address & 0x10000000) { curData = &m_ExRam[address & Memory::EXRAM_MASK]; @@ -205,7 +205,7 @@ void FifoRecorder::SetVideoMemory(u32 *bpMem, u32 *cpMem, u32 *xfMem, u32 *xfReg sMutex.unlock(); } -FifoRecorder &FifoRecorder::GetInstance() +FifoRecorder& FifoRecorder::GetInstance() { return instance; } diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.h b/Source/Core/Core/FifoPlayer/FifoRecorder.h index 0e2d130ba7..767a4f9610 100644 --- a/Source/Core/Core/FifoPlayer/FifoRecorder.h +++ b/Source/Core/Core/FifoPlayer/FifoRecorder.h @@ -20,12 +20,12 @@ public: void StartRecording(s32 numFrames, CallbackFunc finishedCb); void StopRecording(); - FifoDataFile *GetRecordedFile() { return m_File; } + FifoDataFile* GetRecordedFile() { return m_File; } // Called from video thread // Must write one full GP command at a time - void WriteGPCommand(u8 *data, u32 size); + void WriteGPCommand(u8* data, u32 size); // Track memory that has been used and write it to the fifolog if it has changed. // If memory is updated by the video backend (dynamicUpdate == true) take special care to make sure the data @@ -36,12 +36,12 @@ public: // This function must be called before writing GP commands // bpMem must point to the actual bp mem array used by the plugin because it will be read as fifo data is recorded - void SetVideoMemory(u32 *bpMem, u32 *cpMem, u32 *xfMem, u32 *xfRegs, u32 xfRegsSize); + void SetVideoMemory(u32* bpMem, u32* cpMem, u32* xfMem, u32* xfRegs, u32 xfRegsSize); // Checked once per frame prior to callng EndFrame() bool IsRecording() const { return m_IsRecording; } - static FifoRecorder &GetInstance(); + static FifoRecorder& GetInstance(); private: // Accessed from both GUI and video threads @@ -54,7 +54,7 @@ private: volatile s32 m_RecordFramesRemaining; volatile CallbackFunc m_FinishedCb; - FifoDataFile *volatile m_File; + FifoDataFile* volatile m_File; // Accessed only from video thread