summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/XFStructs.cpp
diff options
context:
space:
mode:
authorshuffle2 <godisgovernment@gmail.com>2014-05-22 13:02:11 -0700
committershuffle2 <godisgovernment@gmail.com>2014-05-22 13:02:11 -0700
commitb58753bd692d0634e950af9b273bbfb24564d0dd (patch)
tree1ead19ca115805bbeaf99ccbd9fc6f14ecfd08ad /Source/Core/VideoCommon/XFStructs.cpp
parentfc41a53b46ce5d7d844a4bd7922f231ebb0f9c5e (diff)
parenta4bb0dafb4bebeed78452498a36b8ae19fe2e495 (diff)
Merge pull request #370 from Sonicadvance1/remove_specialized_memcmp
Removes ZeroFrog's "optimized" memcpy and memcmp functions.
Diffstat (limited to 'Source/Core/VideoCommon/XFStructs.cpp')
-rw-r--r--Source/Core/VideoCommon/XFStructs.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/XFStructs.cpp b/Source/Core/VideoCommon/XFStructs.cpp
index 23bb81f3f7..62a17ad829 100644
--- a/Source/Core/VideoCommon/XFStructs.cpp
+++ b/Source/Core/VideoCommon/XFStructs.cpp
@@ -228,7 +228,7 @@ void LoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
}
XFMemWritten(xfMemTransferSize, xfMemBase);
- memcpy_gc((u32*)(&xfmem) + xfMemBase, pData, xfMemTransferSize * 4);
+ memcpy((u32*)(&xfmem) + xfMemBase, pData, xfMemTransferSize * 4);
pData += xfMemTransferSize;
}
@@ -237,7 +237,7 @@ void LoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
if (transferSize > 0)
{
XFRegWritten(transferSize, baseAddress, pData);
- memcpy_gc((u32*)(&xfmem) + baseAddress, pData, transferSize * 4);
+ memcpy((u32*)(&xfmem) + baseAddress, pData, transferSize * 4);
}
}