From 12dbebcfd96bfc6b320e68f67360b8856cb71715 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Thu, 2 Sep 2010 12:33:45 +0000 Subject: [PATCH] microVU: clear contents of microBlock on creation to avoid false cache misses. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3720 96395faa-99c1-11dd-bbfe-3dabce05a288 --- common/src/Utilities/AlignedMalloc.cpp | 2 +- pcsx2/ps2/HwInternal.h | 2 +- pcsx2/x86/microVU.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/Utilities/AlignedMalloc.cpp b/common/src/Utilities/AlignedMalloc.cpp index 4f8264018a..c895c94972 100644 --- a/common/src/Utilities/AlignedMalloc.cpp +++ b/common/src/Utilities/AlignedMalloc.cpp @@ -37,7 +37,7 @@ void* __fastcall pcsx2_aligned_malloc(size_t size, size_t align) uptr aligned = (pasthead + align-1) & ~(align-1); AlignedMallocHeader* header = (AlignedMallocHeader*)(aligned-headsize); - jASSUME( (uptr)header >= (uptr)p ); + pxAssume( (uptr)header >= (uptr)p ); header->baseptr = p; header->size = size; diff --git a/pcsx2/ps2/HwInternal.h b/pcsx2/ps2/HwInternal.h index 97ad2eb1da..22ad65e576 100644 --- a/pcsx2/ps2/HwInternal.h +++ b/pcsx2/ps2/HwInternal.h @@ -47,7 +47,7 @@ template< uint page > extern void __fastcall hwRead128(u32 mem, mem128_t* out // Internal hwRead32 which does not log reads, used by hwWrite8/16 to perform // read-modify-write operations. template< uint page, bool intcstathack > -mem32_t __fastcall _hwRead32(u32 mem); +extern mem32_t __fastcall _hwRead32(u32 mem); extern mem16_t __fastcall hwRead16_page_0F_INTC_HACK(u32 mem); extern mem32_t __fastcall hwRead32_page_0F_INTC_HACK(u32 mem); diff --git a/pcsx2/x86/microVU.h b/pcsx2/x86/microVU.h index 9a8b4b1092..7e1e666852 100644 --- a/pcsx2/x86/microVU.h +++ b/pcsx2/x86/microVU.h @@ -65,7 +65,7 @@ public: if (!thisBlock) { listI++; microBlockLink* newBlock = (microBlockLink*)_aligned_malloc(sizeof(microBlockLink), 16); - newBlock->next = NULL; + memzero(*newBlock); if (blockEnd) { blockEnd->next = newBlock;