From 9600a67ea996028eb5e29cdf471fdb23aadd7c09 Mon Sep 17 00:00:00 2001 From: sudonim1 Date: Mon, 12 Jul 2010 04:21:21 +0000 Subject: [PATCH] Fix new aligned memcpy (probably, it still hasn't been tested at all) and removed calls to it that were added to test code generation. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3469 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/src/Utilities/x86/MemcpyVibes.cpp | 2 +- pcsx2/x86/microVU_Lower.inl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/Utilities/x86/MemcpyVibes.cpp b/common/src/Utilities/x86/MemcpyVibes.cpp index 5cfbdf6ac2..11ac0c10fd 100644 --- a/common/src/Utilities/x86/MemcpyVibes.cpp +++ b/common/src/Utilities/x86/MemcpyVibes.cpp @@ -34,7 +34,7 @@ __forceinline void memcpy_vibes(void * dest, const void * src, int size) { float (*destxmm)[4] = (float(*)[4])dest, (*srcxmm)[4] = (float(*)[4])src; size_t count = size & ~15, extra = size & 15; - destxmm += 8 - extra, srcxmm += 8 - extra; + destxmm -= 8 - extra, srcxmm -= 8 - extra; switch (extra) { do { destxmm += 16, srcxmm += 16, count -= 16; diff --git a/pcsx2/x86/microVU_Lower.inl b/pcsx2/x86/microVU_Lower.inl index 707b9e0f9a..7b1cb1edbb 100644 --- a/pcsx2/x86/microVU_Lower.inl +++ b/pcsx2/x86/microVU_Lower.inl @@ -1111,13 +1111,13 @@ void __fastcall mVU_XGKICK_(u32 addr) { if (size > diff) { //DevCon.WriteLn("XGkick Wrap!"); - memcpy_qwc_(pDest, microVU1.regs->Mem + (addr*16), diff); + memcpy_qwc(pDest, microVU1.regs->Mem + (addr*16), diff); size -= diff; pDest += diff*16; - memcpy_qwc_(pDest, microVU1.regs->Mem, size); + memcpy_qwc(pDest, microVU1.regs->Mem, size); } else { - memcpy_qwc_(pDest, microVU1.regs->Mem + (addr*16), size); + memcpy_qwc(pDest, microVU1.regs->Mem + (addr*16), size); } GetMTGS().SendDataPacket(); if(GSTransferStatus.PTH1 == STOPPED_MODE)