mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-03 08:57:00 -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/src/JKernel/JKRAram.cpp
+5 -5
View File
@@ -27,7 +27,7 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32
u32 offset, u32* resourceSize);
int decompSZS_subroutine(u8* src, u8* dest);
JKRAram* JKRAram::sAramObject;
DUSK_GAME_DATA JKRAram* JKRAram::sAramObject;
JKRAram* JKRAram::create(u32 aram_audio_buffer_size, u32 aram_audio_graph_size, s32 stream_priority,
s32 decomp_priority, s32 piece_priority) {
@@ -48,14 +48,14 @@ void JKRAram::destroy() {
}
#endif
OSMessage JKRAram::sMessageBuffer[4] = {
DUSK_GAME_DATA OSMessage JKRAram::sMessageBuffer[4] = {
NULL,
NULL,
NULL,
NULL,
};
OSMessageQueue JKRAram::sMessageQueue = {0};
DUSK_GAME_DATA OSMessageQueue JKRAram::sMessageQueue = {0};
JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority)
: JKRThread(stack_size, 0x10, priority) {
@@ -279,11 +279,11 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS
}
}
JSUList<JKRAMCommand> JKRAram::sAramCommandList;
DUSK_GAME_DATA JSUList<JKRAMCommand> JKRAram::sAramCommandList;
static OSMutex decompMutex;
u32 JKRAram::sSZSBufferSize = 0x00000400;
DUSK_GAME_DATA u32 JKRAram::sSZSBufferSize = 0x00000400;
static u8* szpBuf;
libs/JSystem/src/JKernel/JKRAramHeap.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include <climits>
#include "os_report.h"
JSUList<JKRAramBlock> JKRAramHeap::sAramList;
DUSK_GAME_DATA JSUList<JKRAramBlock> JKRAramHeap::sAramList;
JKRAramHeap::JKRAramHeap(u32 startAddress, u32 size) {
OSInitMutex(&mMutex);
libs/JSystem/src/JKernel/JKRAramPiece.cpp
+3 -3
View File
@@ -23,12 +23,12 @@ void JKRAramPiece::sendCommand(JKRAMCommand* command) {
startDMA(command);
}
JSUList<JKRAMCommand> JKRAramPiece::sAramPieceCommandList;
DUSK_GAME_DATA JSUList<JKRAMCommand> JKRAramPiece::sAramPieceCommandList;
OSMutex JKRAramPiece::mMutex;
DUSK_GAME_DATA OSMutex JKRAramPiece::mMutex;
#if DEBUG && TARGET_PC
volatile u8 forceRead;
DUSK_GAME_DATA volatile u8 forceRead;
#endif
JKRAMCommand* JKRAramPiece::orderAsync(int direction, uintptr_t source, uintptr_t destination, u32 length,
libs/JSystem/src/JKernel/JKRAramStream.cpp
+6 -6
View File
@@ -12,7 +12,7 @@ const u32 stack_size = 0xc00;
const u32 stack_size = 0x4000;
#endif
JKRAramStream* JKRAramStream::sAramStreamObject;
DUSK_GAME_DATA JKRAramStream* JKRAramStream::sAramStreamObject;
JKRAramStream* JKRAramStream::create(s32 priority) {
if (!sAramStreamObject) {
@@ -23,14 +23,14 @@ JKRAramStream* JKRAramStream::create(s32 priority) {
return sAramStreamObject;
}
void* JKRAramStream::sMessageBuffer[4] = {
DUSK_GAME_DATA void* JKRAramStream::sMessageBuffer[4] = {
NULL,
NULL,
NULL,
NULL,
};
OSMessageQueue JKRAramStream::sMessageQueue = {0};
DUSK_GAME_DATA OSMessageQueue JKRAramStream::sMessageQueue = {0};
JKRAramStream::JKRAramStream(s32 priority) : JKRThread(stack_size, 0x10, priority) {
resume();
@@ -141,11 +141,11 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
return writtenLength;
}
u8* JKRAramStream::transBuffer;
DUSK_GAME_DATA u8* JKRAramStream::transBuffer;
u32 JKRAramStream::transSize;
DUSK_GAME_DATA u32 JKRAramStream::transSize;
JKRHeap* JKRAramStream::transHeap;
DUSK_GAME_DATA JKRHeap* JKRAramStream::transHeap;
JKRAramStreamCommand* JKRAramStream::write_StreamToAram_Async(JSUFileInputStream* stream, u32 addr,
u32 size, u32 offset,
libs/JSystem/src/JKernel/JKRArchivePri.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include <cassert>
#endif
u32 JKRArchive::sCurrentDirID;
DUSK_GAME_DATA u32 JKRArchive::sCurrentDirID;
JKRArchive::JKRArchive() {
mIsMounted = false;
libs/JSystem/src/JKernel/JKRDecomp.cpp
+3 -3
View File
@@ -10,7 +10,7 @@ const u32 stack_size = 0x800;
const u32 stack_size = 0x4000;
#endif
JKRDecomp* JKRDecomp::sDecompObject;
DUSK_GAME_DATA JKRDecomp* JKRDecomp::sDecompObject;
JKRDecomp* JKRDecomp::create(s32 priority) {
if (!sDecompObject) {
@@ -29,9 +29,9 @@ void JKRDecomp::destroy() {
}
#endif
OSMessage JKRDecomp::sMessageBuffer[8] = {0};
DUSK_GAME_DATA OSMessage JKRDecomp::sMessageBuffer[8] = {0};
OSMessageQueue JKRDecomp::sMessageQueue = {0};
DUSK_GAME_DATA OSMessageQueue JKRDecomp::sMessageQueue = {0};
JKRDecomp::JKRDecomp(s32 priority) : JKRThread(stack_size, 0x10, priority) {
resume();
libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp
+3 -3
View File
@@ -75,9 +75,9 @@ JKRADCommand* JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* dvdFile, u32 addres
return command;
}
JSUList<JKRADCommand> JKRDvdAramRipper::sDvdAramAsyncList;
DUSK_GAME_DATA JSUList<JKRADCommand> JKRDvdAramRipper::sDvdAramAsyncList;
bool JKRDvdAramRipper::errorRetry = true;
DUSK_GAME_DATA bool JKRDvdAramRipper::errorRetry = true;
JKRADCommand* JKRDvdAramRipper::callCommand_Async(JKRADCommand* command) {
s32 compression;
@@ -228,7 +228,7 @@ JKRADCommand::~JKRADCommand() {
static OSMutex decompMutex;
u32 JKRDvdAramRipper::sSZSBufferSize = 0x00000400;
DUSK_GAME_DATA u32 JKRDvdAramRipper::sSZSBufferSize = 0x00000400;
static u8* szpBuf;
libs/JSystem/src/JKernel/JKRDvdFile.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/JUtility/JUTException.h"
#include <stdint.h>
JSUList<JKRDvdFile> JKRDvdFile::sDvdList;
DUSK_GAME_DATA JSUList<JKRDvdFile> JKRDvdFile::sDvdList;
JKRDvdFile::JKRDvdFile() : mDvdLink(this) {
initiate();
libs/JSystem/src/JKernel/JKRDvdRipper.cpp
+4 -4
View File
@@ -44,7 +44,7 @@ void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expa
pCompression, param_8);
}
bool JKRDvdRipper::errorRetry = true;
DUSK_GAME_DATA bool JKRDvdRipper::errorRetry = true;
void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch expandSwitch,
u32 dstLength, JKRHeap* heap,
@@ -236,13 +236,13 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
static u8 lit_491[12];
JSUList<JKRDMCommand> JKRDvdRipper::sDvdAsyncList;
DUSK_GAME_DATA JSUList<JKRDMCommand> JKRDvdRipper::sDvdAsyncList;
static OSMutex decompMutex;
u32 JKRDvdRipper::sSZSBufferSize = 0x00000400;
DUSK_GAME_DATA u32 JKRDvdRipper::sSZSBufferSize = 0x00000400;
JKRHeap* JKRDvdRipper::sHeap = NULL;
DUSK_GAME_DATA JKRHeap* JKRDvdRipper::sHeap = NULL;
static u8* szpBuf;
libs/JSystem/src/JKernel/JKRFileLoader.cpp
+2 -2
View File
@@ -11,8 +11,8 @@
#include "dusk/string.hpp"
#include "global.h"
JKRFileLoader* JKRFileLoader::sCurrentVolume;
JSUList<JKRFileLoader> JKRFileLoader::sVolumeList;
DUSK_GAME_DATA JKRFileLoader* JKRFileLoader::sCurrentVolume;
DUSK_GAME_DATA JSUList<JKRFileLoader> JKRFileLoader::sVolumeList;
JKRFileLoader::JKRFileLoader(void)
: mFileLoaderLink(this), mVolumeName(NULL), mVolumeType(0), mMountCount(0) {}
libs/JSystem/src/JKernel/JKRHeap.cpp
+17 -17
View File
@@ -28,14 +28,14 @@
#include "os_report.h"
#if DEBUG
u8 JKRValue_DEBUGFILL_NOTUSE = 0xFD;
u8 JKRValue_DEBUGFILL_NEW = 0xCD;
u8 JKRValue_DEBUGFILL_DELETE = 0xDD;
DUSK_GAME_DATA u8 JKRValue_DEBUGFILL_NOTUSE = 0xFD;
DUSK_GAME_DATA u8 JKRValue_DEBUGFILL_NEW = 0xCD;
DUSK_GAME_DATA u8 JKRValue_DEBUGFILL_DELETE = 0xDD;
#endif
bool JKRHeap::sDefaultFillFlag = true;
DUSK_GAME_DATA bool JKRHeap::sDefaultFillFlag = true;
JKRHeap* JKRHeap::sSystemHeap;
DUSK_GAME_DATA JKRHeap* JKRHeap::sSystemHeap;
#if TARGET_PC
// JSystem normally has a thread switch callback to track the correct heap.
@@ -52,13 +52,13 @@ static thread_local TLS_GLOBAL_DYNAMIC JKRHeap* sCurrentHeap;
JKRHeap* JKRHeap::sCurrentHeap;
#endif
JKRHeap* JKRHeap::sRootHeap;
DUSK_GAME_DATA JKRHeap* JKRHeap::sRootHeap;
#if PLATFORM_WII || PLATFORM_SHIELD
JKRHeap* JKRHeap::sRootHeap2;
#endif
JKRErrorHandler JKRHeap::mErrorHandler;
DUSK_GAME_DATA JKRErrorHandler JKRHeap::mErrorHandler;
static bool data_80451380;
@@ -111,19 +111,19 @@ JKRHeap::~JKRHeap() {
}
}
void* JKRHeap::mCodeStart;
DUSK_GAME_DATA void* JKRHeap::mCodeStart;
void* JKRHeap::mCodeEnd;
DUSK_GAME_DATA void* JKRHeap::mCodeEnd;
void* JKRHeap::mUserRamStart;
DUSK_GAME_DATA void* JKRHeap::mUserRamStart;
void* JKRHeap::mUserRamEnd;
DUSK_GAME_DATA void* JKRHeap::mUserRamEnd;
u32 JKRHeap::mMemorySize;
DUSK_GAME_DATA u32 JKRHeap::mMemorySize;
JKRHeap::JKRAllocCallback JKRHeap::sAllocCallback;
DUSK_GAME_DATA JKRHeap::JKRAllocCallback JKRHeap::sAllocCallback;
JKRHeap::JKRFreeCallback JKRHeap::sFreeCallback;
DUSK_GAME_DATA JKRHeap::JKRFreeCallback JKRHeap::sFreeCallback;
bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) {
void* arenaLo = OSGetArenaLo();
@@ -661,8 +661,8 @@ void operator delete[](void* ptr JKR_HEAP_TOKEN_PARAM) IF_DUSK(noexcept) {
}
#endif
s32 fillcheck_dispcount = 100;
bool data_8074A8D0_debug = true;
DUSK_GAME_DATA s32 fillcheck_dispcount = 100;
DUSK_GAME_DATA bool data_8074A8D0_debug = true;
void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(1213, p != NULL);
@@ -680,7 +680,7 @@ void JKRHeap::state_dump(const JKRHeap::TState& p) const {
JUT_LOG(1248, "used size : %u", p.getUsedSize());
}
void* ARALT_AramStartAdr = (void*)0x90000000;
DUSK_GAME_DATA void* ARALT_AramStartAdr = (void*)0x90000000;
void* JKRHeap::getAltAramStartAdr() { return ARALT_AramStartAdr; }
libs/JSystem/src/JKernel/JKRThread.cpp
+9 -9
View File
@@ -13,19 +13,19 @@
#include "dusk/os.h"
#endif
JSUList<JKRThread> JKRThread::sThreadList(0);
DUSK_GAME_DATA JSUList<JKRThread> JKRThread::sThreadList(0);
void* JKRIdleThread::sThread;
DUSK_GAME_DATA void* JKRIdleThread::sThread;
JKRThreadSwitch* JKRThreadSwitch::sManager;
DUSK_GAME_DATA JKRThreadSwitch* JKRThreadSwitch::sManager;
u32 JKRThreadSwitch::sTotalCount;
DUSK_GAME_DATA u32 JKRThreadSwitch::sTotalCount;
u64 JKRThreadSwitch::sTotalStart;
DUSK_GAME_DATA u64 JKRThreadSwitch::sTotalStart;
JKRThreadSwitch_PreCallback JKRThreadSwitch::mUserPreCallback;
DUSK_GAME_DATA JKRThreadSwitch_PreCallback JKRThreadSwitch::mUserPreCallback;
JKRThreadSwitch_PostCallback JKRThreadSwitch::mUserPostCallback;
DUSK_GAME_DATA JKRThreadSwitch_PostCallback JKRThreadSwitch::mUserPostCallback;
JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadListLink(this) {
JKRHeap* heap = JKRHeap::findFromRoot(this);
@@ -358,10 +358,10 @@ static void dummy(JKRIdleThread* thread) {
#pragma push
#pragma force_active on
JSUList<JKRTask> JKRTask::sTaskList;
DUSK_GAME_DATA JSUList<JKRTask> JKRTask::sTaskList;
#pragma pop
#pragma push
#pragma force_active on
u8 JKRTask::sEndMesgQueue[32];
DUSK_GAME_DATA u8 JKRTask::sEndMesgQueue[32];
#pragma pop