From 8d6aa793891018f3be0e64fe8b93d125df71729a Mon Sep 17 00:00:00 2001 From: donkopunchstania Date: Wed, 11 Nov 2009 04:32:57 +0000 Subject: [PATCH] Revert WGP change. The previous change was correct, but the video plugins need to be updated. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4528 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/HW/GPFifo.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/HW/GPFifo.cpp b/Source/Core/Core/Src/HW/GPFifo.cpp index 4d9a160a1c..01d38ed0f5 100644 --- a/Source/Core/Core/Src/HW/GPFifo.cpp +++ b/Source/Core/Core/Src/HW/GPFifo.cpp @@ -80,10 +80,14 @@ void STACKALIGN CheckGatherPipe() memcpy(m_gatherPipe, m_gatherPipe + GATHER_PIPE_SIZE, m_gatherPipeCount); // increase the CPUWritePointer - if (ProcessorInterface::Fifo_CPUWritePointer == ProcessorInterface::Fifo_CPUEnd) - ProcessorInterface::Fifo_CPUWritePointer = ProcessorInterface::Fifo_CPUBase; - else - ProcessorInterface::Fifo_CPUWritePointer += GATHER_PIPE_SIZE; + ProcessorInterface::Fifo_CPUWritePointer += GATHER_PIPE_SIZE; + + if (ProcessorInterface::Fifo_CPUWritePointer > ProcessorInterface::Fifo_CPUEnd) + _assert_msg_(DYNA_REC, 0, "Fifo_CPUWritePointer out of bounds: %08x (end = %08x)", + ProcessorInterface::Fifo_CPUWritePointer, ProcessorInterface::Fifo_CPUEnd); + + if (ProcessorInterface::Fifo_CPUWritePointer >= ProcessorInterface::Fifo_CPUEnd) + ProcessorInterface::Fifo_CPUWritePointer = ProcessorInterface::Fifo_CPUBase; // TODO store video plugin pointer CPluginManager::GetInstance().GetVideo()->Video_GatherPipeBursted();