JKRFileLoader, JKRFileFinder, and JKRThread (#60)

* JKRFileLoader OK

* JKRFileFinder progress

* JKRFileFinder OK

* JKRFileCache fix virtual function signatures

* added OSThread and OSContext types

* JKRThread fixed nonmatching functions

Co-authored-by: Julgodis <>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
Jonathan Wase
2021-01-04 04:48:07 +01:00
committed by GitHub
parent 922a0df5ea
commit 0be0a7ea94
18 changed files with 387 additions and 123 deletions
@@ -2,28 +2,36 @@
#define __JKRFILEFINDER_H__
#include "dolphin/types.h"
#include "dvd/dvd.h"
struct JKRFileFinder_UnknownBase {
u32 field_0x0;
u32 field_0x4;
u16 field_0x8;
u16 field_0xa;
const char* mEntryName;
s32 mEntryFileIndex;
u16 mEntryId;
u16 mEntryTypeFlags;
};
class JKRFileFinder : JKRFileFinder_UnknownBase {
class JKRFileFinder : public JKRFileFinder_UnknownBase {
public:
JKRFileFinder();
JKRFileFinder() {
mIsAvailable = false;
mIsFileOrDirectory = false;
}
virtual ~JKRFileFinder();
bool isAvailable() { return this->mIsAvailable; }
bool isAvailable() const { return mIsAvailable; }
bool isFile() const { return mIsFileOrDirectory; }
bool isDirectory() const { return mIsFileOrDirectory; }
public:
/* vt[3] */ virtual bool findNextFile(void) = 0;
private:
bool mIsAvailable;
bool field_0x11;
u8 padding_0x12[2];
protected:
/* 0x00 */ // JKRFileFinder_UnknownBase
/* 0x0C */ // vtable
/* 0x10 */ bool mIsAvailable;
/* 0x11 */ bool mIsFileOrDirectory;
/* 0x12 */ u8 field_0x12[2];
};
class JKRArchive;
@@ -36,24 +44,30 @@ public:
/* vt[3] */ virtual bool findNextFile(void); /* override */
private:
JKRArchive* mArchive;
u32 field_0x18;
u32 field_0x1c;
u32 field_0x20;
/* 0x00 */ // JKRFileFinder_UnknownBase
/* 0x0C */ // vtable
/* 0x10 */ // JKRFileFinder
/* 0x14 */ JKRArchive* mArchive;
/* 0x18 */ s32 mStartIndex;
/* 0x1C */ s32 mEndIndex;
/* 0x20 */ s32 mNextIndex;
};
class JKRDvdFinder : public JKRFileFinder {
public:
JKRDvdFinder(char const*);
JKRDvdFinder(const char*);
virtual ~JKRDvdFinder();
public:
/* vt[3] */ virtual bool findNextFile(void); /* override */
private:
u8 mDvd[12];
bool mDvdIsOpen;
u8 padding_0x21[3];
/* 0x00 */ // JKRFileFinder_UnknownBase
/* 0x0C */ // vtable
/* 0x10 */ // JKRFileFinder
/* 0x14 */ DVDDirectory mDvdDirectory;
/* 0x20 */ bool mDvdIsOpen;
/* 0x21 */ u8 field_0x21[3];
};
#endif