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

[VFS] Fix Stfs GetBlockHash (and simplify it)

This commit is contained in:
Dr. Chat 2018-05-29 23:11:38 -05:00
parent f518ec1b37
commit ef18e9d649
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/xenia/vfs/devices/stfs_container_device.cc
View File

@ -439,23 +439,16 @@ size_t StfsContainerDevice::BlockToOffsetEGDF(uint64_t sector) {
StfsContainerDevice::BlockHash StfsContainerDevice::GetBlockHash( StfsContainerDevice::BlockHash StfsContainerDevice::GetBlockHash(
const uint8_t* map_ptr, uint32_t block_index, uint32_t table_offset) { const uint8_t* map_ptr, uint32_t block_index, uint32_t table_offset) {
static const uint32_t table_spacing[] = {
0xAB, 0x718F,
0xFE7DA, // The distance in blocks between tables
0xAC, 0x723A,
0xFD00B, // For when tables are 1 block and when they are 2 blocks
};
uint32_t record = block_index % 0xAA; uint32_t record = block_index % 0xAA;
uint32_t table_index =
(block_index / 0xAA) * table_spacing[table_size_shift_ * 3 + 0]; // This is a bit hacky, but we'll get a pointer to the first block after the
if (block_index >= 0xAA) { // table and then subtract one sector to land on the table itself.
table_index += ((block_index / 0x70E4) + 1) << table_size_shift_; size_t hash_offset = BlockToOffsetSTFS(
if (block_index >= 0x70E4) { xe::round_up(block_index + 1, kSTFSHashSpacing) - kSTFSHashSpacing);
table_index += 1 << table_size_shift_; hash_offset -= bytes_per_sector();
} const uint8_t* hash_data = map_ptr + hash_offset;
}
// table_index += table_offset - (1 << table_size_shift_); // table_index += table_offset - (1 << table_size_shift_);
const uint8_t* hash_data = map_ptr + BlockToOffsetSTFS(table_index);
const uint8_t* record_data = hash_data + record * 0x18; const uint8_t* record_data = hash_data + record * 0x18;
uint32_t info = xe::load_and_swap<uint8_t>(record_data + 0x14); uint32_t info = xe::load_and_swap<uint8_t>(record_data + 0x14);
uint32_t next_block_index = load_uint24_be(record_data + 0x15); uint32_t next_block_index = load_uint24_be(record_data + 0x15);