From e82c128043fe487b68a868253490f47eeef45735 Mon Sep 17 00:00:00 2001 From: skidau Date: Wed, 11 Aug 2010 11:15:59 +0000 Subject: [PATCH] Applied the multiboot dol fix to JITIL too. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6089 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 2 +- Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index 2175a05492..7b20ee9c4c 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -487,7 +487,7 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc js.op = &ops[i]; js.instructionNumber = i; const GekkoOPInfo *opinfo = GetOpInfo(ops[i].inst); - js.downcountAmount += (opinfo->numCyclesMinusOne + 1); + js.downcountAmount++; if (i == (int)size - 1) { diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index b1651f1a7e..1ed997ce4c 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -139,10 +139,12 @@ bool JitBlock::ContainsAddress(u32 em_address) } void JitBlockCache::ClearSafe() - { + { +#ifdef JIT_UNLIMITED_ICACHE memset(iCache, JIT_ICACHE_INVALID_BYTE, JIT_ICACHE_SIZE); memset(iCacheEx, JIT_ICACHE_INVALID_BYTE, JIT_ICACHEEX_SIZE); memset(iCacheVMEM, JIT_ICACHE_INVALID_BYTE, JIT_ICACHE_SIZE); +#endif } /*void JitBlockCache::DestroyBlocksWithFlag(BlockFlag death_flag)