* JKRDvdArchive.s split

* JKRMemArchive.s split

* JKRAramArchive.s split

* JKRCompArchive.s split

* JKRDecomp.s split

* JKRDvdRipper.s split

* JKRAramBlock.s split

* JKRAramHeap.s split

* JKRAramPiece.s split

* JKRAramStream.s split

* removed unused .s files

* JKRDvdAramRipper.s split

* JKRAram.s split

* cleanup and making vtables easier to debug

* fixed merge errors

* fixed JKRFileLoader::fetchVolumeName

Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
Jonathan Wase
2020-12-06 21:02:25 +01:00
committed by GitHub
parent 481c458e8d
commit ff2faa9804
201 changed files with 9912 additions and 8262 deletions
@@ -9,19 +9,6 @@ class JKRFileLoader : public JKRDisposer {
JKRFileLoader(void);
virtual ~JKRFileLoader();
virtual void unmount(void);
virtual void becomeCurrent(char const*) = 0;
virtual void getResource(char const*) = 0;
virtual void getResource(u32, char const*) = 0;
virtual void readResource(void*, u32, char const*) = 0;
virtual void readResource(void*, u32, u32, char const*) = 0;
virtual void removeResourceAll(void) = 0;
virtual void removeResource(void*) = 0;
virtual void detachResource(void*) = 0;
virtual void getResSize(void const*) const = 0;
virtual void countFile(char const*) const = 0;
virtual void getFirstFile(char const*) const = 0;
bool isMounted() {
return this->mIsMounted;
}
@@ -30,12 +17,19 @@ class JKRFileLoader : public JKRDisposer {
return this->mVolumeType;
}
static void* getGlbResource(char const*);
static void* getGlbResource(char const*, JKRFileLoader*);
static bool removeResource(void*, JKRFileLoader*);
static bool detachResource(void*, JKRFileLoader*);
static JKRFileLoader* findVolume(char const**);
static char* fetchVolumeName(char*, long, char const*);
public:
/* vt[03] */ virtual void unmount(void);
/* vt[04] */ virtual void becomeCurrent(char const*) = 0;
/* vt[05] */ virtual void getResource(char const*) = 0;
/* vt[06] */ virtual void getResource(u32, char const*) = 0;
/* vt[07] */ virtual void readResource(void*, u32, char const*) = 0;
/* vt[08] */ virtual void readResource(void*, u32, u32, char const*) = 0;
/* vt[09] */ virtual void removeResourceAll(void) = 0;
/* vt[10] */ virtual void removeResource(void*) = 0;
/* vt[11] */ virtual void detachResource(void*) = 0;
/* vt[12] */ virtual void getResSize(void const*) const = 0;
/* vt[13] */ virtual void countFile(char const*) const = 0;
/* vt[14] */ virtual void getFirstFile(char const*) const = 0;
private:
JSULink<JKRFileLoader> mFileLoaderLink;
@@ -44,6 +38,14 @@ class JKRFileLoader : public JKRDisposer {
bool mIsMounted;
u8 padding_0x31[3];
int mMountCount;
public:
static void* getGlbResource(char const*);
static void* getGlbResource(char const*, JKRFileLoader*);
static bool removeResource(void*, JKRFileLoader*);
static bool detachResource(void*, JKRFileLoader*);
static JKRFileLoader* findVolume(char const**);
static char* fetchVolumeName(char*, long, char const*);
};
#endif