falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JKRArchive: fix SDirEntry confusion (#196)

This commit is contained in:
Jcw87 2022-05-21 01:26:15 -07:00 committed by GitHub
parent 0e299bb7a1
commit 9bcbccbeb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/JSystem/JKernel/JKRArchive.h
View File

@ -51,16 +51,15 @@ extern u32 sCurrentDirID__10JKRArchive; // JKRArchive::sCurrentDirID
class JKRArchive : public JKRFileLoader { class JKRArchive : public JKRFileLoader {
public: public:
struct SDirEntry { struct SDirEntry {
union {
u32 type;
struct {
u8 flags; u8 flags;
u8 padding; u8 padding;
u16 id; u16 id;
} other; const char* name;
}; };
const char* name; struct SDIDirEntry {
u32 type;
u32 name_offset;
u16 field_0x8; u16 field_0x8;
u16 num_entries; u16 num_entries;
s32 first_file_index; s32 first_file_index;
@ -139,8 +138,8 @@ public:
protected: protected:
bool isSameName(CArcName&, u32, u16) const; bool isSameName(CArcName&, u32, u16) const;
SDirEntry* findResType(u32) const; SDIDirEntry* findResType(u32) const;
SDirEntry* findDirectory(const char*, u32) const; SDIDirEntry* findDirectory(const char*, u32) const;
SDIFileEntry* findTypeResource(u32, const char*) const; SDIFileEntry* findTypeResource(u32, const char*) const;
SDIFileEntry* findFsResource(const char*, u32) const; SDIFileEntry* findFsResource(const char*, u32) const;
SDIFileEntry* findIdxResource(u32) const; SDIFileEntry* findIdxResource(u32) const;
@ -175,7 +174,7 @@ protected:
/* 0x3D */ u8 field_0x3d[3]; /* 0x3D */ u8 field_0x3d[3];
/* 0x40 */ s32 mEntryNum; /* 0x40 */ s32 mEntryNum;
/* 0x44 */ SArcDataInfo* mArcInfoBlock; /* 0x44 */ SArcDataInfo* mArcInfoBlock;
/* 0x48 */ SDirEntry* mNodes; /* 0x48 */ SDIDirEntry* mNodes;
public: public:
/* 0x4C */ SDIFileEntry* mFiles; /* 0x4C */ SDIFileEntry* mFiles;

4
libs/JSystem/JKernel/JKRAramArchive.cpp
View File

@ -116,7 +116,7 @@ JKRAramArchive::JKRAramArchive(s32 param_0, JKRArchive::EMountDirection mountDir
return; return;
} }
mVolumeType = 'RARC'; mVolumeType = 'RARC';
mVolumeName = mStringTable + (int)mNodes->name; mVolumeName = mStringTable + mNodes->name_offset;
JKRFileLoader::sVolumeList.prepend(&mFileLoaderLink); JKRFileLoader::sVolumeList.prepend(&mFileLoaderLink);
mIsMounted = true; mIsMounted = true;
} }
@ -190,7 +190,7 @@ bool JKRAramArchive::open(s32 entryNum) {
JKRDvdToMainRam(entryNum, (u8*)mArcInfoBlock, EXPAND_SWITCH_UNKNOWN1, blockSize, NULL, JKRDvdToMainRam(entryNum, (u8*)mArcInfoBlock, EXPAND_SWITCH_UNKNOWN1, blockSize, NULL,
JKRDvdRipper::ALLOC_DIRECTION_FORWARD, 0x20, NULL, NULL); JKRDvdRipper::ALLOC_DIRECTION_FORWARD, 0x20, NULL, NULL);
DCInvalidateRange(mArcInfoBlock, blockSize); DCInvalidateRange(mArcInfoBlock, blockSize);
mNodes = (SDirEntry*)((s32)mArcInfoBlock + mArcInfoBlock->node_offset); mNodes = (SDIDirEntry*)((s32)mArcInfoBlock + mArcInfoBlock->node_offset);
mFiles = (SDIFileEntry*)((s32)mArcInfoBlock + mArcInfoBlock->file_entry_offset); mFiles = (SDIFileEntry*)((s32)mArcInfoBlock + mArcInfoBlock->file_entry_offset);
mStringTable = (char*)((s32)mArcInfoBlock + mArcInfoBlock->string_table_offset); mStringTable = (char*)((s32)mArcInfoBlock + mArcInfoBlock->string_table_offset);
mExpandedSize = NULL; mExpandedSize = NULL;

12
libs/JSystem/JKernel/JKRArchivePri.cpp
View File

@ -51,8 +51,8 @@ bool JKRArchive::isSameName(JKRArchive::CArcName& name, u32 nameOffset, u16 name
} }
/* 802D63E0-802D641C 2D0D20 003C+00 1/1 0/0 0/0 .text findResType__10JKRArchiveCFUl */ /* 802D63E0-802D641C 2D0D20 003C+00 1/1 0/0 0/0 .text findResType__10JKRArchiveCFUl */
JKRArchive::SDirEntry* JKRArchive::findResType(u32 type) const { JKRArchive::SDIDirEntry* JKRArchive::findResType(u32 type) const {
SDirEntry* node = mNodes; SDIDirEntry* node = mNodes;
u32 count = 0; u32 count = 0;
while (count < mArcInfoBlock->num_nodes) { while (count < mArcInfoBlock->num_nodes) {
if (node->type == type) { if (node->type == type) {
@ -68,13 +68,13 @@ JKRArchive::SDirEntry* JKRArchive::findResType(u32 type) const {
/* 802D641C-802D64F4 2D0D5C 00D8+00 0/0 3/3 0/0 .text findDirectory__10JKRArchiveCFPCcUl /* 802D641C-802D64F4 2D0D5C 00D8+00 0/0 3/3 0/0 .text findDirectory__10JKRArchiveCFPCcUl
*/ */
JKRArchive::SDirEntry* JKRArchive::findDirectory(const char* name, u32 directoryId) const { JKRArchive::SDIDirEntry* JKRArchive::findDirectory(const char* name, u32 directoryId) const {
if (name == NULL) { if (name == NULL) {
return mNodes + directoryId; return mNodes + directoryId;
} }
CArcName arcName(&name, '/'); CArcName arcName(&name, '/');
SDirEntry* dirEntry = mNodes + directoryId; SDIDirEntry* dirEntry = mNodes + directoryId;
SDIFileEntry* fileEntry = mFiles + dirEntry->first_file_index; SDIFileEntry* fileEntry = mFiles + dirEntry->first_file_index;
for (int i = 0; i < dirEntry->num_entries; fileEntry++, i++) { for (int i = 0; i < dirEntry->num_entries; fileEntry++, i++) {
@ -94,7 +94,7 @@ JKRArchive::SDirEntry* JKRArchive::findDirectory(const char* name, u32 directory
JKRArchive::SDIFileEntry* JKRArchive::findTypeResource(u32 type, const char* name) const { JKRArchive::SDIFileEntry* JKRArchive::findTypeResource(u32 type, const char* name) const {
if (type) { if (type) {
CArcName arcName(name); CArcName arcName(name);
SDirEntry* dirEntry = findResType(type); SDIDirEntry* dirEntry = findResType(type);
if (dirEntry) { if (dirEntry) {
SDIFileEntry* fileEntry = mFiles + dirEntry->first_file_index; SDIFileEntry* fileEntry = mFiles + dirEntry->first_file_index;
for (int i = 0; i < dirEntry->num_entries; fileEntry++, i++) { for (int i = 0; i < dirEntry->num_entries; fileEntry++, i++) {
@ -113,7 +113,7 @@ JKRArchive::SDIFileEntry* JKRArchive::findTypeResource(u32 type, const char* nam
JKRArchive::SDIFileEntry* JKRArchive::findFsResource(const char* name, u32 directoryId) const { JKRArchive::SDIFileEntry* JKRArchive::findFsResource(const char* name, u32 directoryId) const {
if (name) { if (name) {
CArcName arcName(&name, '/'); CArcName arcName(&name, '/');
SDirEntry* dirEntry = mNodes + directoryId; SDIDirEntry* dirEntry = mNodes + directoryId;
SDIFileEntry* fileEntry = mFiles + dirEntry->first_file_index; SDIFileEntry* fileEntry = mFiles + dirEntry->first_file_index;
for (int i = 0; i < dirEntry->num_entries; fileEntry++, i++) { for (int i = 0; i < dirEntry->num_entries; fileEntry++, i++) {
// regalloc doesn't like fileEntry->getNameHash() // regalloc doesn't like fileEntry->getNameHash()

10
libs/JSystem/JKernel/JKRArchivePub.cpp
View File

@ -113,7 +113,7 @@ JKRArchive* JKRArchive::mount(s32 entryNum, JKRArchive::EMountMode mountMode, JK
/* 802D5A38-802D5AC0 2D0378 0088+00 1/0 4/0 0/0 .text becomeCurrent__10JKRArchiveFPCc */ /* 802D5A38-802D5AC0 2D0378 0088+00 1/0 4/0 0/0 .text becomeCurrent__10JKRArchiveFPCc */
bool JKRArchive::becomeCurrent(const char* path) { bool JKRArchive::becomeCurrent(const char* path) {
SDirEntry* dirEntry; SDIDirEntry* dirEntry;
if (*path == '/') { if (*path == '/') {
path++; path++;
@ -140,8 +140,8 @@ bool JKRArchive::getDirEntry(SDirEntry* dirEntry, u32 index) const {
if (!fileEntry) if (!fileEntry)
return false; return false;
dirEntry->other.flags = fileEntry->getFlags(); dirEntry->flags = fileEntry->getFlags();
dirEntry->other.id = fileEntry->getFileID(); dirEntry->id = fileEntry->getFileID();
dirEntry->name = mStringTable + fileEntry->getNameOffset(); dirEntry->name = mStringTable + fileEntry->getNameOffset();
return true; return true;
} }
@ -338,7 +338,7 @@ u32 JKRArchive::countResource(void) const {
/* 802D6150-802D61B0 2D0A90 0060+00 1/0 4/0 0/0 .text countFile__10JKRArchiveCFPCc */ /* 802D6150-802D61B0 2D0A90 0060+00 1/0 4/0 0/0 .text countFile__10JKRArchiveCFPCc */
u32 JKRArchive::countFile(const char* path) const { u32 JKRArchive::countFile(const char* path) const {
SDirEntry* dirEntry; SDIDirEntry* dirEntry;
if (*path == '/') { if (*path == '/') {
path++; path++;
@ -358,7 +358,7 @@ u32 JKRArchive::countFile(const char* path) const {
/* 802D61B0-802D625C 2D0AF0 00AC+00 1/0 4/0 0/0 .text getFirstFile__10JKRArchiveCFPCc */ /* 802D61B0-802D625C 2D0AF0 00AC+00 1/0 4/0 0/0 .text getFirstFile__10JKRArchiveCFPCc */
JKRFileFinder* JKRArchive::getFirstFile(const char* path) const { JKRFileFinder* JKRArchive::getFirstFile(const char* path) const {
SDirEntry* dirEntry; SDIDirEntry* dirEntry;
if (*path == '/') { if (*path == '/') {
path++; path++;

4
libs/JSystem/JKernel/JKRDvdArchive.cpp
View File

@ -91,7 +91,7 @@ JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDire
return; return;
mVolumeType = 'RARC'; mVolumeType = 'RARC';
mVolumeName = mStringTable + (u32)mNodes->name; mVolumeName = mStringTable + mNodes->name_offset;
getVolumeList().prepend(&mFileLoaderLink); getVolumeList().prepend(&mFileLoaderLink);
mIsMounted = true; mIsMounted = true;
} }
@ -169,7 +169,7 @@ bool JKRDvdArchive::open(s32 entryNum) {
sizeof(SArcHeader), NULL, NULL); sizeof(SArcHeader), NULL, NULL);
DCInvalidateRange(mArcInfoBlock, arcHeader->file_data_offset); DCInvalidateRange(mArcInfoBlock, arcHeader->file_data_offset);
mNodes = (SDirEntry*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset); mNodes = (SDIDirEntry*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset);
mFiles = (SDIFileEntry*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset); mFiles = (SDIFileEntry*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset);
mStringTable = (char*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset); mStringTable = (char*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset);
mExpandedSize = NULL; mExpandedSize = NULL;

4
libs/JSystem/JKernel/JKRFileFinder.cpp
View File

@ -53,8 +53,8 @@ bool JKRArcFinder::findNextFile(void) {
mIsAvailable = mArchive->getDirEntry(&entry, mNextIndex); mIsAvailable = mArchive->getDirEntry(&entry, mNextIndex);
mEntryName = entry.name; mEntryName = entry.name;
mEntryFileIndex = mNextIndex; mEntryFileIndex = mNextIndex;
mEntryId = entry.other.id; mEntryId = entry.id;
mEntryTypeFlags = entry.other.flags; mEntryTypeFlags = entry.flags;
mIsFileOrDirectory = (mEntryTypeFlags >> 1) & 1; mIsFileOrDirectory = (mEntryTypeFlags >> 1) & 1;
mNextIndex++; mNextIndex++;
} }

8
libs/JSystem/JKernel/JKRMemArchive.cpp
View File

@ -156,7 +156,7 @@ JKRMemArchive::JKRMemArchive(long entryNum, JKRArchive::EMountDirection mountDir
} }
mVolumeType = 'RARC'; mVolumeType = 'RARC';
mVolumeName = mStringTable + (u32)mNodes->name; mVolumeName = mStringTable + mNodes->name_offset;
getVolumeList().prepend(&mFileLoaderLink); getVolumeList().prepend(&mFileLoaderLink);
mIsMounted = true; mIsMounted = true;
@ -172,7 +172,7 @@ JKRMemArchive::JKRMemArchive(void* buffer, u32 bufferSize, JKRMemBreakFlag param
} }
mVolumeType = 'RARC'; mVolumeType = 'RARC';
mVolumeName = mStringTable + (u32)mNodes->name; mVolumeName = mStringTable + mNodes->name_offset;
getVolumeList().prepend(&mFileLoaderLink); getVolumeList().prepend(&mFileLoaderLink);
mIsMounted = true; mIsMounted = true;
@ -230,7 +230,7 @@ bool JKRMemArchive::open(long entryNum, JKRArchive::EMountDirection mountDirecti
} else { } else {
ASSERT(mArcHeader->signature == 'RARC'); ASSERT(mArcHeader->signature == 'RARC');
mArcInfoBlock = (SArcDataInfo*)((u8*)mArcHeader + mArcHeader->header_length); mArcInfoBlock = (SArcDataInfo*)((u8*)mArcHeader + mArcHeader->header_length);
mNodes = (SDirEntry*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset); mNodes = (SDIDirEntry*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset);
mFiles = (SDIFileEntry*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset); mFiles = (SDIFileEntry*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset);
mStringTable = (char*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset); mStringTable = (char*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset);
@ -263,7 +263,7 @@ bool JKRMemArchive::open(void* buffer, u32 bufferSize, JKRMemBreakFlag flag) {
ASSERT(mArcHeader->signature == 'RARC'); ASSERT(mArcHeader->signature == 'RARC');
mArcInfoBlock = (SArcDataInfo*)((u8*)mArcHeader + mArcHeader->header_length); mArcInfoBlock = (SArcDataInfo*)((u8*)mArcHeader + mArcHeader->header_length);
mNodes = (SDirEntry*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset); mNodes = (SDIDirEntry*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset);
mFiles = (SDIFileEntry*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset); mFiles = (SDIFileEntry*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset);
mStringTable = (char*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset); mStringTable = (char*)((u8*)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset);
mArchiveData = mArchiveData =