From e187c55bdd1d553aada5fd165c965d355e425383 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 24 Jan 2016 01:29:44 -0500 Subject: OpcodeDecoder: Add namespace --- Source/Core/VideoCommon/Fifo.cpp | 8 ++++---- Source/Core/VideoCommon/OpcodeDecoding.cpp | 22 +++++++++++++--------- Source/Core/VideoCommon/OpcodeDecoding.h | 11 ++++++++--- 3 files changed, 25 insertions(+), 16 deletions(-) (limited to 'Source/Core/VideoCommon') diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp index acc43b8855..506024c193 100644 --- a/Source/Core/VideoCommon/Fifo.cpp +++ b/Source/Core/VideoCommon/Fifo.cpp @@ -261,7 +261,7 @@ static void ReadDataFromFifoOnCPU(u32 readPtr) } } Memory::CopyFromEmu(s_video_buffer_write_ptr, readPtr, len); - s_video_buffer_pp_read_ptr = OpcodeDecoder_Run(DataReader(s_video_buffer_pp_read_ptr, write_ptr + len), nullptr, false); + s_video_buffer_pp_read_ptr = OpcodeDecoder::Run(DataReader(s_video_buffer_pp_read_ptr, write_ptr + len), nullptr, false); // This would have to be locked if the GPU thread didn't spin. s_video_buffer_write_ptr = write_ptr + len; } @@ -305,7 +305,7 @@ void RunGpuLoop() // See comment in SyncGPU if (write_ptr > seen_ptr) { - s_video_buffer_read_ptr = OpcodeDecoder_Run(DataReader(s_video_buffer_read_ptr, write_ptr), nullptr, false); + s_video_buffer_read_ptr = OpcodeDecoder::Run(DataReader(s_video_buffer_read_ptr, write_ptr), nullptr, false); s_video_buffer_seen_ptr = write_ptr; } } @@ -336,7 +336,7 @@ void RunGpuLoop() "Negative fifo.CPReadWriteDistance = %i in FIFO Loop !\nThat can produce instability in the game. Please report it.", fifo.CPReadWriteDistance - 32); u8* write_ptr = s_video_buffer_write_ptr; - s_video_buffer_read_ptr = OpcodeDecoder_Run(DataReader(s_video_buffer_read_ptr, write_ptr), &cyclesExecuted, false); + s_video_buffer_read_ptr = OpcodeDecoder::Run(DataReader(s_video_buffer_read_ptr, write_ptr), &cyclesExecuted, false); Common::AtomicStore(fifo.CPReadPointer, readPtr); Common::AtomicAdd(fifo.CPReadWriteDistance, -32); @@ -423,7 +423,7 @@ void RunGpu() reset_simd_state = true; } ReadDataFromFifo(fifo.CPReadPointer); - s_video_buffer_read_ptr = OpcodeDecoder_Run(DataReader(s_video_buffer_read_ptr, s_video_buffer_write_ptr), nullptr, false); + s_video_buffer_read_ptr = OpcodeDecoder::Run(DataReader(s_video_buffer_read_ptr, s_video_buffer_write_ptr), nullptr, false); } //DEBUG_LOG(COMMANDPROCESSOR, "Fifo wraps to base"); diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp index 99a801a8f3..3af3337b9e 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.cpp +++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp @@ -28,8 +28,11 @@ #include "VideoCommon/VideoCommon.h" #include "VideoCommon/XFMemory.h" - bool g_bRecordFifoData = false; + +namespace OpcodeDecoder +{ + static bool s_bFifoErrorSeen = false; static u32 InterpretDisplayList(u32 address, u32 size) @@ -49,7 +52,7 @@ static u32 InterpretDisplayList(u32 address, u32 size) // temporarily swap dl and non-dl (small "hack" for the stats) Statistics::SwapDL(); - OpcodeDecoder_Run(DataReader(startAddress, startAddress + size), &cycles, true); + Run(DataReader(startAddress, startAddress + size), &cycles, true); INCSTAT(stats.thisFrame.numDListsCalled); // un-swap @@ -67,7 +70,7 @@ static void InterpretDisplayListPreprocess(u32 address, u32 size) if (startAddress != nullptr) { - OpcodeDecoder_Run(DataReader(startAddress, startAddress + size), nullptr, true); + Run(DataReader(startAddress, startAddress + size), nullptr, true); } } @@ -120,18 +123,17 @@ static void UnknownOpcode(u8 cmd_byte, void *buffer, bool preprocess) } } -void OpcodeDecoder_Init() +void Init() { s_bFifoErrorSeen = false; } - -void OpcodeDecoder_Shutdown() +void Shutdown() { } template -u8* OpcodeDecoder_Run(DataReader src, u32* cycles, bool in_display_list) +u8* Run(DataReader src, u32* cycles, bool in_display_list) { u32 totalCycles = 0; u8* opcodeStart; @@ -314,5 +316,7 @@ end: return opcodeStart; } -template u8* OpcodeDecoder_Run(DataReader src, u32* cycles, bool in_display_list); -template u8* OpcodeDecoder_Run(DataReader src, u32* cycles, bool in_display_list); +template u8* Run(DataReader src, u32* cycles, bool in_display_list); +template u8* Run(DataReader src, u32* cycles, bool in_display_list); + +} // namespace OpcodeDecoder diff --git a/Source/Core/VideoCommon/OpcodeDecoding.h b/Source/Core/VideoCommon/OpcodeDecoding.h index a79bf54be2..f955ecb90a 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.h +++ b/Source/Core/VideoCommon/OpcodeDecoding.h @@ -38,8 +38,13 @@ #define GX_DRAW_LINE_STRIP 0x6 // 0xB0 #define GX_DRAW_POINTS 0x7 // 0xB8 -void OpcodeDecoder_Init(); -void OpcodeDecoder_Shutdown(); +namespace OpcodeDecoder +{ + +void Init(); +void Shutdown(); template -u8* OpcodeDecoder_Run(DataReader src, u32* cycles, bool in_display_list); +u8* Run(DataReader src, u32* cycles, bool in_display_list); + +} // namespace OpcodeDecoder -- cgit v1.2.3