mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-02 16:47:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Annotate all data with DUSK_GAME_DATA (#2214)

Browse Source 
The hope of auto-importing data via lld MinGW
+ pseudo_reloc is now dead thanks to ARM64,
so I just wrote a script to go annotate every
exported data symbol in the game instead.
This commit is contained in:
Luke Street
2026-07-14 13:49:21 -06:00
committed by GitHub
parent f5d30a886d
commit eed14acdc6
843 changed files with 4817 additions and 4821 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/include/JSystem/JKernel/JKRAram.h
+5 -5
View File
@@ -65,13 +65,13 @@ public:
static u32 getSZSBufferSize() { return sSZSBufferSize; }
static void setSZSBufferSize(u32 size) { sSZSBufferSize = size; }
static OSMessageQueue sMessageQueue;
static DUSK_GAME_DATA OSMessageQueue sMessageQueue;
private:
static JKRAram* sAramObject;
static u32 sSZSBufferSize;
static OSMessage sMessageBuffer[4];
static JSUList<JKRAMCommand> sAramCommandList;
static DUSK_GAME_DATA JKRAram* sAramObject;
static DUSK_GAME_DATA u32 sSZSBufferSize;
static DUSK_GAME_DATA OSMessage sMessageBuffer[4];
static DUSK_GAME_DATA JSUList<JKRAMCommand> sAramCommandList;
};
inline JKRAramBlock* JKRAllocFromAram(u32 size, JKRAramHeap::EAllocMode allocMode) {
libs/JSystem/include/JSystem/JKernel/JKRAramHeap.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
};
public:
static JSUList<JKRAramBlock> sAramList;
static DUSK_GAME_DATA JSUList<JKRAramBlock> sAramList;
JKRAramHeap(u32, u32);
virtual ~JKRAramHeap();
libs/JSystem/include/JSystem/JKernel/JKRAramPiece.h
+2 -2
View File
@@ -62,9 +62,9 @@ struct JKRAramCommand {
*/
class JKRAramPiece {
public:
static OSMutex mMutex;
static DUSK_GAME_DATA OSMutex mMutex;
// TODO: fix type
static JSUList<JKRAMCommand> sAramPieceCommandList;
static DUSK_GAME_DATA JSUList<JKRAMCommand> sAramPieceCommandList;
public:
static JKRAMCommand* prepareCommand(int, uintptr_t, uintptr_t, u32, JKRAramBlock*,
libs/JSystem/include/JSystem/JKernel/JKRAramStream.h
+6 -6
View File
@@ -60,13 +60,13 @@ public:
static void setTransBuffer(u8*, u32, JKRHeap*);
private:
static JKRAramStream* sAramStreamObject;
static OSMessage sMessageBuffer[4];
static OSMessageQueue sMessageQueue;
static DUSK_GAME_DATA JKRAramStream* sAramStreamObject;
static DUSK_GAME_DATA OSMessage sMessageBuffer[4];
static DUSK_GAME_DATA OSMessageQueue sMessageQueue;
static u8* transBuffer;
static u32 transSize;
static JKRHeap* transHeap;
static DUSK_GAME_DATA u8* transBuffer;
static DUSK_GAME_DATA u32 transSize;
static DUSK_GAME_DATA JKRHeap* transHeap;
};
inline JKRAramStream* JKRCreateAramStreamManager(s32 priority) {
libs/JSystem/include/JSystem/JKernel/JKRArchive.h
+1 -1
View File
@@ -242,7 +242,7 @@ public:
static void setCurrentDirID(u32 dirID) { sCurrentDirID = dirID; }
protected:
static u32 sCurrentDirID;
static DUSK_GAME_DATA u32 sCurrentDirID;
};
inline JKRCompression JKRConvertAttrToCompressionType(int attr) {
libs/JSystem/include/JSystem/JKernel/JKRDecomp.h
+3 -3
View File
@@ -61,9 +61,9 @@ public:
static void decodeSZS(u8*, u8*, u32, u32);
static JKRCompression checkCompressed(u8*);
static JKRDecomp* sDecompObject;
static OSMessage sMessageBuffer[8];
static OSMessageQueue sMessageQueue;
static DUSK_GAME_DATA JKRDecomp* sDecompObject;
static DUSK_GAME_DATA OSMessage sMessageBuffer[8];
static DUSK_GAME_DATA OSMessageQueue sMessageQueue;
};
inline void JKRDecompress(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLength) {
libs/JSystem/include/JSystem/JKernel/JKRDvdAramRipper.h
+3 -3
View File
@@ -55,9 +55,9 @@ public:
static bool isErrorRetry() { return errorRetry; }
// TODO: fix type
static JSUList<JKRADCommand> sDvdAramAsyncList;
static u32 sSZSBufferSize;
static bool errorRetry;
static DUSK_GAME_DATA JSUList<JKRADCommand> sDvdAramAsyncList;
static DUSK_GAME_DATA u32 sSZSBufferSize;
static DUSK_GAME_DATA bool errorRetry;
};
inline JKRAramBlock *JKRDvdToAram(s32 entrynum, u32 p2, JKRExpandSwitch expSwitch, u32 p4, u32 p5, u32 *p6) {
libs/JSystem/include/JSystem/JKernel/JKRDvdFile.h
+1 -1
View File
@@ -62,7 +62,7 @@ public:
static JSUList<JKRDvdFile>& getDvdList() { return sDvdList; }
private:
static JSUList<JKRDvdFile> sDvdList;
static DUSK_GAME_DATA JSUList<JKRDvdFile> sDvdList;
};
#endif /* JKRDVDFILE_H */
libs/JSystem/include/JSystem/JKernel/JKRDvdRipper.h
+4 -4
View File
@@ -33,11 +33,11 @@ class JKRDvdFile;
*/
class JKRDvdRipper {
public:
static JSUList<JKRDMCommand> sDvdAsyncList;
static u32 sSZSBufferSize;
static bool errorRetry;
static DUSK_GAME_DATA JSUList<JKRDMCommand> sDvdAsyncList;
static DUSK_GAME_DATA u32 sSZSBufferSize;
static DUSK_GAME_DATA bool errorRetry;
#if TARGET_PC
static JKRHeap* sHeap;
static DUSK_GAME_DATA JKRHeap* sHeap;
#endif
enum EAllocDirection {
libs/JSystem/include/JSystem/JKernel/JKRFileLoader.h
+2 -2
View File
@@ -53,8 +53,8 @@ public:
static void setCurrentVolume(JKRFileLoader* fileLoader) { sCurrentVolume = fileLoader; }
static JSUList<JKRFileLoader>& getVolumeList() { return sVolumeList; }
static JKRFileLoader* sCurrentVolume;
static JSUList<JKRFileLoader> sVolumeList;
static DUSK_GAME_DATA JKRFileLoader* sCurrentVolume;
static DUSK_GAME_DATA JSUList<JKRFileLoader> sVolumeList;
};
inline bool JKRDetachResource(void* resource, JKRFileLoader* fileLoader) {
libs/JSystem/include/JSystem/JKernel/JKRHeap.h
+17 -17
View File
@@ -11,12 +11,12 @@
class JKRHeap;
typedef void (*JKRErrorHandler)(void*, u32, int);
extern u8 JKRValue_DEBUGFILL_NOTUSE;
extern u8 JKRValue_DEBUGFILL_NEW;
extern u8 JKRValue_DEBUGFILL_DELETE;
DUSK_GAME_EXTERN u8 JKRValue_DEBUGFILL_NOTUSE;
DUSK_GAME_EXTERN u8 JKRValue_DEBUGFILL_NEW;
DUSK_GAME_EXTERN u8 JKRValue_DEBUGFILL_DELETE;
extern s32 fillcheck_dispcount;
extern bool data_8074A8D0_debug;
DUSK_GAME_EXTERN s32 fillcheck_dispcount;
DUSK_GAME_EXTERN bool data_8074A8D0_debug;
#if BIT_64
#define MEM_BLOCK_SIZE 0x20
@@ -194,26 +194,26 @@ public:
}
static void* getState_buf_(TState* state) { return &state->mBuf; }
static void* mCodeStart;
static void* mCodeEnd;
static void* mUserRamStart;
static void* mUserRamEnd;
static u32 mMemorySize;
static JKRAllocCallback sAllocCallback;
static JKRFreeCallback sFreeCallback;
static DUSK_GAME_DATA void* mCodeStart;
static DUSK_GAME_DATA void* mCodeEnd;
static DUSK_GAME_DATA void* mUserRamStart;
static DUSK_GAME_DATA void* mUserRamEnd;
static DUSK_GAME_DATA u32 mMemorySize;
static DUSK_GAME_DATA JKRAllocCallback sAllocCallback;
static DUSK_GAME_DATA JKRFreeCallback sFreeCallback;
static bool sDefaultFillFlag;
static DUSK_GAME_DATA bool sDefaultFillFlag;
static JKRHeap* sRootHeap;
static DUSK_GAME_DATA JKRHeap* sRootHeap;
static JKRHeap* sRootHeap2;
static DUSK_GAME_DATA JKRHeap* sRootHeap2;
static JKRHeap* sSystemHeap;
static DUSK_GAME_DATA JKRHeap* sSystemHeap;
#if !TARGET_PC // Hide sCurrentHeap, we need to make it thread local.
static JKRHeap* sCurrentHeap;
#endif
static JKRErrorHandler mErrorHandler;
static DUSK_GAME_DATA JKRErrorHandler mErrorHandler;
#if TARGET_PC
void setName(const char* name);
libs/JSystem/include/JSystem/JKernel/JKRThread.h
+9 -9
View File
@@ -141,7 +141,7 @@ public:
static JKRThread* searchThread(OSThread* thread);
static JSUList<JKRThread>& getList() { return (JSUList<JKRThread>&)sThreadList; }
static JSUList<JKRThread> sThreadList;
static DUSK_GAME_DATA JSUList<JKRThread> sThreadList;
// static u8 sThreadList[12];
#if TARGET_PC
@@ -155,7 +155,7 @@ public:
virtual ~JKRIdleThread() { sThread = NULL; }
virtual void* run() { while (true); }
static void* sThread;
static DUSK_GAME_DATA void* sThread;
};
typedef void (*JKRThreadSwitch_PreCallback)(OSThread* current, OSThread* next);
@@ -181,11 +181,11 @@ public:
static u32 getTotalCount() { return sTotalCount; }
private:
static JKRThreadSwitch* sManager;
static u32 sTotalCount;
static u64 sTotalStart;
static JKRThreadSwitch_PreCallback mUserPreCallback;
static JKRThreadSwitch_PostCallback mUserPostCallback;
static DUSK_GAME_DATA JKRThreadSwitch* sManager;
static DUSK_GAME_DATA u32 sTotalCount;
static DUSK_GAME_DATA u64 sTotalStart;
static DUSK_GAME_DATA JKRThreadSwitch_PreCallback mUserPreCallback;
static DUSK_GAME_DATA JKRThreadSwitch_PostCallback mUserPostCallback;
private:
/* 0x00 */ // vtable
@@ -207,8 +207,8 @@ public:
int check();
static JSUList<JKRTask> sTaskList;
static u8 sEndMesgQueue[32];
static DUSK_GAME_DATA JSUList<JKRTask> sTaskList;
static DUSK_GAME_DATA u8 sEndMesgQueue[32];
/* 0x7C */ JSULink<JKRTask> mTaskLink;
/* 0x8C */ u8 field_0x8c[0x94 - 0x8C];