From 8224c3b44900b652d9a2430a634d0058843ffc72 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Sun, 22 Feb 2009 16:59:22 +0000 Subject: [PATCH] Fix bug, reenable the drive optimization. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2370 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DiscIO/Src/Blob.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/DiscIO/Src/Blob.cpp b/Source/Core/DiscIO/Src/Blob.cpp index 11318f2c43..9ca96a87ad 100644 --- a/Source/Core/DiscIO/Src/Blob.cpp +++ b/Source/Core/DiscIO/Src/Blob.cpp @@ -70,13 +70,14 @@ bool SectorReader::Read(u64 offset, u64 size, u8* out_ptr) while (remain > 0) { // Check if we are ready to do a large block read. > instead of >= so we don't bother if remain is only one block. - if (positionInBlock == 0 && remain > m_blocksize && false) + if (positionInBlock == 0 && remain > m_blocksize) { u64 num_blocks = remain / m_blocksize; ReadMultipleAlignedBlocks(block, num_blocks, out_ptr); block += num_blocks; out_ptr += num_blocks * m_blocksize; remain -= num_blocks * m_blocksize; + continue; } u32 toCopy = m_blocksize - positionInBlock; @@ -113,7 +114,7 @@ bool SectorReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 * const u8 *data = GetBlockData(block_num + i); if (!data) return false; - memcpy(out_ptr, data, m_blocksize); + memcpy(out_ptr + i * m_blocksize, data, m_blocksize); } return true; }