mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-20 05:16:24 -04:00
project cleanup (#2895)
* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
This commit is contained in:
@@ -7,29 +7,20 @@
|
||||
#include "global.h"
|
||||
#include <stdint.h>
|
||||
|
||||
/* 8043428C-80434298 060FAC 000C+00 5/6 0/0 0/0 .bss sThreadList__9JKRThread */
|
||||
JSUList<JKRThread> JKRThread::sThreadList(0);
|
||||
|
||||
/* 804513B0-804513B4 0008B0 0004+00 2/2 1/1 0/0 .sbss sManager__15JKRThreadSwitch */
|
||||
JKRThreadSwitch* JKRThreadSwitch::sManager;
|
||||
|
||||
/* 804513B4-804513B8 0008B4 0004+00 3/3 0/0 0/0 .sbss sTotalCount__15JKRThreadSwitch */
|
||||
u32 JKRThreadSwitch::sTotalCount;
|
||||
|
||||
/* 804513B8-804513BC 0008B8 0004+00 1/1 0/0 0/0 .sbss sTotalStart__15JKRThreadSwitch */
|
||||
u32 JKRThreadSwitch::sTotalStart;
|
||||
|
||||
/* 804513BC-804513C0 0008BC 0004+00 1/1 0/0 0/0 .sbss None */
|
||||
static u32 data_804513BC;
|
||||
|
||||
/* 804513C0-804513C4 0008C0 0004+00 1/1 0/0 0/0 .sbss mUserPreCallback__15JKRThreadSwitch
|
||||
*/
|
||||
JKRThreadSwitch_PreCallback JKRThreadSwitch::mUserPreCallback;
|
||||
|
||||
/* 804513C4-804513C8 0008C4 0004+00 1/1 0/0 0/0 .sbss mUserPostCallback__15JKRThreadSwitch */
|
||||
JKRThreadSwitch_PostCallback JKRThreadSwitch::mUserPostCallback;
|
||||
|
||||
/* 802D1568-802D1610 2CBEA8 00A8+00 0/0 4/4 0/0 .text __ct__9JKRThreadFUlii */
|
||||
JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadListLink(this) {
|
||||
JKRHeap* heap = JKRHeap::findFromRoot(this);
|
||||
if (heap == NULL) {
|
||||
@@ -40,7 +31,6 @@ JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadLi
|
||||
setCommon_mesgQueue(mHeap, message_count);
|
||||
}
|
||||
|
||||
/* 802D1610-802D16B8 2CBF50 00A8+00 0/0 2/2 0/0 .text __ct__9JKRThreadFP7JKRHeapUlii */
|
||||
JKRThread::JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param_4)
|
||||
: mThreadListLink(this) {
|
||||
if (heap == NULL) {
|
||||
@@ -51,7 +41,6 @@ JKRThread::JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param
|
||||
setCommon_mesgQueue(mHeap, message_count);
|
||||
}
|
||||
|
||||
/* 802D16B8-802D1758 2CBFF8 00A0+00 0/0 5/5 0/0 .text __ct__9JKRThreadFP8OSThreadi */
|
||||
JKRThread::JKRThread(OSThread* thread, int message_count) : mThreadListLink(this) {
|
||||
mHeap = NULL;
|
||||
mThreadRecord = thread;
|
||||
@@ -61,7 +50,6 @@ JKRThread::JKRThread(OSThread* thread, int message_count) : mThreadListLink(this
|
||||
setCommon_mesgQueue(JKRHeap::getSystemHeap(), message_count);
|
||||
}
|
||||
|
||||
/* 802D1758-802D1830 2CC098 00D8+00 1/0 9/9 0/0 .text __dt__9JKRThreadFv */
|
||||
JKRThread::~JKRThread() {
|
||||
getList().remove(&mThreadListLink);
|
||||
|
||||
@@ -77,8 +65,6 @@ JKRThread::~JKRThread() {
|
||||
JKRFree(mMessages);
|
||||
}
|
||||
|
||||
/* 802D1830-802D18A4 2CC170 0074+00 3/3 0/0 0/0 .text setCommon_mesgQueue__9JKRThreadFP7JKRHeapi
|
||||
*/
|
||||
void JKRThread::setCommon_mesgQueue(JKRHeap* heap, int message_count) {
|
||||
mMessageCount = message_count;
|
||||
mMessages = (OSMessage*)JKRHeap::alloc(mMessageCount * sizeof(OSMessage), 0, heap);
|
||||
@@ -90,8 +76,6 @@ void JKRThread::setCommon_mesgQueue(JKRHeap* heap, int message_count) {
|
||||
mCurrentHeapError = NULL;
|
||||
}
|
||||
|
||||
/* 802D18A4-802D1934 2CC1E4 0090+00 2/2 0/0 0/0 .text
|
||||
* setCommon_heapSpecified__9JKRThreadFP7JKRHeapUli */
|
||||
void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3) {
|
||||
mHeap = heap;
|
||||
mStackSize = stack_size & 0xffffffe0;
|
||||
@@ -102,14 +86,11 @@ void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param
|
||||
OSCreateThread(mThreadRecord, start, this, stackBase, mStackSize, param_3, 1);
|
||||
}
|
||||
|
||||
/* 802D1934-802D1960 2CC274 002C+00 1/1 0/0 0/0 .text start__9JKRThreadFPv */
|
||||
void* JKRThread::start(void* param) {
|
||||
JKRThread* thread = (JKRThread*)param;
|
||||
return thread->run();
|
||||
}
|
||||
|
||||
/* 802D1960-802D199C 2CC2A0 003C+00 1/1 0/0 0/0 .text searchThread__9JKRThreadFP8OSThread
|
||||
*/
|
||||
JKRThread* JKRThread::searchThread(OSThread* thread) {
|
||||
JSUList<JKRThread>& threadList = getList();
|
||||
JSUListIterator<JKRThread> iterator;
|
||||
@@ -122,8 +103,6 @@ JKRThread* JKRThread::searchThread(OSThread* thread) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* 802D199C-802D1A14 2CC2DC 0078+00 1/1 0/0 0/0 .text __ct__15JKRThreadSwitchFP7JKRHeap
|
||||
*/
|
||||
JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) {
|
||||
mHeap = param_0;
|
||||
OSSetSwitchThreadCallback(JKRThreadSwitch::callback);
|
||||
@@ -138,8 +117,6 @@ JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) {
|
||||
mSetNextHeap = true;
|
||||
}
|
||||
|
||||
/* 802D1A14-802D1A70 2CC354 005C+00 0/0 1/1 0/0 .text createManager__15JKRThreadSwitchFP7JKRHeap
|
||||
*/
|
||||
JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) {
|
||||
JUT_ASSERT(343, sManager == NULL);
|
||||
|
||||
@@ -151,7 +128,6 @@ JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) {
|
||||
return sManager;
|
||||
}
|
||||
|
||||
/* 802D1A70-802D1AE4 2CC3B0 0074+00 0/0 1/1 0/0 .text enter__15JKRThreadSwitchFP9JKRThreadi */
|
||||
JKRThread* JKRThreadSwitch::enter(JKRThread* thread, int thread_id) {
|
||||
if (!thread) {
|
||||
return NULL;
|
||||
@@ -175,8 +151,6 @@ static void dummyStrings() {
|
||||
DEAD_STRING("JKRThread:%x OSThread:%x Load:ID:%d (%s)\n");
|
||||
}
|
||||
|
||||
/* 802D1AE4-802D1C74 2CC424 0190+00 1/1 0/0 0/0 .text
|
||||
* callback__15JKRThreadSwitchFP8OSThreadP8OSThread */
|
||||
void JKRThreadSwitch::callback(OSThread* current, OSThread* next) {
|
||||
if (mUserPreCallback) {
|
||||
(*mUserPreCallback)(current, next);
|
||||
@@ -245,8 +219,6 @@ void JKRThreadSwitch::callback(OSThread* current, OSThread* next) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802D1C74-802D1E14 2CC5B4 01A0+00 1/0 0/0 0/0 .text
|
||||
* draw__15JKRThreadSwitchFP14JKRThreadName_P10JUTConsole */
|
||||
void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console) {
|
||||
const char* print_0 = " total: switch:%3d time:%d(%df)\n";
|
||||
const char* print_1 = " -------------------------------------\n";
|
||||
@@ -304,27 +276,21 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console
|
||||
}
|
||||
}
|
||||
|
||||
/* 802D1E14-802D1E1C 2CC754 0008+00 1/0 0/0 0/0 .text run__9JKRThreadFv */
|
||||
void* JKRThread::run() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* 802D1E1C-802D1E4C 2CC75C 0030+00 1/0 0/0 0/0 .text draw__15JKRThreadSwitchFP14JKRThreadName_ */
|
||||
void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list) {
|
||||
draw(thread_name_list, NULL);
|
||||
}
|
||||
|
||||
/* 802D1E4C-802D1E94 2CC78C 0048+00 1/0 0/0 0/0 .text __dt__15JKRThreadSwitchFv */
|
||||
JKRThreadSwitch::~JKRThreadSwitch() {}
|
||||
|
||||
/* 804342A4-804342B0 060FC4 000C+00 0/1 0/0 0/0 .bss sTaskList__7JKRTask */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
JSUList<JKRTask> JKRTask::sTaskList;
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 804342B0-804342D0 060FD0 0020+00 0/0 0/0 0/0 .bss sEndMesgQueue__7JKRTask */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
u8 JKRTask::sEndMesgQueue[32];
|
||||
|
||||
Reference in New Issue
Block a user