From 21970c4a2a728669687a687f61a8f7453319dd54 Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 27 Nov 2014 23:53:11 +0100 Subject: VideoCommon: cleanup OpcodeDecoder --- Source/Core/VideoCommon/XFStructs.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/Core/VideoCommon/XFStructs.cpp') diff --git a/Source/Core/VideoCommon/XFStructs.cpp b/Source/Core/VideoCommon/XFStructs.cpp index 0552aa0986..927fed8077 100644 --- a/Source/Core/VideoCommon/XFStructs.cpp +++ b/Source/Core/VideoCommon/XFStructs.cpp @@ -19,14 +19,14 @@ static void XFMemWritten(u32 transferSize, u32 baseAddress) VertexShaderManager::InvalidateXFRange(baseAddress, baseAddress + transferSize); } -static void XFRegWritten(int transferSize, u32 baseAddress) +static void XFRegWritten(int transferSize, u32 baseAddress, DataReader src) { u32 address = baseAddress; u32 dataIndex = 0; while (transferSize > 0 && address < 0x1058) { - u32 newValue = DataPeek(dataIndex * sizeof(u32)); + u32 newValue = src.Peek(dataIndex * sizeof(u32)); u32 nextAddress = address + 1; switch (address) @@ -193,7 +193,7 @@ static void XFRegWritten(int transferSize, u32 baseAddress) } } -void LoadXFReg(u32 transferSize, u32 baseAddress) +void LoadXFReg(u32 transferSize, u32 baseAddress, DataReader src) { // do not allow writes past registers if (baseAddress + transferSize > 0x1058) @@ -229,17 +229,17 @@ void LoadXFReg(u32 transferSize, u32 baseAddress) XFMemWritten(xfMemTransferSize, xfMemBase); for (u32 i = 0; i < xfMemTransferSize; i++) { - ((u32*)&xfmem)[xfMemBase + i] = DataRead(); + ((u32*)&xfmem)[xfMemBase + i] = src.Read(); } } // write to XF regs if (transferSize > 0) { - XFRegWritten(transferSize, baseAddress); + XFRegWritten(transferSize, baseAddress, src); for (u32 i = 0; i < transferSize; i++) { - ((u32*)&xfmem)[baseAddress + i] = DataRead(); + ((u32*)&xfmem)[baseAddress + i] = src.Read(); } } } -- cgit v1.2.3