Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Io: Consistently use LE values of ISO entries.

Browse source 
Better to be consistent across big endian and little endian, in case
something was mastered wrong.
This commit is contained in:
Unknown W. Brackets 2021-01-30 12:00:40 -08:00
parent 1eeebccd04
commit 49e9400670
1 changed files with 38 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
Core/FileSystems/ISOFileSystem.cpp
View file

@ -61,35 +61,29 @@ bool parseLBN(std::string filename, u32 *sectorStart, u32 *readSize) {
return true;
}
struct unaligned_u32_le {
u8 bytes[4];
u32 value() const { return bytes[0] + (bytes[1] << 8) + (bytes[2] << 16) + (bytes[3] << 24); }
};
struct unaligned_u32_be {
u8 bytes[4];
u32 value() const { return (bytes[0] << 24) + (bytes[1] << 16) + (bytes[2] << 8) + bytes[3]; }
};
struct unaligned_u16_le {
u8 bytes[2];
u16 value() const { return bytes[0] + (bytes[1] << 8); }
};
struct unaligned_u16_be {
u8 bytes[2];
u16 value() const { return (bytes[0] << 8) + bytes[1]; }
};
#pragma pack(push)
#pragma pack(1)
struct u32_le_be_pair {
u8 valueLE[4];
u8 valueBE[4];
operator u32() const {
return valueLE[0] + (valueLE[1] << 8) + (valueLE[2] << 16) + (valueLE[3] << 24);
}
};
struct u16_le_be_pair {
u8 valueLE[2];
u8 valueBE[2];
operator u16() const {
return valueLE[0] + (valueLE[1] << 8);
}
};
struct DirectoryEntry {
u8 size;
u8 sectorsInExtendedRecord;
unaligned_u32_le firstDataSectorLE; // LBA
unaligned_u32_be firstDataSectorBE;
unaligned_u32_le dataLengthLE; // Size
unaligned_u32_be dataLengthBE;
u32_le_be_pair firstDataSector; // LBA
u32_le_be_pair dataLength; // Size
u8 years;
u8 month;
u8 day;
@ -100,38 +94,9 @@ struct DirectoryEntry {
u8 flags; // 2 = directory
u8 fileUnitSize;
u8 interleaveGap;
unaligned_u16_le volSeqNumberLE;
unaligned_u16_be volSeqNumberBE;
u16_le_be_pair volSeqNumber;
u8 identifierLength; //identifier comes right after
u8 firstIdChar;
#if COMMON_LITTLE_ENDIAN
u32 firstDataSector() const
{
return firstDataSectorLE.value();
}
u32 dataLength() const
{
return dataLengthLE.value();
}
u32 volSeqNumber() const
{
return volSeqNumberLE.value();
}
#else
u32 firstDataSector() const
{
return firstDataSectorBE.value();
}
u32 dataLength() const
{
return dataLengthBE.value();
}
u32 volSeqNumber() const
{
return volSeqNumberBE.value();
}
#endif
};
struct DirectorySector {
@ -146,25 +111,16 @@ struct VolDescriptor {
char sysid[32];
char volid[32];
char zeros[8];
u32_le numSectorsLE;
u32_be numSectoreBE;
u32_le_be_pair numSectors;
char morezeros[32];
u16_le volSetSizeLE;
u16_be volSetSizeBE;
u16_le volSeqNumLE;
u16_be volSeqNumBE;
u16_le sectorSizeLE;
u16_be sectorSizeBE;
u32_le pathTableLengthLE;
u32_be pathTableLengthBE;
u16_le firstLETableSectorLE;
u16_be firstLETableSectorBE;
u16_le secondLETableSectorLE;
u16_be secondLETableSectorBE;
u16_le firstBETableSectorLE;
u16_be firstBETableSectorBE;
u16_le secondBETableSectorLE;
u16_be secondBETableSectorBE;
u16_le_be_pair volSetSize;
u16_le_be_pair volSeqNum;
u16_le_be_pair sectorSize;
u32_le_be_pair pathTableLength;
u16_le_be_pair firstLETableSector;
u16_le_be_pair secondLETableSector;
u16_le_be_pair firstBETableSector;
u16_le_be_pair secondBETableSector;
DirectoryEntry root;
char volumeSetIdentifier[128];
char publisherIdentifier[128];
@ -212,8 +168,8 @@ ISOFileSystem::ISOFileSystem(IHandleAllocator *_hAlloc, BlockDevice *_blockDevic
return;
}
treeroot->startsector = desc.root.firstDataSector();
treeroot->dirsize = desc.root.dataLength();
treeroot->startsector = desc.root.firstDataSector;
treeroot->dirsize = desc.root.dataLength;
}
ISOFileSystem::~ISOFileSystem() {
@ -264,16 +220,15 @@ void ISOFileSystem::ReadDirectory(TreeEntry *root) {
relative = false;
}
entry->size = dir.dataLength();
entry->startingPosition = dir.firstDataSector() * 2048;
entry->size = dir.dataLength;
entry->startingPosition = dir.firstDataSector * 2048;
entry->isDirectory = !isFile;
entry->flags = dir.flags;
entry->parent = root;
entry->startsector = dir.firstDataSector();
entry->dirsize = dir.dataLength();
entry->startsector = dir.firstDataSector;
entry->dirsize = dir.dataLength;
entry->valid = isFile; // Can pre-mark as valid if file, as we don't recurse into those.
// Let's not excessively spam the log - I commented this line out.
//DEBUG_LOG(FILESYS, "%s: %s %08x %08x %i", entry->isDirectory?"D":"F", entry->name.c_str(), dir.firstDataSectorLE, entry->startingPosition, entry->startingPosition);
VERBOSE_LOG(FILESYS, "%s: %s %08x %08x %i", entry->isDirectory ? "D" : "F", entry->name.c_str(), (u32)dir.firstDataSector, entry->startingPosition, entry->startingPosition);
if (entry->isDirectory && !relative) {
if (entry->startsector == root->startsector) {
@ -458,11 +413,11 @@ int ISOFileSystem::Ioctl(u32 handle, u32 cmd, u32 indataPtr, u32 inlen, u32 outd
VolDescriptor desc;
blockDevice->ReadBlock(16, (u8 *)&desc);
if (outlen < (u32)desc.pathTableLengthLE) {
if (outlen < (u32)desc.pathTableLength) {
return SCE_KERNEL_ERROR_ERRNO_INVALID_ARGUMENT;
} else {
int block = (u16)desc.firstLETableSectorLE;
u32 size = (u32)desc.pathTableLengthLE;
int block = (u16)desc.firstLETableSector;
u32 size = (u32)desc.pathTableLength;
u8 *out = Memory::GetPointer(outdataPtr);
int blocks = size / blockDevice->GetBlockSize();