ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3986 from JosJuice/scrubbing-improvements 

Scrubbing improvements
This commit is contained in:
Pierre Bourdon 2016-07-12 02:24:04 +02:00 committed by GitHub
parent ac00b249aa 53e7eed28d
commit f59b8b7536
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/DiscIO/DiscScrubber.cpp
View File

@ -70,7 +70,7 @@ struct SPartitionGroup
static SPartitionGroup PartitionGroup[4]; static SPartitionGroup PartitionGroup[4];
void MarkAsUsed(u64 _Offset, u64 _Size); void MarkAsUsed(u64 _Offset, u64 _Size);
void MarkAsUsedE(u64 _PartitionDataOffset, u64 _Offset, u64 _Size); void MarkAsUsedE(u64 partition_data_offset, u64 offset, u64 size);
bool ReadFromVolume(u64 _Offset, u32& _Buffer, bool _Decrypt); bool ReadFromVolume(u64 _Offset, u32& _Buffer, bool _Decrypt);
bool ReadFromVolume(u64 _Offset, u64& _Buffer, bool _Decrypt); bool ReadFromVolume(u64 _Offset, u64& _Buffer, bool _Decrypt);
bool ParseDisc(); bool ParseDisc();
@ -132,7 +132,7 @@ size_t GetNextBlock(File::IOFile& in, u8* buffer)
if (m_isScrubbing && m_FreeTable[i]) if (m_isScrubbing && m_FreeTable[i])
{ {
DEBUG_LOG(DISCIO, "Freeing 0x%016" PRIx64, CurrentOffset); DEBUG_LOG(DISCIO, "Freeing 0x%016" PRIx64, CurrentOffset);
std::fill(buffer, buffer + m_BlockSize, 0xFF); std::fill(buffer, buffer + m_BlockSize, 0x00);
in.Seek(m_BlockSize, SEEK_CUR); in.Seek(m_BlockSize, SEEK_CUR);
ReadBytes = m_BlockSize; ReadBytes = m_BlockSize;
} }
@ -171,23 +171,24 @@ void MarkAsUsed(u64 _Offset, u64 _Size)
CurrentOffset += CLUSTER_SIZE; CurrentOffset += CLUSTER_SIZE;
} }
} }
// Compensate for 0x400(SHA-1) per 0x8000(cluster)
void MarkAsUsedE(u64 _PartitionDataOffset, u64 _Offset, u64 _Size) // Compensate for 0x400 (SHA-1) per 0x8000 (cluster), and round to whole clusters
void MarkAsUsedE(u64 partition_data_offset, u64 offset, u64 size)
{ {
u64 Offset; u64 first_cluster_start = offset / 0x7c00 * CLUSTER_SIZE + partition_data_offset;
u64 Size;
Offset = _Offset / 0x7c00; u64 last_cluster_end;
Offset = Offset * CLUSTER_SIZE; if (size == 0)
Offset += _PartitionDataOffset; {
// Without this special case, a size of 0 can be rounded to 1 cluster instead of 0
last_cluster_end = first_cluster_start;
}
else
{
last_cluster_end = ((offset + size - 1) / 0x7c00 + 1) * CLUSTER_SIZE + partition_data_offset;
}
Size = _Size / 0x7c00; MarkAsUsed(first_cluster_start, last_cluster_end - first_cluster_start);
Size = (Size + 1) * CLUSTER_SIZE;
// Add on the offset in the first block for the case where data straddles blocks
Size += _Offset % 0x7c00;
MarkAsUsed(Offset, Size);
} }
// Helper functions for reading the BE volume // Helper functions for reading the BE volume