JMessage work (#296)

* daalink / z2linkmgr wip

* first cleanup of JASGlobalInstance data

* fix sInstance stuff part 2

* more d_a_alink_swim work

* remove asm

* JMessage work

* remove asm
This commit is contained in:
TakaRikka
2023-02-19 10:40:57 -07:00
committed by GitHub
parent d024075910
commit e0a17187ad
66 changed files with 1038 additions and 2132 deletions
+10 -11
View File
@@ -394,22 +394,20 @@ JKRHeap* JKRHeap::findFromRoot(void* ptr) {
}
/* 802CE894-802CE93C 2C91D4 00A8+00 1/1 1/1 0/0 .text find__7JKRHeapCFPv */
JKRHeap* JKRHeap::find(void* ptr) const {
if (getStartAddr() <= ptr && ptr < getEndAddr()) {
const JSUTree<JKRHeap>& tree = mChildTree;
if (tree.getNumChildren() != 0) {
JSUTreeIterator<JKRHeap> iterator;
for (iterator = tree.getFirstChild(); iterator != tree.getEndChild(); iterator++) {
JKRHeap* child = iterator.getObject();
JKRHeap* result = child->find(ptr);
JKRHeap* JKRHeap::find(void* memory) const {
if (mStart <= memory && memory < mEnd) {
if (mChildTree.getNumChildren() != 0) {
for (JSUTreeIterator<JKRHeap> iterator(mChildTree.getFirstChild());
iterator != mChildTree.getEndChild(); ++iterator)
{
JKRHeap* result = iterator->find(memory);
if (result) {
return result;
}
}
}
// todo: not sure about this... casting away const for now.
return (JKRHeap*)this;
return const_cast<JKRHeap*>(this);
}
return NULL;
@@ -444,7 +442,8 @@ void JKRHeap::dispose_subroutine(u32 begin, u32 end) {
JSUListIterator<JKRDisposer> next_iterator;
JSUListIterator<JKRDisposer> iterator;
for (iterator = mDisposerList.getFirst(); iterator != mDisposerList.getEnd();
iterator = next_iterator) {
iterator = next_iterator)
{
JKRDisposer* disposer = iterator.getObject();
if ((void*)begin <= disposer && disposer < (void*)end) {
+72 -81
View File
@@ -1,25 +1,10 @@
//
// Generated By: dol2asm
// Translation Unit: control
//
/**
* JMessage/control.cpp
* JMessage Controller
*/
#include "JSystem/JMessage/control.h"
#include "JSystem/JMessage/processor.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void __ct__Q28JMessage8TControlFv();
extern "C" void __dt__Q28JMessage8TControlFv();
extern "C" void reset__Q28JMessage8TControlFv();
extern "C" void update__Q28JMessage8TControlFv();
extern "C" void render__Q28JMessage8TControlFv();
extern "C" void setMessageCode__Q28JMessage8TControlFUsUs();
extern "C" void setMessageID__Q28JMessage8TControlFUlUlPb();
extern "C" void setMessageCode_inSequence___Q28JMessage8TControlFPCQ28JMessage10TProcessorUsUs();
//
// External References:
@@ -39,57 +24,58 @@ extern "C" void _restgpr_28();
// Declarations:
//
/* ############################################################################################## */
/* 803C9B60-803C9B70 026C80 000C+04 2/2 0/0 0/0 .data __vt__Q28JMessage8TControl */
SECTION_DATA extern void* __vt__Q28JMessage8TControl[3 + 1 /* padding */] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__Q28JMessage8TControlFv,
/* padding */
NULL,
};
/* 802A7548-802A758C 2A1E88 0044+00 0/0 2/2 0/0 .text __ct__Q28JMessage8TControlFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JMessage::TControl::TControl() {
nofralloc
#include "asm/JSystem/JMessage/control/__ct__Q28JMessage8TControlFv.s"
}
#pragma pop
JMessage::TControl::TControl()
: pSequenceProcessor_(NULL), pRenderingProcessor_(NULL), messageCode_(0xFFFF),
field_0xe(0xFFFF), pResourceCache_(NULL), pEntry_(NULL), pMessageText_begin_(0),
pszText_update_current_(NULL), field_0x20(0) {}
/* 802A758C-802A75D4 2A1ECC 0048+00 1/0 2/2 0/0 .text __dt__Q28JMessage8TControlFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JMessage::TControl::~TControl() {
nofralloc
#include "asm/JSystem/JMessage/control/__dt__Q28JMessage8TControlFv.s"
}
#pragma pop
JMessage::TControl::~TControl() {}
/* 802A75D4-802A7634 2A1F14 0060+00 0/0 9/9 0/0 .text reset__Q28JMessage8TControlFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TControl::reset() {
nofralloc
#include "asm/JSystem/JMessage/control/reset__Q28JMessage8TControlFv.s"
void JMessage::TControl::reset() {
pEntry_ = NULL;
pMessageText_begin_ = 0;
pszText_update_current_ = NULL;
field_0x20 = 0;
oStack_renderingProcessor_.clear();
if (pSequenceProcessor_ != NULL) {
pSequenceProcessor_->reset();
}
if (pRenderingProcessor_ != NULL) {
pRenderingProcessor_->reset();
}
}
#pragma pop
/* 802A7634-802A76BC 2A1F74 0088+00 0/0 4/4 0/0 .text update__Q28JMessage8TControlFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TControl::update() {
nofralloc
#include "asm/JSystem/JMessage/control/update__Q28JMessage8TControlFv.s"
int JMessage::TControl::update() {
if (!isReady_update_()) {
return 0;
}
pszText_update_current_ = pSequenceProcessor_->process(NULL);
if (pszText_update_current_ == NULL) {
pMessageText_begin_ = 0;
return 0;
}
return 1;
}
#pragma pop
/* 802A76BC-802A77E8 2A1FFC 012C+00 0/0 5/5 0/0 .text render__Q28JMessage8TControlFv */
#ifdef NONMATCHING
void JMessage::TControl::render() {
if (isReady_render_()) {
pRenderingProcessor_->setBegin_messageEntryText(pResourceCache_, pEntry_, field_0x20);
pRenderingProcessor_->oStack_ = oStack_renderingProcessor_;
pRenderingProcessor_->process(pszText_update_current_);
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -98,35 +84,40 @@ asm void JMessage::TControl::render() {
#include "asm/JSystem/JMessage/control/render__Q28JMessage8TControlFv.s"
}
#pragma pop
#endif
/* 802A77E8-802A78F4 2A2128 010C+00 0/0 1/1 0/0 .text setMessageCode__Q28JMessage8TControlFUsUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TControl::setMessageCode(u16 param_0, u16 param_1) {
nofralloc
#include "asm/JSystem/JMessage/control/setMessageCode__Q28JMessage8TControlFUsUs.s"
int JMessage::TControl::setMessageCode(u16 param_0, u16 param_1) {
return setMessageCode_inReset_(getProcessor(), param_0, param_1);
}
#pragma pop
/* 802A78F4-802A7A20 2A2234 012C+00 0/0 6/6 0/0 .text setMessageID__Q28JMessage8TControlFUlUlPb */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TControl::setMessageID(u32 param_0, u32 param_1, bool* param_2) {
nofralloc
#include "asm/JSystem/JMessage/control/setMessageID__Q28JMessage8TControlFUlUlPb.s"
int JMessage::TControl::setMessageID(u32 param_0, u32 param_1, bool* param_2) {
TProcessor* pProcessor = getProcessor();
u32 code = pProcessor->toMessageCode_messageID(param_0, param_1, param_2);
if (code == -1) {
return 0;
}
return setMessageCode_inReset_(pProcessor, code >> 0x10, code & 0xFFFF);
}
#pragma pop
/* 802A7A20-802A7AF8 2A2360 00D8+00 2/2 1/1 0/0 .text
* setMessageCode_inSequence___Q28JMessage8TControlFPCQ28JMessage10TProcessorUsUs */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const* param_0,
u16 param_1, u16 param_2) {
nofralloc
#include "asm/JSystem/JMessage/control/setMessageCode_inSequence___Q28JMessage8TControlFPCQ28JMessage10TProcessorUsUs.s"
bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const* pProcessor,
u16 messageCode, u16 messageIndex) {
pEntry_ = pProcessor->getMessageEntry_messageCode(messageCode, messageIndex);
if (pEntry_ == NULL) {
return false;
}
messageCode_ = messageCode;
field_0xe = messageIndex;
pResourceCache_ = pProcessor->getResourceCache();
pMessageText_begin_ = pResourceCache_->getMessageText_messageEntry(pEntry_);
field_0x20 = pMessageText_begin_;
oStack_renderingProcessor_.clear();
return true;
}
#pragma pop
+1 -21
View File
@@ -5,26 +5,6 @@
#include "JSystem/JMessage/data.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */];
//
// External References:
//
//
// Declarations:
//
/* ############################################################################################## */
/* 80455818-80455820 003E18 0004+04 0/0 1/1 0/0 .sdata2 ga4cSignature__Q28JMessage4data */
SECTION_SDATA2 f32 JMessage::data::ga4cSignature[1 + 1 /* padding */] = {
206910576.0f,
/* padding */
0.0f,
};
SECTION_SDATA2 u32 JMessage::data::ga4cSignature = 'MESG';
+25 -2
View File
@@ -24,21 +24,44 @@ extern "C" void parseCharacter_UTF8__Q28JMessage6localeFPPCc();
/* 802A9528-802A958C 2A3E68 0064+00 0/0 1/0 0/0 .text
* parseCharacter_ShiftJIS__Q28JMessage6localeFPPCc */
#ifdef NONMATCHING
int JMessage::locale::parseCharacter_ShiftJIS(char const** str) {
int c;
int ret;
u8* temp_r4_2;
u8* temp_r5;
temp_r5 = (u8*)*str;
c = *temp_r5;
ret = c;
*str = *str + 1;
if (isLeadByte_ShiftJIS(c)) {
temp_r4_2 = (u8*)*str;
ret = (c << 8) | *temp_r4_2;
*str = *str + 1;
}
return ret;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::locale::parseCharacter_ShiftJIS(char const** param_0) {
asm int JMessage::locale::parseCharacter_ShiftJIS(char const** param_0) {
nofralloc
#include "asm/JSystem/JMessage/locale/parseCharacter_ShiftJIS__Q28JMessage6localeFPPCc.s"
}
#pragma pop
#endif
/* 802A958C-802A968C 2A3ECC 0100+00 0/0 1/0 0/0 .text parseCharacter_UTF8__Q28JMessage6localeFPPCc
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::locale::parseCharacter_UTF8(char const** param_0) {
asm int JMessage::locale::parseCharacter_UTF8(char const** param_0) {
nofralloc
#include "asm/JSystem/JMessage/locale/parseCharacter_UTF8__Q28JMessage6localeFPPCc.s"
}
File diff suppressed because it is too large Load Diff
+97 -60
View File
@@ -5,10 +5,8 @@
#include "JSystem/JMessage/resource.h"
#include "JSystem/JGadget/binary.h"
#include "JSystem/JMessage/data.h"
#include "JSystem/JMessage/locale.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "MSL_C/MSL_Common/Src/mem.h"
//
// Types:
@@ -58,7 +56,6 @@ Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget1
extern "C" void Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" void memcmp();
extern "C" extern void* __vt__Q37JGadget6binary19TParse_header_block[5];
extern "C" f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */];
@@ -81,12 +78,12 @@ asm void JMessage::TResource::toMessageIndex_messageID(u32 param_0, u32 param_1,
/* ############################################################################################## */
/* 803C9C80-803C9C94 -00001 0014+00 1/1 0/0 0/0 .data
* sapfnParseCharacter___Q28JMessage18TResourceContainer */
SECTION_DATA void* JMessage::TResourceContainer::sapfnParseCharacter_[5] = {
(void*)NULL,
(void*)parseCharacter_1Byte__Q28JMessage6localeFPPCc,
(void*)parseCharacter_2Byte__Q28JMessage6localeFPPCc,
(void*)parseCharacter_ShiftJIS__Q28JMessage6localeFPPCc,
(void*)parseCharacter_UTF8__Q28JMessage6localeFPPCc,
JMessage::locale::parseCharacter_function JMessage::TResourceContainer::sapfnParseCharacter_[5] = {
NULL,
JMessage::locale::parseCharacter_1Byte,
JMessage::locale::parseCharacter_2Byte,
JMessage::locale::parseCharacter_ShiftJIS,
JMessage::locale::parseCharacter_UTF8,
};
/* 803C9C94-803C9CA8 026DB4 0014+00 2/2 0/0 0/0 .data __vt__Q28JMessage6TParse */
@@ -116,6 +113,7 @@ SECTION_DATA extern void* data_803C9CBC[5] = {
/* 802A8EC0-802A8EF8 2A3800 0038+00 1/1 0/0 0/0 .text
* __ct__Q38JMessage18TResourceContainer10TCResourceFv */
// need to fix TLinkList_factory vtable stuff
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -127,10 +125,12 @@ asm JMessage::TResourceContainer::TCResource::TCResource() {
/* 802A8EF8-802A8F6C 2A3838 0074+00 1/0 2/2 0/0 .text
* __dt__Q38JMessage18TResourceContainer10TCResourceFv */
// need to fix TLinkList_factory vtable stuff
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JMessage::TResourceContainer::TCResource::~TCResource() {
// asm JMessage::TResourceContainer::TCResource::~TCResource() {
extern "C" asm void __dt__Q38JMessage18TResourceContainer10TCResourceFv() {
nofralloc
#include "asm/JSystem/JMessage/resource/__dt__Q38JMessage18TResourceContainer10TCResourceFv.s"
}
@@ -141,7 +141,7 @@ asm JMessage::TResourceContainer::TCResource::~TCResource() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TResourceContainer::TCResource::Get_groupID(u16 param_0) {
asm JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 param_0) {
nofralloc
#include "asm/JSystem/JMessage/resource/Get_groupID__Q38JMessage18TResourceContainer10TCResourceFUs.s"
}
@@ -149,74 +149,52 @@ asm void JMessage::TResourceContainer::TCResource::Get_groupID(u16 param_0) {
/* 802A8FFC-802A9048 2A393C 004C+00 1/0 0/0 0/0 .text
* Do_create__Q38JMessage18TResourceContainer10TCResourceFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TResourceContainer::TCResource::Do_create() {
nofralloc
#include "asm/JSystem/JMessage/resource/Do_create__Q38JMessage18TResourceContainer10TCResourceFv.s"
JMessage::TResource* JMessage::TResourceContainer::TCResource::Do_create() {
TResource* new_res = new TResource();
return new_res;
}
#pragma pop
/* 802A9048-802A906C 2A3988 0024+00 1/0 0/0 0/0 .text
* Do_destroy__Q38JMessage18TResourceContainer10TCResourceFPQ28JMessage9TResource */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TResourceContainer::TCResource::Do_destroy(JMessage::TResource* param_0) {
nofralloc
#include "asm/JSystem/JMessage/resource/Do_destroy__Q38JMessage18TResourceContainer10TCResourceFPQ28JMessage9TResource.s"
void JMessage::TResourceContainer::TCResource::Do_destroy(JMessage::TResource* param_0) {
delete param_0;
}
#pragma pop
/* 802A906C-802A90B8 2A39AC 004C+00 0/0 2/2 0/0 .text __ct__Q28JMessage18TResourceContainerFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JMessage::TResourceContainer::TResourceContainer() {
nofralloc
#include "asm/JSystem/JMessage/resource/__ct__Q28JMessage18TResourceContainerFv.s"
}
#pragma pop
JMessage::TResourceContainer::TResourceContainer() : mEncodingType(0), pfnParseCharacter_(NULL) {}
/* 802A90B8-802A90F0 2A39F8 0038+00 1/1 0/0 0/0 .text
* setEncoding__Q28JMessage18TResourceContainerFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TResourceContainer::setEncoding(u8 param_0) {
nofralloc
#include "asm/JSystem/JMessage/resource/setEncoding__Q28JMessage18TResourceContainerFUc.s"
void JMessage::TResourceContainer::setEncoding(u8 e) {
if (e == 0) {
mEncodingType = e;
pfnParseCharacter_ = NULL;
} else {
setEncoding_(e);
}
}
#pragma pop
/* 802A90F0-802A9130 2A3A30 0040+00 1/1 0/0 0/0 .text
* setEncoding___Q28JMessage18TResourceContainerFUc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TResourceContainer::setEncoding_(u8 param_0) {
nofralloc
#include "asm/JSystem/JMessage/resource/setEncoding___Q28JMessage18TResourceContainerFUc.s"
void JMessage::TResourceContainer::setEncoding_(u8 e) {
mEncodingType = e;
pfnParseCharacter_ = JGadget::toValueFromIndex<JMessage::locale::parseCharacter_function>(
e, sapfnParseCharacter_, 5, NULL);
}
#pragma pop
/* 802A9130-802A9158 2A3A70 0028+00 0/0 2/2 0/0 .text
* __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JMessage::TParse::TParse(JMessage::TResourceContainer* param_0) {
nofralloc
#include "asm/JSystem/JMessage/resource/__ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer.s"
JMessage::TParse::TParse(JMessage::TResourceContainer* pContainer) {
pContainer_ = pContainer;
pResource_ = NULL;
}
#pragma pop
/* 802A9158-802A91B8 2A3A98 0060+00 1/0 0/0 0/0 .text __dt__Q28JMessage6TParseFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm JMessage::TParse::~TParse() {
// asm JMessage::TParse::~TParse() {
extern "C" asm void __dt__Q28JMessage6TParseFv() {
nofralloc
#include "asm/JSystem/JMessage/resource/__dt__Q28JMessage6TParseFv.s"
}
@@ -224,21 +202,66 @@ asm JMessage::TParse::~TParse() {
/* 802A91B8-802A92F4 2A3AF8 013C+00 1/0 0/0 0/0 .text
* parseHeader_next__Q28JMessage6TParseFPPCvPUlUl */
#ifdef NONMATCHING
bool JMessage::TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 param_2) {
const void* pData = *ppData_inout;
data::TParse_THeader header(pData);
*ppData_inout = header.getContent();
*puBlock_out = header.get_blockNumber();
if (memcmp(header.get_signature(), &data::ga4cSignature, sizeof(data::ga4cSignature))) {
return 0;
}
if (header.get_type() != 'bmg1') {
return 0;
}
u8 encoding = header.get_encoding();
if (encoding != 0) {
if (!pContainer_->isEncodingSettable(encoding)) {
return 0;
}
pContainer_->setEncoding(encoding);
}
if (param_2 & 0x10) {
return 1;
}
pResource_ = pContainer_->resContainer_.Do_create();
if (pResource_ == NULL) {
if (param_2 & 0x20) {
return 0;
} else {
return 1;
}
} else {
pContainer_->resContainer_.Push_back_hack(pResource_);
pResource_->setData_header(header.getRaw());
return 1;
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TParse::parseHeader_next(void const** param_0, u32* param_1, u32 param_2) {
asm bool JMessage::TParse::parseHeader_next(void const** param_0, u32* param_1, u32 param_2) {
nofralloc
#include "asm/JSystem/JMessage/resource/parseHeader_next__Q28JMessage6TParseFPPCvPUlUl.s"
}
#pragma pop
#endif
/* 802A92F4-802A9490 2A3C34 019C+00 1/0 0/0 0/0 .text
* parseBlock_next__Q28JMessage6TParseFPPCvPUlUl */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::TParse::parseBlock_next(void const** param_0, u32* param_1, u32 param_2) {
asm bool JMessage::TParse::parseBlock_next(void const** param_0, u32* param_1, u32 param_2) {
nofralloc
#include "asm/JSystem/JMessage/resource/parseBlock_next__Q28JMessage6TParseFPPCvPUlUl.s"
}
@@ -246,21 +269,35 @@ asm void JMessage::TParse::parseBlock_next(void const** param_0, u32* param_1, u
/* 802A9490-802A94A8 2A3DD0 0018+00 1/0 0/0 0/0 .text
* parseCharacter_1Byte__Q28JMessage6localeFPPCc */
// reg swap
#ifdef NONMATCHING
int JMessage::locale::parseCharacter_1Byte(char const** pString) {
u8* c;
int ret;
c = (u8*)*pString;
ret = *c;
*pString = *pString + 1;
return ret;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::locale::parseCharacter_1Byte(char const** param_0) {
asm int JMessage::locale::parseCharacter_1Byte(char const** param_0) {
nofralloc
#include "asm/JSystem/JMessage/resource/parseCharacter_1Byte__Q28JMessage6localeFPPCc.s"
}
#pragma pop
#endif
/* 802A94A8-802A94D4 2A3DE8 002C+00 1/0 0/0 0/0 .text
* parseCharacter_2Byte__Q28JMessage6localeFPPCc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JMessage::locale::parseCharacter_2Byte(char const** param_0) {
asm int JMessage::locale::parseCharacter_2Byte(char const** param_0) {
nofralloc
#include "asm/JSystem/JMessage/resource/parseCharacter_2Byte__Q28JMessage6localeFPPCc.s"
}