m_Do / d_a_npc work

This commit is contained in:
TakaRikka
2022-06-01 03:49:32 -07:00
parent 36e62e0b80
commit 3f22fa4483
63 changed files with 925 additions and 963 deletions
+3 -24
View File
@@ -7,26 +7,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct JKRHeap {
static u8 sSystemHeap[4];
static u8 sCurrentHeap[4];
};
struct JASTaskThread {
/* 8028F6C4 */ JASTaskThread(int, int, u32);
};
struct JASDvd {
/* 8028FEFC */ u32 getThreadPointer();
/* 8028FF04 */ void createThread(s32, int, u32);
static u8 sThread[4 + 4 /* padding */];
};
//
// Forward References:
//
@@ -41,7 +21,6 @@ extern "C" u8 sThread__6JASDvd[4 + 4 /* padding */];
extern "C" void __ct__13JASTaskThreadFiiUl();
extern "C" void* __nw__FUlP7JKRHeapi();
extern "C" void OSResumeThread();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern u8 JASDram[4];
@@ -54,11 +33,11 @@ extern "C" u8 sCurrentHeap__7JKRHeap[4];
/* ############################################################################################## */
/* 80451208-80451210 000708 0004+04 2/1 0/0 0/0 .sbss sThread__6JASDvd */
u8 JASDvd::sThread[4 + 4 /* padding */];
JASTaskThread* JASDvd::sThread;
/* 8028FEFC-8028FF04 -00001 0008+00 0/0 0/0 0/0 .text getThreadPointer__6JASDvdFv */
u32 JASDvd::getThreadPointer() {
return *(u32*)(&JASDvd::sThread);
JASTaskThread* JASDvd::getThreadPointer() {
return JASDvd::sThread;
}
/* 8028FF04-8028FFA8 28A844 00A4+00 0/0 1/1 0/0 .text createThread__6JASDvdFliUl */
+2 -27
View File
@@ -11,26 +11,6 @@
// Types:
//
struct JKRHeap {
static u8 sSystemHeap[4];
};
struct JKRThread {
/* 802D1610 */ JKRThread(JKRHeap*, u32, int, int);
/* 802D1758 */ ~JKRThread();
};
struct JASTaskThread {
/* 8028F6C4 */ JASTaskThread(int, int, u32);
/* 8028F724 */ ~JASTaskThread();
/* 8028F9EC */ void allocCallStack(void (*)(void*), void*);
/* 8028F850 */ void allocCallStack(void (*)(void*), void const*, u32);
/* 8028FC54 */ void sendCmdMsg(void (*)(void*), void*);
/* 8028FB5C */ void sendCmdMsg(void (*)(void*), void const*, u32);
/* 8028FD4C */ void run();
/* 8028FE88 */ void pause(bool);
};
struct JASCalc {
/* 8028F354 */ void bcopy(void const*, void*, u32);
};
@@ -59,12 +39,6 @@ extern "C" void* __nw__FUlP7JKRHeapi();
extern "C" void __dl__FPv();
extern "C" void __ct__9JKRThreadFP7JKRHeapUlii();
extern "C" void __dt__9JKRThreadFv();
extern "C" void OSDisableInterrupts();
extern "C" void OSRestoreInterrupts();
extern "C" void OSSendMessage();
extern "C" void OSReceiveMessage();
extern "C" void OSLockMutex();
extern "C" void OSUnlockMutex();
extern "C" void OSInitThreadQueue();
extern "C" void OSSleepThread();
extern "C" void OSWakeupThread();
@@ -104,7 +78,8 @@ asm JASTaskThread::JASTaskThread(int param_0, int param_1, u32 param_2) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JASTaskThread::~JASTaskThread() {
// asm JASTaskThread::~JASTaskThread() {
extern "C" asm void __dt__13JASTaskThreadFv() {
nofralloc
#include "asm/JSystem/JAudio2/JASTaskThread/__dt__13JASTaskThreadFv.s"
}
+1 -1
View File
@@ -109,7 +109,7 @@ bool JKRAssertHeap::dump_sort() {
/* 802D142C-802D1434 2CBD6C 0008+00 1/0 0/0 0/0 .text do_changeGroupID__13JKRAssertHeapFUc */
u8 JKRAssertHeap::do_changeGroupID(u8) {
s32 JKRAssertHeap::do_changeGroupID(u8) {
return 0;
}
+1 -1
View File
@@ -558,7 +558,7 @@ void JKRExpHeap::do_fillFreeArea() {
/* 802CF928-802CF978 2CA268 0050+00 1/0 0/0 0/0 .text do_changeGroupID__10JKRExpHeapFUc
*/
u8 JKRExpHeap::do_changeGroupID(u8 param_0) {
s32 JKRExpHeap::do_changeGroupID(u8 param_0) {
lock();
u8 prev = mCurrentGroupId;
mCurrentGroupId = param_0;
+2 -2
View File
@@ -352,7 +352,7 @@ s32 JKRHeap::getTotalFreeSize() {
}
/* 802CE7B0-802CE7DC 2C90F0 002C+00 0/0 1/1 0/0 .text changeGroupID__7JKRHeapFUc */
u8 JKRHeap::changeGroupID(u8 param_1) {
s32 JKRHeap::changeGroupID(u8 param_1) {
return do_changeGroupID(param_1);
}
@@ -624,7 +624,7 @@ void JKRHeap::state_dump(JKRHeap::TState const& p) const {
}
/* 802CEDA4-802CEDAC 2C96E4 0008+00 1/0 1/0 0/0 .text do_changeGroupID__7JKRHeapFUc */
u8 JKRHeap::do_changeGroupID(u8 param_0) {
s32 JKRHeap::do_changeGroupID(u8 param_0) {
return 0;
}