mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-06 18:03:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

run clang-format

Browse Source
This commit is contained in:
Pheenoh
2020-12-26 11:31:49 -05:00
parent 64a6a97b7b
commit 4c504d078d
180 changed files with 4083 additions and 4253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DScreen/J2DScreen.h
+1 -3
View File
@@ -1,8 +1,6 @@
#ifndef J2DSCREEN_H_
#define J2DSCREEN_H_
class J2DScreen {
};
class J2DScreen {};
#endif
include/JSystem/J3DGraphAnimator/J3DJoint.h
+1 -3
View File
@@ -1,8 +1,6 @@
#ifndef J3DJOINT_H_
#define J3DJOINT_H_
struct J3DJoint{
};
struct J3DJoint {};
#endif
include/JSystem/J3DGraphAnimator/J3DModel.h
+1 -3
View File
@@ -1,8 +1,6 @@
#ifndef J3DMODEL_H_
#define J3DMODEL_H_
struct J3DModel{
};
struct J3DModel {};
#endif
include/JSystem/J3DGraphAnimator/J3DModelData.h
+1 -3
View File
@@ -1,8 +1,6 @@
#ifndef J3DMODELDATA_H_
#define J3DMODELDATA_H_
struct J3DModelData{
};
struct J3DModelData {};
#endif
include/JSystem/J3DGraphAnimator/J3DModelLoader.h
+1 -3
View File
@@ -1,8 +1,6 @@
#ifndef J3DMODELLOADER_H_
#define J3DMODELLOADER_H_
struct J3DMaterial{
};
struct J3DMaterial {};
#endif
include/JSystem/JAudio2/JAISe/JAISe.h
+2 -2
View File
@@ -3,9 +3,9 @@
#include "global.h"
struct JAISoundID{
struct JAISoundID {
u32 soundId;
JAISoundID(JAISoundID const &soundIdToSet);
JAISoundID(JAISoundID const& soundIdToSet);
};
#endif
include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h
+1 -3
View File
@@ -3,8 +3,6 @@
#include "global.h"
struct JAISoundHandle{
};
struct JAISoundHandle {};
#endif
include/JSystem/JKernel/JKRAram/JKRAram.h
+12 -24
View File
@@ -1,8 +1,8 @@
#ifndef __JKRARAM_H__
#define __JKRARAM_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRThread/JKRThread.h"
#include "dolphin/types.h"
// JKRExpandSwitch
#include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
@@ -13,21 +13,17 @@
class JKRHeap;
class JKRAramBlock;
class JKRAram : public JKRThread {
private:
private:
JKRAram(u32, u32, long);
virtual ~JKRAram();
/* vt[03] */ void* run(void); /* override */
public:
void* getAudioMemory() {
return this->mAudioMemoryPtr;
}
u32 getAudioMemSize() {
return this->mAudioMemorySize;
}
private:
public:
void* getAudioMemory() { return this->mAudioMemoryPtr; }
u32 getAudioMemSize() { return this->mAudioMemorySize; }
private:
void* mAudioMemoryPtr;
u32 mAudioMemorySize;
void* mGraphMemoryPtr;
@@ -38,20 +34,16 @@ class JKRAram : public JKRThread {
u32 field_0x9c;
u32 field_0xa0;
public:
public:
static void create(u32, u32, long, long, long);
static void checkOkAddress(u8*, u32, JKRAramBlock*, u32);
static void changeGroupIdIfNeed(u8*, int);
static void mainRamToAram(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
static void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*);
static JKRAram* getManager() {
return lbl_804513C8;
}
static JKRAram* getManager() { return lbl_804513C8; }
static JKRAramHeap* getAramHeap() {
return getManager()->mAramHeap;
}
static JKRAramHeap* getAramHeap() { return getManager()->mAramHeap; }
static u8 decideAramGroupId(int groupId) {
JKRAramHeap* heap;
@@ -64,13 +56,9 @@ class JKRAram : public JKRThread {
return (u8)groupId;
}
static u32 getSZSBufferSize() {
return lbl_804508B8;
}
static u32 getSZSBufferSize() { return lbl_804508B8; }
void setSZSBufferSize(u32 size) {
lbl_804508B8 = size;
}
void setSZSBufferSize(u32 size) { lbl_804508B8 = size; }
};
void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*);
include/JSystem/JKernel/JKRAramArchive/JKRAramArchive.h
+3 -3
View File
@@ -1,11 +1,11 @@
#ifndef __JKRARAMARCHIVE_H__
#define __JKRARAMARCHIVE_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRArchive/JKRArchive.h"
#include "dolphin/types.h"
class JKRAramArchive : public JKRArchive {
public:
public:
JKRAramArchive(long, JKRArchive::EMountDirection);
virtual ~JKRAramArchive();
@@ -17,7 +17,7 @@ class JKRAramArchive : public JKRArchive {
/* vt[16] */ void fetchResource(JKRArchive::SDIFileEntry*, u32*); /* override */
/* vt[17] */ void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
public:
public:
static void fetchResource_subroutine(u32, u32, u8*, u32, int);
static void fetchResource_subroutine(u32, u32, JKRHeap*, int, u8**);
};
include/JSystem/JKernel/JKRAramBlock/JKRAramBlock.h
+7 -15
View File
@@ -1,35 +1,27 @@
#ifndef __JKRARAMBLOCK_H__
#define __JKRARAMBLOCK_H__
#include "dolphin/types.h"
#include "JSystem/JSupport/JSUList/JSUList.h"
#include "dolphin/types.h"
class JKRAramHeap;
class JKRAramBlock {
public:
public:
JKRAramBlock(u32, u32, u32, u8, bool);
virtual ~JKRAramBlock();
void allocHead(u32, u8, JKRAramHeap*);
void allocTail(u32, u8, JKRAramHeap*);
void* getAddress() {
return (void*)this->mAddress;
}
void* getAddress() { return (void*)this->mAddress; }
u32 getSize() {
return this->mSize;
}
u32 getSize() { return this->mSize; }
bool isTempMemory() {
return this->mIsTempMemory;
}
bool isTempMemory() { return this->mIsTempMemory; }
void newGroupID(u8 groupId) {
this->mGroupId = groupId;
}
void newGroupID(u8 groupId) { this->mGroupId = groupId; }
public:
public:
JSULink<JKRAramBlock> mBlockLink;
u32 mAddress;
u32 mSize;
include/JSystem/JKernel/JKRAramHeap/JKRAramHeap.h
+8 -16
View File
@@ -1,18 +1,18 @@
#ifndef __JKRARAMHEAP_H__
#define __JKRARAMHEAP_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
#include "dolphin/types.h"
#include "global.h"
class JKRAramHeap : public JKRDisposer {
public:
public:
enum EAllocMode {
HEAD = 0,
TAIL = 1,
};
public:
public:
JKRAramHeap(u32, u32);
virtual ~JKRAramHeap(void);
@@ -23,23 +23,15 @@ class JKRAramHeap : public JKRDisposer {
void getTotalFreeSize(void);
void dump(void);
u8 getCurrentGroupID() {
return this->mGroupId;
}
u8 getCurrentGroupID() { return this->mGroupId; }
JKRHeap* getMgrHeap() {
return this->mHeap;
}
JKRHeap* getMgrHeap() { return this->mHeap; }
void lock() {
OSLockMutex(&this->mMutex);
}
void lock() { OSLockMutex(&this->mMutex); }
void unlock() {
OSUnlockMutex(&this->mMutex);
}
void unlock() { OSUnlockMutex(&this->mMutex); }
public:
public:
OSMutex mMutex;
JKRHeap* mHeap;
u32 field_0x34;
include/JSystem/JKernel/JKRAramPiece/JKRAramPiece.h
+2 -2
View File
@@ -4,14 +4,14 @@
#include "dolphin/types.h"
class JKRAMCommand {
public:
public:
JKRAMCommand(void);
~JKRAMCommand();
};
class JKRAramBlock;
class JKRAramPiece {
public:
public:
static void prepareCommand(int, u32, u32, u32, JKRAramBlock*, void (*)(u32));
static void sendCommand(JKRAMCommand*);
include/JSystem/JKernel/JKRAramStream/JKRAramStream.h
+5 -5
View File
@@ -1,16 +1,16 @@
#ifndef __JKRARAMSTREAM_H__
#define __JKRARAMSTREAM_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRThread/JKRThread.h"
#include "JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h"
#include "JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h"
#include "dolphin/types.h"
class JKRAramStreamCommand {
public:
public:
JKRAramStreamCommand();
public:
public:
u32 field_0x00;
u32 field_0x04;
u32 field_0x08;
@@ -31,13 +31,13 @@ class JKRAramStreamCommand {
};
class JKRAramStream : public JKRThread {
private:
private:
JKRAramStream(long);
virtual ~JKRAramStream();
/* vt[03] */ void* run(void); /* override */
public:
public:
static void create(long);
static void readFromAram(void);
include/JSystem/JKernel/JKRArchive/JKRArchive.h
+22 -31
View File
@@ -1,68 +1,59 @@
#ifndef __JKRARCHIVEPUB_H__
#define __JKRARCHIVEPUB_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRFileLoader/JKRFileLoader.h"
#include "dolphin/types.h"
class JKRHeap;
class JKRDvdFile;
class JKRArchive : public JKRFileLoader {
public:
public:
class SDirEntry {};
class SDIFileEntry {};
enum EMountMode {
UNKNOWN_MOUNT_MODE = 0,
MEM = 1,
ARAM = 2,
DVD = 3,
COMP = 4,
MEM = 1,
ARAM = 2,
DVD = 3,
COMP = 4,
__EMOUNT_MODE_PADDING_FOR_32BIT = 0xFFFFFFFF
};
enum EMountDirection {
UNKNOWN_MOUNT_DIRECTION = 0,
HEAD = 1,
TAIL = 2,
HEAD = 1,
TAIL = 2,
__EMOUNT_DIRECTION_PADDING_FOR_32BIT = 0xFFFFFFFF
};
class CArcName {
public:
CArcName() {
}
CArcName(char const* data) {
this->store(data);
}
CArcName(char const** data, char endChar) {
*data = this->store(*data, endChar);
}
public:
CArcName() {}
CArcName(char const* data) { this->store(data); }
CArcName(char const** data, char endChar) { *data = this->store(*data, endChar); }
void store(char const* data);
const char* store(char const* data, char endChar);
u16 getHash() {
return mHash;
}
const char* getString() {
return mData;
}
u16 getHash() { return mHash; }
private:
const char* getString() { return mData; }
private:
u16 mHash;
u16 mLength;
char mData[64];
};
protected:
protected:
JKRArchive();
JKRArchive(long, EMountMode);
virtual ~JKRArchive();
public:
public:
bool getDirEntry(SDirEntry*, u32) const;
void getIdxResource(u32);
void getResource(unsigned short);
@@ -80,7 +71,7 @@ class JKRArchive : public JKRFileLoader {
void findPtrResource(void const*) const;
void findIdResource(unsigned short) const;
public:
public:
/* vt[04] */ virtual void becomeCurrent(char const*); /* override */
/* vt[05] */ virtual void getResource(char const*); /* override */
/* vt[06] */ virtual void getResource(u32, char const*); /* override */
@@ -93,12 +84,12 @@ class JKRArchive : public JKRFileLoader {
/* vt[13] */ virtual void countFile(char const*) const; /* override */
/* vt[14] */ virtual void getFirstFile(char const*) const; /* override */
/* vt[15] */ virtual void getExpandedResSize(void const*) const;
/* vt[16] */ virtual void fetchResource(SDIFileEntry*, u32) = 0;
/* vt[16] */ virtual void fetchResource(SDIFileEntry*, u32) = 0;
/* vt[17] */ virtual void fetchResource(void*, u32, SDIFileEntry*, u32*) = 0;
/* vt[18] */ virtual void setExpandSize(SDIFileEntry*, u32);
/* vt[19] */ virtual void getExpandSize(SDIFileEntry*) const;
private:
private:
JKRHeap* mHeap;
EMountMode mMountMode;
int mEntryNum;
@@ -113,7 +104,7 @@ class JKRArchive : public JKRFileLoader {
u32 field_0x64;
JKRDvdFile* mDvdFile;
public:
public:
static void check_mount_already(long, JKRHeap*);
static void mount(char const*, EMountMode, JKRHeap*, EMountDirection);
static void mount(void*, JKRHeap*, EMountDirection);
include/JSystem/JKernel/JKRAssertHeap/JKRAssertHeap.h
+4 -4
View File
@@ -1,15 +1,15 @@
#ifndef __JKRASSERTHEAP_H__
#define __JKRASSERTHEAP_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "dolphin/types.h"
class JKRAssertHeap : public JKRHeap {
protected:
protected:
JKRAssertHeap(void*, unsigned long, JKRHeap*, bool);
virtual ~JKRAssertHeap();
public:
public:
/* vt[04] */ virtual u32 getHeapType(void); /* override */
/* vt[05] */ virtual bool check(void); /* override */
/* vt[06] */ virtual bool dump(void); /* override */
@@ -28,7 +28,7 @@ class JKRAssertHeap : public JKRHeap {
/* vt[19] */ virtual u8 do_changeGroupID(u8 param_1); /* override */
/* vt[20] */ virtual u8 do_getCurrentGroupId(void); /* override */
public:
public:
static void create(JKRHeap*);
};
include/JSystem/JKernel/JKRCompArchive/JKRCompArchive.h
+3 -3
View File
@@ -1,11 +1,11 @@
#ifndef __JKRCOMPARCHIVE_H__
#define __JKRCOMPARCHIVE_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRArchive/JKRArchive.h"
#include "dolphin/types.h"
class JKRCompArchive : public JKRArchive {
public:
public:
JKRCompArchive(long, JKRArchive::EMountDirection);
virtual ~JKRCompArchive();
@@ -18,7 +18,7 @@ class JKRCompArchive : public JKRArchive {
/* vt[16] */ void fetchResource(JKRArchive::SDIFileEntry*, u32*); /* override */
/* vt[17] */ void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
public:
public:
};
#endif
include/JSystem/JKernel/JKRDecomp/JKRDecomp.h
+4 -4
View File
@@ -1,23 +1,23 @@
#ifndef __JKRDECOMP_H__
#define __JKRDECOMP_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRThread/JKRThread.h"
#include "dolphin/types.h"
class JKRDecompCommand {
public:
public:
JKRDecompCommand();
~JKRDecompCommand();
};
class JKRDecomp : public JKRThread {
private:
private:
JKRDecomp(long);
virtual ~JKRDecomp(void);
/* vt[03] */ virtual void* run(); /* override */
public:
public:
static void create(long);
static void prepareCommand(u8*, u8*, u32, u32, void (*)(u32));
static void sendCommand(JKRDecompCommand*);
include/JSystem/JKernel/JKRDisposer/JKRDisposer.h
+3 -3
View File
@@ -1,16 +1,16 @@
#ifndef __JKRDISPOSER_H__
#define __JKRDISPOSER_H__
#include "dolphin/types.h"
#include "JSystem/JSupport/JSUList/JSUList.h"
#include "dolphin/types.h"
class JKRHeap;
class JKRDisposer {
public:
public:
JKRDisposer();
virtual ~JKRDisposer();
public:
public:
JKRHeap* mHeap;
JSULink<JKRDisposer> mLink;
};
include/JSystem/JKernel/JKRDvdAramRipper/JKRDvdAramRipper.h
+3 -3
View File
@@ -1,19 +1,19 @@
#ifndef __JKRDVDARAMRIPPER_H__
#define __JKRDVDARAMRIPPER_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h"
#include "JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h"
#include "dolphin/types.h"
class JKRADCommand {
public:
public:
JKRADCommand();
~JKRADCommand();
};
class JKRDvdFile;
class JKRDvdAramRipper {
public:
public:
static void loadToAram(long, u32, JKRExpandSwitch, u32, u32, u32*);
static void loadToAram(JKRDvdFile*, u32, JKRExpandSwitch, u32, u32, u32*);
static void loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32, u32, u32*);
include/JSystem/JKernel/JKRDvdArchive/JKRDvdArchive.h
+7 -6
View File
@@ -1,21 +1,22 @@
#ifndef __JKRDVDARCHIVE_H__
#define __JKRDVDARCHIVE_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRArchive/JKRArchive.h"
#include "dolphin/types.h"
class JKRDvdArchive : public JKRArchive {
public:
public:
JKRDvdArchive(long, JKRArchive::EMountDirection);
virtual ~JKRDvdArchive();
void open(long);
/* vt[15] */ virtual void getExpandedResSize(void const*) const; /* override */
/* vt[16] */ virtual void fetchResource(JKRArchive::SDIFileEntry*, u32*); /* override */
/* vt[17] */ virtual void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
/* vt[15] */ virtual void getExpandedResSize(void const*) const; /* override */
/* vt[16] */ virtual void fetchResource(JKRArchive::SDIFileEntry*, u32*); /* override */
/* vt[17] */ virtual void fetchResource(void*, u32, JKRArchive::SDIFileEntry*,
u32*); /* override */
public:
public:
static void fetchResource_subroutine(long, u32, u32, u8*, u32, int, int);
static void fetchResource_subroutine(long, u32, u32, JKRHeap*, int, int, u8**);
};
include/JSystem/JKernel/JKRDvdFile/JKRDvdFile.h
+8 -15
View File
@@ -1,14 +1,14 @@
#ifndef __JKRDVDFILE_H__
#define __JKRDVDFILE_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRFile/JKRFile.h"
#include "dolphin/types.h"
#include "dvd/dvd.h"
#include "global.h"
class DVDFileInfo;
class JKRDvdFile : public JKRFile {
public:
public:
JKRDvdFile();
JKRDvdFile(char const*);
JKRDvdFile(long);
@@ -17,19 +17,13 @@ class JKRDvdFile : public JKRFile {
void initiate(void);
s32 sync(void);
int getFileID() const {
return this->mFileID << 2;
}
int getFileID() const { return this->mFileID << 2; }
const u8* getFileInfo() const {
return this->mDvdCommandBlock;
}
const u8* getFileInfo() const { return this->mDvdCommandBlock; }
int getStatus() {
return DVDGetCommandBlockStatus(&this->mDvdCommandBlock[0]);
}
int getStatus() { return DVDGetCommandBlockStatus(&this->mDvdCommandBlock[0]); }
public:
public:
/* vt[03] */ virtual bool open(char const*); /* override */
/* vt[04] */ virtual void close(void); /* override */
/* vt[05] */ virtual s32 readData(void*, long, long); /* override */
@@ -37,7 +31,7 @@ class JKRDvdFile : public JKRFile {
/* vt[07] */ virtual s32 getFileSize(void) const; /* override */
/* vt[08] */ virtual bool open(long);
private:
private:
OSMutex mMutex1;
OSMutex mMutex2;
u32 field_0x4c;
@@ -56,9 +50,8 @@ class JKRDvdFile : public JKRFile {
JSULink<JKRDvdFile> mDvdLink;
OSThread* mOSThread;
public:
public:
static void doneProcess(long, DVDFileInfo*);
};
#endif
include/JSystem/JKernel/JKRDvdRipper/JKRDvdRipper.h
+5 -3
View File
@@ -10,14 +10,16 @@ enum JKRExpandSwitch {
class JKRHeap;
class JKRDvdFile;
class JKRDvdRipper {
public:
public:
enum EAllocDirection {
};
void loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*, u32*);
void loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*,
u32*);
void loadToMainRAM(long, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*, u32*);
void loadToMainRAM(JKRDvdFile*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*, u32*);
void loadToMainRAM(JKRDvdFile*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, int*,
u32*);
void isErrorRetry(void);
};
include/JSystem/JKernel/JKRExpHeap/JKRExpHeap.h
+37 -50
View File
@@ -1,57 +1,43 @@
#ifndef __JKREXPHEAP_H__
#define __JKREXPHEAP_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "dolphin/types.h"
class JKRExpHeap : public JKRHeap {
public:
public:
class CMemBlock {
public:
public:
void initiate(CMemBlock*, CMemBlock*, u32, u8, u8);
void allocFore(u32, u8, u8, u8, u8);
void allocBack(u32, u8, u8, u8, u8);
void free(JKRExpHeap*);
void getHeapBlock(void*);
void newGroupId(u8 groupId) {
this->mGroupId = groupId;
}
void newGroupId(u8 groupId) { this->mGroupId = groupId; }
bool isValid() {
return this->mMagic == 0x484d;
}
bool isValid() { return this->mMagic == 0x484d; }
bool _isTempMemBlock() {
return (this->mFlags & 0x80) ? true : false;
}
bool _isTempMemBlock() { return (this->mFlags & 0x80) ? true : false; }
int getAlignment() const {
return this->mFlags & 0x7f;
}
int getAlignment() const { return this->mFlags & 0x7f; }
void* getContent() {
return (void*)(this + 1);
}
void* getContent() { return (void*)(this + 1); }
CMemBlock* getPrevBlock() {
return this->mPrev;
}
CMemBlock* getPrevBlock() { return this->mPrev; }
CMemBlock* getNextBlock() {
return this->mNext;
}
CMemBlock* getNextBlock() { return this->mNext; }
private:
private:
u16 mMagic;
u8 mFlags; // a|bbbbbbb a=temporary b=alignment
u8 mFlags; // a|bbbbbbb a=temporary b=alignment
u8 mGroupId;
u32 size;
CMemBlock* mPrev;
CMemBlock* mNext;
};
protected:
protected:
JKRExpHeap(void*, u32, JKRHeap*, bool);
virtual ~JKRExpHeap();
@@ -66,32 +52,33 @@ class JKRExpHeap : public JKRHeap {
void recycleFreeBlock(CMemBlock*);
void joinTwoBlocks(CMemBlock*);
public:
public:
s32 getUsedSize(u8) const;
s32 getTotalUsedSize(void) const;
public:
/* vt[04] */ virtual u32 getHeapType(); /* override */
/* vt[05] */ virtual bool check(); /* override */
/* vt[06] */ virtual void dump_sort(); /* override */
/* vt[07] */ virtual bool dump(); /* override */
/* vt[08] */ virtual void do_destroy(); /* override */
/* vt[09] */ virtual void* do_alloc(u32 size, int alignment); /* override */
/* vt[10] */ virtual void do_free(void* ptr); /* override */
/* vt[11] */ virtual void do_freeAll(); /* override */
/* vt[12] */ virtual void do_freeTail(); /* override */
/* vt[13] */ virtual void do_fillFreeArea(); /* override */
/* vt[14] */ virtual s32 do_resize(void* ptr, u32 size); /* override */
/* vt[15] */ virtual s32 do_getSize(void* ptr); /* override */
/* vt[16] */ virtual s32 do_getFreeSize(); /* override */
/* vt[17] */ virtual void* do_getMaxFreeBlock(); /* override */
/* vt[18] */ virtual s32 do_getTotalFreeSize(); /* override */
/* vt[19] */ virtual u8 do_changeGroupID(u8 param_1); /* override */
/* vt[20] */ virtual u8 do_getCurrentGroupId(); /* override */
/* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
/* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const; /* override */
public:
/* vt[04] */ virtual u32 getHeapType(); /* override */
/* vt[05] */ virtual bool check(); /* override */
/* vt[06] */ virtual void dump_sort(); /* override */
/* vt[07] */ virtual bool dump(); /* override */
/* vt[08] */ virtual void do_destroy(); /* override */
/* vt[09] */ virtual void* do_alloc(u32 size, int alignment); /* override */
/* vt[10] */ virtual void do_free(void* ptr); /* override */
/* vt[11] */ virtual void do_freeAll(); /* override */
/* vt[12] */ virtual void do_freeTail(); /* override */
/* vt[13] */ virtual void do_fillFreeArea(); /* override */
/* vt[14] */ virtual s32 do_resize(void* ptr, u32 size); /* override */
/* vt[15] */ virtual s32 do_getSize(void* ptr); /* override */
/* vt[16] */ virtual s32 do_getFreeSize(); /* override */
/* vt[17] */ virtual void* do_getMaxFreeBlock(); /* override */
/* vt[18] */ virtual s32 do_getTotalFreeSize(); /* override */
/* vt[19] */ virtual u8 do_changeGroupID(u8 param_1); /* override */
/* vt[20] */ virtual u8 do_getCurrentGroupId(); /* override */
/* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
/* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
JKRHeap::TState const&) const; /* override */
private:
private:
u32 field_0x6c;
u32 field_0x70;
u32 field_0x74;
@@ -100,7 +87,7 @@ class JKRExpHeap : public JKRHeap {
CMemBlock* mHeadUsedList;
CMemBlock* mTailUsedList;
public:
public:
static void createRoot(int, bool);
static void create(u32, JKRHeap*, bool);
static void create(void*, u32, JKRHeap*, bool);
include/JSystem/JKernel/JKRFile/JKRFile.h
+5 -7
View File
@@ -1,28 +1,26 @@
#ifndef __JKRFILE_H__
#define __JKRFILE_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
#include "dolphin/types.h"
class JKRFile : public JKRDisposer {
public:
public:
JKRFile() : mIsAvailable(false) {}
virtual ~JKRFile() {}
s32 read(void*, long, long);
bool isAvailable() {
return this->mIsAvailable;
}
bool isAvailable() { return this->mIsAvailable; }
public:
public:
/* vt[03] */ virtual bool open(const char*) = 0;
/* vt[04] */ virtual void close() = 0;
/* vt[05] */ virtual s32 readData(void*, long, long) = 0;
/* vt[06] */ virtual s32 writeData(const void*, long, long) = 0;
/* vt[07] */ virtual s32 getFileSize() const = 0;
protected:
protected:
bool mIsAvailable;
u8 field_0x19[3];
};
include/JSystem/JKernel/JKRFileCache/JKRFileCache.h
+8 -8
View File
@@ -1,17 +1,17 @@
#ifndef __JKRFILECACHE_H__
#define __JKRFILECACHE_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRFileLoader/JKRFileLoader.h"
#include "dolphin/types.h"
class JKRHeap;
class JKRFileCache : public JKRFileLoader {
public:
public:
class CCacheBlock {
public:
public:
CCacheBlock(u32, u32, void const*);
private:
private:
JSULink<CCacheBlock> mLink;
u32 field_0x10;
u32 mFileId;
@@ -19,7 +19,7 @@ class JKRFileCache : public JKRFileLoader {
void const* mMemoryPtr;
};
protected:
protected:
JKRFileCache(char const*, char const*);
virtual ~JKRFileCache();
@@ -29,7 +29,7 @@ class JKRFileCache : public JKRFileLoader {
void getDvdPathName(char const*) const;
void convStrLower(char*) const;
public:
public:
/* vt[04] */ virtual void becomeCurrent(char const*); /* override */
/* vt[05] */ virtual void getResource(char const*); /* override */
/* vt[06] */ virtual void getResource(u32, char const*); /* override */
@@ -46,14 +46,14 @@ class JKRFileCache : public JKRFileLoader {
/* vt[17] */ virtual void readFsResource(void*, u32, char const*);
/* vt[18] */ virtual void readNameResource(void*, u32, u32, char const*);
private:
private:
JKRHeap* mParentHeap;
JSUList<CCacheBlock> mCacheBlockList;
char* field_0x40;
char* field_0x4c;
char* field_0x50;
public:
public:
static void mount(char const*, JKRHeap*, char const*);
};
include/JSystem/JKernel/JKRFileFinder/JKRFileFinder.h
+10 -12
View File
@@ -11,18 +11,16 @@ struct JKRFileFinder_UnknownBase {
};
class JKRFileFinder : JKRFileFinder_UnknownBase {
public:
public:
JKRFileFinder();
virtual ~JKRFileFinder();
bool isAvailable() {
return this->mIsAvailable;
}
bool isAvailable() { return this->mIsAvailable; }
public:
public:
/* vt[3] */ virtual bool findNextFile(void) = 0;
private:
private:
bool mIsAvailable;
bool field_0x11;
u8 padding_0x12[2];
@@ -30,14 +28,14 @@ class JKRFileFinder : JKRFileFinder_UnknownBase {
class JKRArchive;
class JKRArcFinder : public JKRFileFinder {
public:
public:
JKRArcFinder(JKRArchive*, long, long);
virtual ~JKRArcFinder();
public:
public:
/* vt[3] */ virtual bool findNextFile(void); /* override */
private:
private:
JKRArchive* mArchive;
u32 field_0x18;
u32 field_0x1c;
@@ -45,14 +43,14 @@ class JKRArcFinder : public JKRFileFinder {
};
class JKRDvdFinder : public JKRFileFinder {
public:
public:
JKRDvdFinder(char const*);
virtual ~JKRDvdFinder();
public:
public:
/* vt[3] */ virtual bool findNextFile(void); /* override */
private:
private:
u8 mDvd[12];
bool mDvdIsOpen;
u8 padding_0x21[3];
include/JSystem/JKernel/JKRFileLoader/JKRFileLoader.h
+17 -21
View File
@@ -1,37 +1,33 @@
#ifndef __JKRFILELOADER_H__
#define __JKRFILELOADER_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
#include "dolphin/types.h"
class JKRFileLoader : public JKRDisposer {
public:
public:
JKRFileLoader(void);
virtual ~JKRFileLoader();
bool isMounted() {
return this->mIsMounted;
}
bool isMounted() { return this->mIsMounted; }
u32 getVolumeType() {
return this->mVolumeType;
}
u32 getVolumeType() { return this->mVolumeType; }
public:
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[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;
/* 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:
private:
JSULink<JKRFileLoader> mFileLoaderLink;
char* mVolumeName;
u32 mVolumeType;
@@ -39,7 +35,7 @@ class JKRFileLoader : public JKRDisposer {
u8 padding_0x31[3];
int mMountCount;
public:
public:
static void* getGlbResource(char const*);
static void* getGlbResource(char const*, JKRFileLoader*);
static bool removeResource(void*, JKRFileLoader*);
include/JSystem/JKernel/JKRHeap/JKRHeap.h
+37 -73
View File
@@ -1,16 +1,16 @@
#ifndef __JKRHEAP_H__
#define __JKRHEAP_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
#include "dolphin/types.h"
#include "global.h"
typedef void (*JKRErrorHandler)(void*, u32, int);
class JKRHeap : public JKRDisposer {
public:
public:
class TState {};
public:
public:
JKRHeap(void*, u32, JKRHeap*, bool);
virtual ~JKRHeap();
@@ -43,79 +43,59 @@ class JKRHeap : public JKRDisposer {
/* vt[03] */ virtual void callAllDisposer();
/* vt[04] */ virtual u32 getHeapType() = 0;
/* vt[05] */ virtual bool check() = 0;
/* vt[05] */ virtual bool check() = 0;
/* vt[06] */ virtual void dump_sort();
/* vt[07] */ virtual bool dump() = 0;
/* vt[08] */ virtual void do_destroy() = 0;
/* vt[07] */ virtual bool dump() = 0;
/* vt[08] */ virtual void do_destroy() = 0;
/* vt[09] */ virtual void* do_alloc(u32 size, int alignment) = 0;
/* vt[10] */ virtual void do_free(void* ptr) = 0;
/* vt[11] */ virtual void do_freeAll() = 0;
/* vt[12] */ virtual void do_freeTail() = 0;
/* vt[13] */ virtual void do_fillFreeArea() = 0;
/* vt[14] */ virtual s32 do_resize(void* ptr, u32 size) = 0;
/* vt[15] */ virtual s32 do_getSize(void* ptr) = 0;
/* vt[16] */ virtual s32 do_getFreeSize() = 0;
/* vt[17] */ virtual void* do_getMaxFreeBlock() = 0;
/* vt[18] */ virtual s32 do_getTotalFreeSize() = 0;
/* vt[10] */ virtual void do_free(void* ptr) = 0;
/* vt[11] */ virtual void do_freeAll() = 0;
/* vt[12] */ virtual void do_freeTail() = 0;
/* vt[13] */ virtual void do_fillFreeArea() = 0;
/* vt[14] */ virtual s32 do_resize(void* ptr, u32 size) = 0;
/* vt[15] */ virtual s32 do_getSize(void* ptr) = 0;
/* vt[16] */ virtual s32 do_getFreeSize() = 0;
/* vt[17] */ virtual void* do_getMaxFreeBlock() = 0;
/* vt[18] */ virtual s32 do_getTotalFreeSize() = 0;
/* vt[19] */ virtual u8 do_changeGroupID(u8 param_1);
/* vt[20] */ virtual u8 do_getCurrentGroupId();
/* vt[21] */ virtual void state_register(JKRHeap::TState*, unsigned long) const;
/* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const;
/* vt[23] */ virtual void state_dump();
void setDebugFill(bool debugFill) {
this->mDebugFill = debugFill;
}
void setDebugFill(bool debugFill) { this->mDebugFill = debugFill; }
void* getStartAddr() const {
return (void*)mStart;
}
void* getStartAddr() const { return (void*)mStart; }
void* getEndAddr() const {
return (void*)mEnd;
}
void* getEndAddr() const { return (void*)mEnd; }
u32 getSize() const {
return mSize;
}
u32 getSize() const { return mSize; }
bool getErrorFlag() {
return mErrorFlag;
}
bool getErrorFlag() { return mErrorFlag; }
JKRHeap* getParent() {
JSUTree<JKRHeap>* parent = this->mChildTree.getParent();
return parent->getObject();
}
JSUTree<JKRHeap>& getHeapTree() {
return this->mChildTree;
}
JSUTree<JKRHeap>& getHeapTree() { return this->mChildTree; }
void appendDisposer(JKRDisposer* disposer) {
mDisposerList.append(&disposer->mLink);
}
void appendDisposer(JKRDisposer* disposer) { mDisposerList.append(&disposer->mLink); }
void removeDisposer(JKRDisposer* disposer) {
mDisposerList.remove(&disposer->mLink);
}
void removeDisposer(JKRDisposer* disposer) { mDisposerList.remove(&disposer->mLink); }
void lock() {
OSLockMutex(&this->mMutex);
}
void lock() { OSLockMutex(&this->mMutex); }
void unlock() {
OSUnlockMutex(&this->mMutex);
}
void unlock() { OSUnlockMutex(&this->mMutex); }
protected:
protected:
OSMutex mMutex;
u32 mStart;
u32 mEnd;
u32 mSize;
bool mDebugFill;
bool mCheckMemoryFilled;
u8 mAllocationMode; // EAllocMode?
u8 mAllocationMode; // EAllocMode?
u8 mGroupId;
JSUTree<JKRHeap> mChildTree;
JSUList<JKRDisposer> mDisposerList;
@@ -123,7 +103,7 @@ class JKRHeap : public JKRDisposer {
bool mInitFlag;
u8 padding_0x6a[2];
public:
public:
static bool initArena(char**, u32*, int);
static void* alloc(u32 size, int alignment, JKRHeap* heap);
static void free(void* ptr, JKRHeap* heap);
@@ -132,43 +112,27 @@ class JKRHeap : public JKRDisposer {
static JKRHeap* findFromRoot(void* ptr);
static void copyMemory(void* dst, void* src, u32 size);
static void fillMemory(void* dst, u32 size, u8 value); // NOTE: never used
static void fillMemory(void* dst, u32 size, u8 value); // NOTE: never used
static bool checkMemoryFilled(void* src, u32 size, u8 value);
static void JKRDefaultMemoryErrorRoutine(JKRHeap* heap, u32 size, int alignment);
static JKRErrorHandler setErrorHandler(JKRErrorHandler error_handler);
static void* getCodeStart(void) {
return lbl_80451384;
}
static void* getCodeStart(void) { return lbl_80451384; }
static void* getCodeEnd(void) {
return lbl_80451388;
}
static void* getCodeEnd(void) { return lbl_80451388; }
static void* getUserRamStart(void) {
return lbl_8045138C;
}
static void* getUserRamStart(void) { return lbl_8045138C; }
static void* getUserRamEnd(void) {
return lbl_80451390;
}
static void* getUserRamEnd(void) { return lbl_80451390; }
static u32 getMemorySize(void) {
return lbl_80451394;
}
static u32 getMemorySize(void) { return lbl_80451394; }
static JKRHeap* getRootHeap() {
return lbl_80451378;
}
static JKRHeap* getRootHeap() { return lbl_80451378; }
static JKRHeap* getSystemHeap() {
return lbl_80451370;
}
static JKRHeap* getSystemHeap() { return lbl_80451370; }
static JKRHeap* getCurrentHeap() {
return lbl_80451374;
}
static JKRHeap* getCurrentHeap() { return lbl_80451374; }
};
void* operator new(u32 size);
include/JSystem/JKernel/JKRMemArchive/JKRMemArchive.h
+3 -3
View File
@@ -1,15 +1,15 @@
#ifndef __JKRMEMARCHIVE_H__
#define __JKRMEMARCHIVE_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRArchive/JKRArchive.h"
#include "dolphin/types.h"
enum JKRMemBreakFlag {
_JKRMemBreakFlag_PADDING_32BIT = 0xFFFFFFFF,
};
class JKRMemArchive : public JKRArchive {
public:
public:
JKRMemArchive(long, JKRArchive::EMountDirection);
JKRMemArchive(void*, u32, JKRMemBreakFlag);
virtual ~JKRMemArchive();
@@ -24,7 +24,7 @@ class JKRMemArchive : public JKRArchive {
/* vt[16] */ void fetchResource(JKRArchive::SDIFileEntry*, u32*); /* override */
/* vt[17] */ void fetchResource(void*, u32, JKRArchive::SDIFileEntry*, u32*); /* override */
public:
public:
static void fetchResource_subroutine(u8*, u32, u8*, u32, int);
};
include/JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h
+24 -23
View File
@@ -1,11 +1,11 @@
#ifndef __JKRSOLIDHEAP_H__
#define __JKRSOLIDHEAP_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "dolphin/types.h"
class JKRSolidHeap : public JKRHeap {
protected:
protected:
JKRSolidHeap(void*, u32, JKRHeap*, bool);
virtual ~JKRSolidHeap(void);
@@ -13,33 +13,34 @@ class JKRSolidHeap : public JKRHeap {
void allocFromHead(u32, int);
void allocFromTail(u32, int);
public:
/* vt[04] */ virtual u32 getHeapType(void); /* override */
/* vt[05] */ virtual bool check(void); /* override */
/* vt[07] */ virtual bool dump(void); /* override */
/* vt[08] */ virtual void do_destroy(void); /* override */
/* vt[09] */ virtual void* do_alloc(u32, int); /* override */
/* vt[10] */ virtual void do_free(void*); /* override */
/* vt[11] */ virtual void do_freeAll(void); /* override */
/* vt[12] */ virtual void do_freeTail(void); /* override */
/* vt[13] */ virtual void do_fillFreeArea(void); /* override */
/* vt[14] */ virtual s32 do_resize(void*, u32); /* override */
/* vt[15] */ virtual s32 do_getSize(void*); /* override */
/* vt[16] */ virtual s32 do_getFreeSize(void); /* override */
/* vt[17] */ virtual void* do_getMaxFreeBlock(void); /* override */
/* vt[18] */ virtual s32 do_getTotalFreeSize(void); /* override */
/* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
/* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, JKRHeap::TState const&) const; /* override */
public:
/* vt[04] */ virtual u32 getHeapType(void); /* override */
/* vt[05] */ virtual bool check(void); /* override */
private:
/* vt[07] */ virtual bool dump(void); /* override */
/* vt[08] */ virtual void do_destroy(void); /* override */
/* vt[09] */ virtual void* do_alloc(u32, int); /* override */
/* vt[10] */ virtual void do_free(void*); /* override */
/* vt[11] */ virtual void do_freeAll(void); /* override */
/* vt[12] */ virtual void do_freeTail(void); /* override */
/* vt[13] */ virtual void do_fillFreeArea(void); /* override */
/* vt[14] */ virtual s32 do_resize(void*, u32); /* override */
/* vt[15] */ virtual s32 do_getSize(void*); /* override */
/* vt[16] */ virtual s32 do_getFreeSize(void); /* override */
/* vt[17] */ virtual void* do_getMaxFreeBlock(void); /* override */
/* vt[18] */ virtual s32 do_getTotalFreeSize(void); /* override */
/* vt[21] */ virtual void state_register(JKRHeap::TState*, u32) const; /* override */
/* vt[22] */ virtual bool state_compare(JKRHeap::TState const&,
JKRHeap::TState const&) const; /* override */
private:
u32 mFreeSize;
void* mSolidStart;
void* mSolidEnd;
u32 field_0x78;
public:
public:
static void create(u32, JKRHeap*, bool);
};
include/JSystem/JKernel/JKRThread/JKRThread.h
+8 -12
View File
@@ -1,15 +1,15 @@
#ifndef __JKRTHREAD_H__
#define __JKRTHREAD_H__
#include "dolphin/types.h"
#include "JSystem/JKernel/JKRDisposer/JKRDisposer.h"
#include "dolphin/types.h"
#include "global.h"
class JKRThreadName_;
class JUTConsole;
class JKRHeap;
class JKRThread : JKRDisposer {
public:
public:
JKRThread(u32 stack_size, int message_count, int param_3);
JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param_4);
JKRThread(OSThread* thread, int message_count);
@@ -20,11 +20,9 @@ class JKRThread : JKRDisposer {
void setCommon_mesgQueue(JKRHeap* heap, int message_count);
void setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3);
OSThread* getThreadRecord() {
return this->mOSThread;
}
OSThread* getThreadRecord() { return this->mOSThread; }
private:
private:
JSULink<JKRThread> mThreadListLink;
JKRHeap* mHeap;
OSThread* mOSThread;
@@ -42,16 +40,14 @@ class JKRThread : JKRDisposer {
JKRHeap* field_0x74;
JKRHeap* field_0x78;
public:
public:
static void* start(void* param_1);
static JKRThread* searchThread(OSThread* thread);
static JSUList<JKRThread>* getList() {
return &lbl_8043428C;
}
static JSUList<JKRThread>* getList() { return &lbl_8043428C; }
};
class JKRThreadSwitch {
public:
public:
JKRThreadSwitch(JKRHeap*);
virtual ~JKRThreadSwitch();
@@ -62,7 +58,7 @@ class JKRThreadSwitch {
void draw(JKRThreadName_* param_1, JUTConsole* param_2);
void draw(JKRThreadName_* param_1);
public:
public:
JKRHeap* heap;
u8 field_0x8[4];
u32 field_0xC[2];
include/JSystem/JMessage/control/control.h
+1 -4
View File
@@ -3,10 +3,7 @@
#include "dolphin/types.h"
// this may actually go somewhere else, but defining it here for now
class JMSMesgEntry_c {
};
class JMSMesgEntry_c {};
#endif
include/JSystem/JSupport/JSUFileInputStream/JSUFileInputStream.h
+1 -2
View File
@@ -4,9 +4,8 @@
#include "dolphin/types.h"
class JSUFileInputStream {
public:
public:
virtual ~JSUFileInputStream();
};
#endif
include/JSystem/JSupport/JSUList/JSUList.h
+60 -137
View File
@@ -9,27 +9,19 @@
class JSUPtrList;
class JSUPtrLink {
public:
public:
JSUPtrLink(void* object);
~JSUPtrLink();
void* getObjectPtr() const {
return mObject;
}
void* getObjectPtr() const { return mObject; }
JSUPtrList* getList() const {
return mList;
}
JSUPtrList* getList() const { return mList; }
JSUPtrLink* getNext() const {
return mNext;
}
JSUPtrLink* getNext() const { return mNext; }
JSUPtrLink* getPrev() const {
return mPrev;
}
JSUPtrLink* getPrev() const { return mPrev; }
public:
public:
void* mObject;
JSUPtrList* mList;
JSUPtrLink* mPrev;
@@ -38,21 +30,14 @@ class JSUPtrLink {
template <typename T>
class JSULink : public JSUPtrLink {
public:
JSULink(T* object) : JSUPtrLink((void*)object) {
}
public:
JSULink(T* object) : JSUPtrLink((void*)object) {}
T* getObject() const {
return (T*)getObjectPtr();
}
T* getObject() const { return (T*)getObjectPtr(); }
JSULink<T>* getNext() const {
return (JSULink<T>*)this->JSUPtrLink::getNext();
}
JSULink<T>* getNext() const { return (JSULink<T>*)this->JSUPtrLink::getNext(); }
JSULink<T>* getPrev() const {
return (JSULink<T>*)this->JSUPtrLink::getPrev();
}
JSULink<T>* getPrev() const { return (JSULink<T>*)this->JSUPtrLink::getPrev(); }
};
//
@@ -60,10 +45,8 @@ class JSULink : public JSUPtrLink {
//
class JSUPtrList {
public:
JSUPtrList() {
this->initiate();
}
public:
JSUPtrList() { this->initiate(); }
JSUPtrList(bool init);
~JSUPtrList();
@@ -76,19 +59,13 @@ class JSUPtrList {
bool remove(JSUPtrLink* ptr);
JSUPtrLink* getNthLink(u32 i) const;
JSUPtrLink* getFirstLink() const {
return mHead;
}
JSUPtrLink* getFirstLink() const { return mHead; }
JSUPtrLink* getLastLink() const {
return mTail;
}
JSUPtrLink* getLastLink() const { return mTail; }
u32 getNumLinks() const {
return mLength;
}
u32 getNumLinks() const { return mLength; }
private:
private:
JSUPtrLink* mHead;
JSUPtrLink* mTail;
u32 mLength;
@@ -96,84 +73,55 @@ class JSUPtrList {
template <typename T>
class JSUList : protected JSUPtrList {
public:
JSUList() : JSUPtrList() {
}
public:
JSUList() : JSUPtrList() {}
JSUList(bool init) : JSUPtrList(init) {
}
JSUList(bool init) : JSUPtrList(init) {}
bool append(JSULink<T>* link) {
return this->JSUPtrList::append((JSUPtrLink*)link);
}
bool append(JSULink<T>* link) { return this->JSUPtrList::append((JSUPtrLink*)link); }
bool prepend(JSULink<T>* link) {
return this->JSUPtrList::prepend((JSUPtrLink*)link);
}
bool prepend(JSULink<T>* link) { return this->JSUPtrList::prepend((JSUPtrLink*)link); }
bool insert(JSULink<T>* before, JSULink<T>* link) {
return this->JSUPtrList::insert((JSUPtrLink*)before, (JSUPtrLink*)link);
}
bool remove(JSULink<T>* link) {
return this->JSUPtrList::remove((JSUPtrLink*)link);
}
bool remove(JSULink<T>* link) { return this->JSUPtrList::remove((JSUPtrLink*)link); }
JSULink<T>* getFirst() const {
return (JSULink<T>*)getFirstLink();
}
JSULink<T>* getFirst() const { return (JSULink<T>*)getFirstLink(); }
JSULink<T>* getLast() const {
return (JSULink<T>*)getLastLink();
}
JSULink<T>* getLast() const { return (JSULink<T>*)getLastLink(); }
JSULink<T>* getEnd() const {
return NULL;
}
JSULink<T>* getEnd() const { return NULL; }
u32 getNumLinks() const {
return this->JSUPtrList::getNumLinks();
}
u32 getNumLinks() const { return this->JSUPtrList::getNumLinks(); }
};
template <typename T>
class JSUListIterator {
public:
JSUListIterator() : mLink() {
}
JSUListIterator(JSULink<T>* link) : mLink(link) {
}
JSUListIterator(JSUList<T>* list) : mLink(list->getFirst()) {
}
public:
JSUListIterator() : mLink() {}
JSUListIterator(JSULink<T>* link) : mLink(link) {}
JSUListIterator(JSUList<T>* list) : mLink(list->getFirst()) {}
JSUListIterator<T>& operator=(JSULink<T>* link) {
this->mLink = link;
return *this;
}
T* getObject() {
return this->mLink->getObject();
}
T* getObject() { return this->mLink->getObject(); }
bool operator==(JSULink<T> const* other) const {
return this->mLink == other;
}
bool operator==(JSULink<T> const* other) const { return this->mLink == other; }
bool operator!=(JSULink<T> const* other) const {
return this->mLink != other;
}
bool operator!=(JSULink<T> const* other) const { return this->mLink != other; }
bool operator==(JSUListIterator<T> const& other) const {
return this->mLink == other.mLink;
}
bool operator==(JSUListIterator<T> const& other) const { return this->mLink == other.mLink; }
bool operator!=(JSUListIterator<T> const& other) const {
return this->mLink != other.other;
}
bool operator!=(JSUListIterator<T> const& other) const { return this->mLink != other.other; }
JSUListIterator<T> operator++(int) {
JSUListIterator<T> prev = *this;
this->mLink = this->mLink->getNext();
this->mLink = this->mLink->getNext();
return prev;
}
@@ -182,15 +130,11 @@ class JSUListIterator {
return *this;
}
T& operator*() {
return *this->getObject();
}
T& operator*() { return *this->getObject(); }
T* operator->() {
return this->getObject();
}
T* operator->() { return this->getObject(); }
private:
private:
JSULink<T>* mLink;
};
@@ -199,18 +143,17 @@ class JSUListIterator {
//
#define JSU_TREE_FROM_LINK(T, LINK) (JSUTree<T>*)(((u8*)(LINK)) - 12)
#define JSU_TREE_LINK_IF_NOT_NULL(TREE) \
if (TREE) { \
TREE = (JSUTree<T>*)(&(TREE)->mLink); \
#define JSU_TREE_LINK_IF_NOT_NULL(TREE) \
if (TREE) { \
TREE = (JSUTree<T>*)(&(TREE)->mLink); \
}
#define _JSU_TREE_AS_LINK(TREE) ((JSULink<T>*)(TREE))
template <typename T>
class JSUTree {
public:
JSUTree(T* owner) : mList(), mLink(owner) {
}
public:
JSUTree(T* owner) : mList(), mLink(owner) {}
bool appendChild(JSUTree<T>* child) {
JSU_TREE_LINK_IF_NOT_NULL(child);
@@ -228,9 +171,7 @@ class JSUTree {
return this->mList.insert(_JSU_TREE_AS_LINK(before), _JSU_TREE_AS_LINK(child));
}
JSUTree<T>* getEndChild() const {
return NULL;
}
JSUTree<T>* getEndChild() const { return NULL; }
JSUTree<T>* getFirstChild() const {
JSULink<T>* link = this->mList.getFirst();
@@ -252,51 +193,37 @@ class JSUTree {
return link ? JSU_TREE_FROM_LINK(T, link) : (JSUTree<T>*)link;
}
u32 getNumChildren() const {
return this->mList.getNumLinks();
}
u32 getNumChildren() const { return this->mList.getNumLinks(); }
T* getObject() const {
return this->mLink.getObject();
}
T* getObject() const { return this->mLink.getObject(); }
JSUTree<T>* getParent() const {
return (JSUTree<T>*)this->mLink.getList();
}
JSUTree<T>* getParent() const { return (JSUTree<T>*)this->mLink.getList(); }
private:
private:
JSUList<T> mList;
JSULink<T> mLink;
};
template <typename T>
class JSUTreeIterator {
public:
JSUTreeIterator() : mTree(NULL) {
}
JSUTreeIterator(JSUTree<T>* tree) : mTree(tree) {
}
public:
JSUTreeIterator() : mTree(NULL) {}
JSUTreeIterator(JSUTree<T>* tree) : mTree(tree) {}
JSUTreeIterator<T>& operator=(JSUTree<T>* tree) {
this->mTree = tree;
return *this;
}
T* getObject() {
return this->mTree->getObject();
}
T* getObject() { return this->mTree->getObject(); }
bool operator==(JSUTree<T>* other) {
return this->mTree == other;
}
bool operator==(JSUTree<T>* other) { return this->mTree == other; }
bool operator!=(JSUTree<T>* other) {
return this->mTree != other;
}
bool operator!=(JSUTree<T>* other) { return this->mTree != other; }
JSUTreeIterator<T> operator++(int) {
JSUTreeIterator<T> prev = *this;
this->mTree = this->mTree->getNextChild();
this->mTree = this->mTree->getNextChild();
return prev;
}
@@ -305,15 +232,11 @@ class JSUTreeIterator {
return *this;
}
T& operator*() {
return *this->getObject();
}
T& operator*() { return *this->getObject(); }
T* operator->() {
return this->getObject();
}
T* operator->() { return this->getObject(); }
private:
private:
JSUTree<T>* mTree;
};
include/JSystem/JSupport/JSURandomInputStream/JSURandomInputStream.h
+1 -2
View File
@@ -4,9 +4,8 @@
#include "dolphin/types.h"
class JSURandomInputStream {
public:
public:
void getAvailable(void) const;
};
#endif
include/JSystem/JUtility/JUTFont/JUTFont.h
+5 -8
View File
@@ -9,13 +9,9 @@ static const unsigned int CLR_BLACK = 0;
typedef const char* ResFONT;
struct TColor {
TColor() {
*(u32*)&r = 0xFFFFFFFF;
}
TColor() { *(u32*)&r = 0xFFFFFFFF; }
TColor(u32 raw) {
*(u32*)&r = raw;
}
TColor(u32 raw) { *(u32*)&r = raw; }
u32 Raw() { return *(u32*)&r; }
@@ -29,7 +25,7 @@ class JUTFont {
public:
JUTFont();
virtual ~JUTFont();
struct TWidth {};
virtual void setGX() = 0;
@@ -51,7 +47,8 @@ public:
void initialize_state();
void setCharColor(TColor col1);
void setGradColor(TColor col1, TColor col2);
float drawString_size_scale(float a1, float a2, float a3, float a4, char* a5, unsigned long usz, bool a7);
float drawString_size_scale(float a1, float a2, float a3, float a4, char* a5, unsigned long usz,
bool a7);
bool unk4;
bool unk5;
include/JSystem/JUtility/JUTResFont.h
+3 -4
View File
@@ -1,15 +1,15 @@
#ifndef JSYSTEM_JUTILITY_JUT_RES_FONT
#define JSYSTEM_JUTILITY_JUT_RES_FONT
#define JSYSTEM_JUTILITY_JUT_RES_FONT
#include "JSystem/JUtility/JUTFont/JUTFont.h"
#include "JSystem/JKernel/JKRHeap/JKRHeap.h"
#include "JSystem/JUtility/JUTFont/JUTFont.h"
class JUTResFont : JUTFont {
public:
JUTResFont();
JUTResFont(ResFONT font, JKRHeap* heap);
~JUTResFont();
struct Unknown {
struct Unknown2 {
u32 filler0;
@@ -54,5 +54,4 @@ public:
bool (**unk6C)(s32 a1);
};
#endif // JSYSTEM_JUTILITY_JUT_RES_FONT
include/JSystem/JUtility/JUTXfb/JUTXfb.h
+2 -1
View File
@@ -6,8 +6,9 @@
class JUTXfb {
public:
void clearIndex();
private:
void * xfb_buffer[3];
void* xfb_buffer[3];
bool is_xfb_allocated[3];
u8 padding_1;
s32 num_xfbs;