The-Homebrew-Cloud/libromfs_wiiu
2
0
Fork 0
mirror of https://github.com/wiiu-env/libromfs_wiiu.git synced 2024-11-23 18:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use a properly aligned buffer for reading

Browse Source
This commit is contained in:
Maschell 2022-03-05 22:54:24 +01:00
parent 8b86de4565
commit 315ace6707
1 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
source/romfs_dev.c
View File

@ -71,51 +71,68 @@ static ssize_t _romfs_read(romfs_mount *mount, uint64_t offset, void *buffer, ui
return read(mount->fd, buffer, size); return read(mount->fd, buffer, size);
} else if (mount->fd_type == RomfsSource_FileDescriptor_CafeOS) { } else if (mount->fd_type == RomfsSource_FileDescriptor_CafeOS) {
FSCmdBlock cmd; FSCmdBlock cmd;
FSStatus status;
FSInitCmdBlock(&cmd); FSInitCmdBlock(&cmd);
FSStatus result = 0; uint32_t bytesRead = 0;
if ((((uint32_t) buffer) & 0x3F) == 0) {
// The buffer size needs to be a multiple of 0x40 __attribute__((aligned(0x40))) uint8_t alignedBuffer[0x40];
if ((size & 0x3F) == 0) {
result = FSReadFileWithPos(&mount->cafe_client, &cmd, (uint8_t *) buffer, 1, size, pos, mount->cafe_fd, 0, FS_ERROR_FLAG_ALL); uint32_t ptrAligned = ((uint32_t) buffer + 0x3F) & ~(0x3F);
} else { uint32_t lenToAlignedPtr = ptrAligned - (uint32_t) buffer;
uint64_t readLen = size & ~(0x3F); uint32_t headLen = lenToAlignedPtr > size ? size : lenToAlignedPtr;
if (readLen > 0) { uint32_t remainingLen = size;
result = FSReadFileWithPos(&mount->cafe_client, &cmd, (uint8_t *) buffer, 1, readLen, pos, mount->cafe_fd, 0, FS_ERROR_FLAG_ALL);
if (result < 0 || readLen != result) { // read "head
if (headLen > 0) {
status = FSReadFileWithPos(&mount->cafe_client, &cmd, alignedBuffer, 1,
headLen, pos, mount->cafe_fd, 0, FS_ERROR_FLAG_ALL);
if (status < 0) {
return -1; return -1;
} } else if (status > 0) {
offset += readLen; memcpy(buffer, alignedBuffer, (uint32_t) status);
bytesRead += (uint32_t) status;
pos += (uint32_t) status;
buffer += status;
remainingLen -= status;
} }
uint8_t bufferStack[0x80]; // Return when we've read partial data or finished reading all data
uint64_t readRemaining = size - readLen; if (status < headLen || remainingLen == 0) {
uint8_t *alignedBuffer = (uint8_t *) (((uint32_t) bufferStack + 0x3F) & ~(0x3F)); return bytesRead;
}
}
FSStatus otherResult = FSReadFileWithPos(&mount->cafe_client, &cmd, alignedBuffer, 1, readRemaining, offset, mount->cafe_fd, 0, FS_ERROR_FLAG_ALL); uint32_t bodyLen = remainingLen & ~(0x3F);
// read "body"
if (otherResult < 0 || otherResult != readRemaining) { if (bodyLen > 0) {
status = FSReadFileWithPos(&mount->cafe_client, &cmd, buffer, 1,
bodyLen, pos, mount->cafe_fd, 0, FS_ERROR_FLAG_ALL);
if (status < 0) {
return -1; return -1;
} else if (status > 0) {
bytesRead += (uint32_t) status;
buffer += status;
pos += status;
remainingLen -= status;
} }
memcpy(buffer + readLen, alignedBuffer, readRemaining); // Return when we've read partial data or finished reading all data
result += (uint32_t) otherResult; if (status < bodyLen || remainingLen == 0) {
return bytesRead;
} }
} else {
// The buffer needs to be aligned to 0x40
// The buffer size needs to be a multiple of 0x40
uint8_t *buffer_ = (uint8_t *) memalign(0x40, (size + 0x3F) & ~(0x3F));
if (!buffer_) {
return -1;
}
result = FSReadFileWithPos(&mount->cafe_client, &cmd, buffer_, 1, size, pos, mount->cafe_fd, 0, FS_ERROR_FLAG_ALL);
memcpy(buffer, buffer_, size);
free(buffer_);
} }
if (result < 0) { // read "tail"
status = FSReadFileWithPos(&mount->cafe_client, &cmd, alignedBuffer, 1,
remainingLen, pos, mount->cafe_fd, 0, FS_ERROR_FLAG_ALL);
if (status < 0) {
return -1; return -1;
} else if (status > 0) {
memcpy(buffer, alignedBuffer, (uint32_t) status);
bytesRead += (uint32_t) status;
} }
return result;
return bytesRead;
} }
return -1; return -1;
} }