mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-31 08:12:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup/doc JMessage / d_msg_class (#2484)

Browse Source 
* jmessage cleanup pass

* more JMessage cleanup

* d_msg_class cleanup
This commit is contained in:
TakaRikka
2025-06-13 05:33:33 -07:00
committed by GitHub
parent 7f6be99616
commit bf8a906790
24 changed files with 3660 additions and 3302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JMessage/control.cpp
+30 -20
View File
@@ -7,9 +7,16 @@
/* 802A7548-802A758C 2A1E88 0044+00 0/0 2/2 0/0 .text __ct__Q28JMessage8TControlFv */
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) {}
: pSequenceProcessor_(NULL),
pRenderingProcessor_(NULL),
uMessageGroupID_(0xFFFF),
uMessageID_(0xFFFF),
pResourceCache_(NULL),
pEntry_(NULL),
pMessageText_begin_(NULL),
pszText_update_current_(NULL),
pMessageText_current_(NULL)
{}
/* 802A758C-802A75D4 2A1ECC 0048+00 1/0 2/2 0/0 .text __dt__Q28JMessage8TControlFv */
JMessage::TControl::~TControl() {}
@@ -17,9 +24,9 @@ JMessage::TControl::~TControl() {}
/* 802A75D4-802A7634 2A1F14 0060+00 0/0 9/9 0/0 .text reset__Q28JMessage8TControlFv */
void JMessage::TControl::reset() {
pEntry_ = NULL;
pMessageText_begin_ = 0;
pMessageText_begin_ = NULL;
pszText_update_current_ = NULL;
field_0x20 = 0;
pMessageText_current_ = NULL;
oStack_renderingProcessor_.clear();
if (pSequenceProcessor_ != NULL) {
@@ -38,7 +45,6 @@ int JMessage::TControl::update() {
}
pszText_update_current_ = pSequenceProcessor_->process(NULL);
if (pszText_update_current_ == NULL) {
pMessageText_begin_ = 0;
return 0;
@@ -50,44 +56,48 @@ int JMessage::TControl::update() {
/* 802A76BC-802A77E8 2A1FFC 012C+00 0/0 5/5 0/0 .text render__Q28JMessage8TControlFv */
void JMessage::TControl::render() {
if (isReady_render_()) {
pRenderingProcessor_->setBegin_messageEntryText(pResourceCache_, pEntry_, field_0x20);
pRenderingProcessor_->setBegin_messageEntryText(pResourceCache_, pEntry_, pMessageText_current_);
pRenderingProcessor_->oStack_ = oStack_renderingProcessor_;
pRenderingProcessor_->process(pszText_update_current_);
}
}
/* 802A77E8-802A78F4 2A2128 010C+00 0/0 1/1 0/0 .text setMessageCode__Q28JMessage8TControlFUsUs */
int JMessage::TControl::setMessageCode(u16 param_0, u16 param_1) {
return setMessageCode_inReset_(getProcessor(), param_0, param_1);
int JMessage::TControl::setMessageCode(u16 u16GroupID, u16 u16Index) {
TProcessor* pProcessor = getProcessor();
JUT_ASSERT(120, pProcessor!=0);
return setMessageCode_inReset_(pProcessor, u16GroupID, u16Index);
}
/* 802A78F4-802A7A20 2A2234 012C+00 0/0 6/6 0/0 .text setMessageID__Q28JMessage8TControlFUlUlPb */
int JMessage::TControl::setMessageID(u32 param_0, u32 param_1, bool* param_2) {
int JMessage::TControl::setMessageID(u32 uMsgID, u32 param_1, bool* pbValid) {
TProcessor* pProcessor = getProcessor();
JUT_ASSERT(132, pProcessor!=0);
u32 code = pProcessor->toMessageCode_messageID(param_0, param_1, param_2);
if (code == -1) {
u32 uCode = pProcessor->toMessageCode_messageID(uMsgID, param_1, pbValid);
if (uCode == 0xFFFFFFFF) {
return 0;
}
return setMessageCode_inReset_(pProcessor, code >> 0x10, code & 0xFFFF);
return setMessageCode_inReset_(pProcessor, uCode >> 16, uCode & 0xFFFF);
}
/* 802A7A20-802A7AF8 2A2360 00D8+00 2/2 1/1 0/0 .text
* setMessageCode_inSequence___Q28JMessage8TControlFPCQ28JMessage10TProcessorUsUs */
bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const* pProcessor,
u16 messageCode, u16 messageIndex) {
pEntry_ = pProcessor->getMessageEntry_messageCode(messageCode, messageIndex);
bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const* pProcessor, u16 u16GroupID, u16 u16Index) {
pEntry_ = pProcessor->getMessageEntry_messageCode(u16GroupID, u16Index);
if (pEntry_ == NULL) {
return false;
}
messageCode_ = messageCode;
field_0xe = messageIndex;
uMessageGroupID_ = u16GroupID;
uMessageID_ = u16Index;
pResourceCache_ = pProcessor->getResourceCache();
JUT_ASSERT(155, pResourceCache_!=0);
pMessageText_begin_ = pResourceCache_->getMessageText_messageEntry(pEntry_);
field_0x20 = pMessageText_begin_;
pMessageText_current_ = pMessageText_begin_;
oStack_renderingProcessor_.clear();
return true;
}
src/JSystem/JMessage/data.cpp
+3 -7
View File
@@ -1,10 +1,6 @@
//
// Generated By: dol2asm
// Translation Unit: data
//
#include "JSystem/JMessage/data.h"
#include "dol2asm.h"
/* 80455818-80455820 003E18 0004+04 0/0 1/1 0/0 .sdata2 ga4cSignature__Q28JMessage4data */
SECTION_SDATA2 u32 JMessage::data::ga4cSignature = 'MESG';
const u32 JMessage::data::ga4cSignature = 'MESG';
const u32 JMessage::data::ga4cSignature_color = 'MGCL';
src/JSystem/JMessage/locale.cpp
+39 -41
View File
@@ -1,60 +1,58 @@
//
// Generated By: dol2asm
// Translation Unit: locale
//
#include "JSystem/JMessage/locale.h"
#include <dolphin.h>
/* 802A9528-802A958C 2A3E68 0064+00 0/0 1/0 0/0 .text
* parseCharacter_ShiftJIS__Q28JMessage6localeFPPCc */
int JMessage::locale::parseCharacter_ShiftJIS(char const** str) {
u8 c = **str;
int ret = c;
*str = *str + 1;
int JMessage::locale::parseCharacter_ShiftJIS(const char** ppszText) {
int c = *(u8*)*ppszText & 0xFF;
(*ppszText)++;
if (isLeadByte_ShiftJIS(c)) {
ret <<= 8;
ret |= *(u8*)*str;
*str = *str + 1;
c <<= 8;
c |= *(u8*)*ppszText & 0xFF;
(*ppszText)++;
}
return ret;
return c;
}
/* 802A958C-802A968C 2A3ECC 0100+00 0/0 1/0 0/0 .text parseCharacter_UTF8__Q28JMessage6localeFPPCc
*/
int JMessage::locale::parseCharacter_UTF8(char const** str) {
int c = *(u8*)*str;
int ret = c;
*str = *str + 1;
int JMessage::locale::parseCharacter_UTF8(const char** ppszText) {
int c = *(u8*)*ppszText & 0xFF;
(*ppszText)++;
if (c & 0x80) {
if ((c & 0xe0) == 0xc0) {
ret = (ret & 0x1f) << 6;
ret |= **str & 0x3f;
*str = *str + 1;
} else if ((c & 0xf0) == 0xe0) {
ret = (ret & 0xf) << 6;
ret |= **str & 0x3f;
*str = *str + 1;
ret <<= 6;
ret |= **str & 0x3f;
*str = *str + 1;
} else if ((c & 0xf8) == 0xf0) {
ret = (ret & 0x7) << 6;
ret |= **str & 0x3f;
*str = *str + 1;
ret <<= 6;
ret |= **str & 0x3f;
*str = *str + 1;
ret <<= 6;
ret |= **str & 0x3f;
*str = *str + 1;
if ((c & 0xE0) == 0xC0) {
c &= 0x1F;
c <<= 6;
c |= (*(u8*)*ppszText & 0xFF) & 0x3F;
(*ppszText)++;
} else if ((c & 0xF0) == 0xE0) {
c &= 0xF;
c <<= 6;
c |= (*(u8*)*ppszText & 0xFF) & 0x3F;
(*ppszText)++;
c <<= 6;
c |= (*(u8*)*ppszText & 0xFF) & 0x3F;
(*ppszText)++;
} else if ((c & 0xF8) == 0xF0) {
c &= 0x7;
c <<= 6;
c |= (*(u8*)*ppszText & 0xFF) & 0x3F;
(*ppszText)++;
c <<= 6;
c |= (*(u8*)*ppszText & 0xFF) & 0x3F;
(*ppszText)++;
c <<= 6;
c |= (*(u8*)*ppszText & 0xFF) & 0x3F;
(*ppszText)++;
} else {
ret = -1;
c = -1;
}
}
return ret;
return c;
}
src/JSystem/JMessage/processor.cpp
+322 -190
View File
@@ -1,11 +1,7 @@
//
// Generated By: dol2asm
// Translation Unit: processor
//
#include "JSystem/JMessage/processor.h"
#include "JSystem/JMessage/control.h"
#include "JSystem/JUtility/JUTAssert.h"
#include <cstdint.h>
/* 802A7AF8-802A7B40 2A2438 0048+00 1/0 2/2 0/0 .text __dt__Q28JMessage10TReferenceFv */
JMessage::TReference::~TReference() {}
@@ -26,87 +22,100 @@ void JMessage::TProcessor::reset() {
/* 802A7BF8-802A7C30 2A2538 0038+00 1/1 8/8 0/0 .text
* stack_pushCurrent__Q28JMessage10TProcessorFPCc */
void JMessage::TProcessor::stack_pushCurrent(char const* string) {
if (string != NULL) {
void JMessage::TProcessor::stack_pushCurrent(char const* pszText) {
if (pszText != NULL) {
if (!oStack_.IsPushable()) {
JGADGET_WARNMSG(113, "stack full");
return;
}
stack_pushCurrent_(string);
stack_pushCurrent_(pszText);
}
}
/* 802A7C30-802A7C54 2A2570 0024+00 1/1 0/0 0/0 .text stack_popCurrent__Q28JMessage10TProcessorFv
*/
void JMessage::TProcessor::stack_popCurrent() {
JGADGET_ASSERTWARN(122, !oStack_.empty());
stack_popCurrent_();
}
/* 802A7C54-802A7CD4 2A2594 0080+00 1/1 1/1 0/0 .text
* getResource_groupID__Q28JMessage10TProcessorCFUs */
const JMessage::TResource* JMessage::TProcessor::getResource_groupID(u16 groupID) const {
if (isResourceCache_groupID(groupID)) {
const JMessage::TResource* JMessage::TProcessor::getResource_groupID(u16 u16GroupID) const {
if (isResourceCache_groupID(u16GroupID)) {
return pResourceCache_;
}
// Is there another way to do this?
((JMessage::TProcessor*)this)->pResourceCache_ = getResource_groupID_uncached(groupID);
pResourceCache_ = getResource_groupID_uncached(u16GroupID);
return pResourceCache_;
}
/* 802A7CD4-802A7E38 2A2614 0164+00 0/0 1/1 0/0 .text
* toMessageCode_messageID__Q28JMessage10TProcessorCFUlUlPb */
// NONMATCHING regalloc
u32 JMessage::TProcessor::toMessageCode_messageID(u32 param_0, u32 param_1, bool* param_2) const {
const TResource* this_00 = getResourceCache();
if (this_00 != NULL) {
u16 uVar4 = this_00->toMessageIndex_messageID(param_0, param_1, param_2);
if (uVar4 != 0xffff) {
return uVar4 | (this_00->getGroupID() << 16);
// NONMATCHING - regalloc, likely due to wrong enumerator implementation
u32 JMessage::TProcessor::toMessageCode_messageID(u32 uMsgID, u32 param_1, bool* pbValid) const {
const TResource* pResourceCache = getResourceCache();
if (pResourceCache != NULL) {
u16 u16Index = pResourceCache->toMessageIndex_messageID(uMsgID, param_1, pbValid);
if (u16Index != 0xFFFF) {
return u16Index | (pResourceCache->getGroupID() << 16);
}
}
TResourceContainer* this_01 = getResourceContainer();
if (this_01 == NULL) {
return -1;
TResourceContainer* pResourceContainer = getResourceContainer();
if (pResourceContainer == NULL) {
return 0xFFFFFFFF;
}
JGadget::TContainerEnumerator_const<JMessage::TResource, 0> enumerator(this_01->getResourceContainer());
const TResource* this_02;
JGadget::TContainerEnumerator_const<JMessage::TResource, 0> enumerator(pResourceContainer->getResourceContainer());
const TResource* pResource;
while (enumerator) {
this_02 = (const TResource*)&(*enumerator);
if (this_02 != this_00) {
u16 uVar4 = this_02->toMessageIndex_messageID(param_0, param_1, param_2);
if (uVar4 != 0xffff) {
((JMessage::TProcessor*)this)->pResourceCache_ = this_02;
return uVar4 | (this_02->getGroupID() << 0x10);
pResource = (const TResource*)&(*enumerator);
if (pResource != pResourceCache) {
u16 u16Index = pResource->toMessageIndex_messageID(uMsgID, param_1, pbValid);
if (u16Index != 0xFFFF) {
((JMessage::TProcessor*)this)->pResourceCache_ = pResource;
return u16Index | (pResource->getGroupID() << 16);
}
}
}
return -1;
return 0xFFFFFFFF;
}
/* 802A7E38-802A7EDC 2A2778 00A4+00 1/1 0/0 0/0 .text
* on_select_begin__Q28JMessage10TProcessorFPFPQ28JMessage10TProcessor_PCcPCvPCcUl */
void JMessage::TProcessor::on_select_begin(char const* (*param_0)(JMessage::TProcessor*),
void const* param_1, char const* param_2, u32 param_3) {
if (stack_isPushable()) {
void JMessage::TProcessor::on_select_begin(char const* (*pfn)(JMessage::TProcessor*),
void const* pOffset, char const* pcBase, u32 uNumber) {
JUT_ASSERT(191, uNumber>0);
if (!stack_isPushable()) {
JGADGET_WARNMSG(194, "stack full");
} else {
oProcess_.reset_select();
oProcess_.rData.pfn = param_0;
oProcess_.rData.pcBase = param_2;
oProcess_.rData.pOffset = param_1;
oProcess_.rData.uRest = param_3;
const char* psz = param_0(this);
oProcess_.rData.pfn = pfn;
oProcess_.rData.pcBase = pcBase;
oProcess_.rData.pOffset = pOffset;
oProcess_.rData.uRest = uNumber;
JUT_ASSERT(205, pfn!=0);
const char* psz = pfn(this);
JUT_ASSERT(207, psz!=0);
stack_pushCurrent_(psz);
do_select_begin(param_3);
do_select_begin(uNumber);
}
}
/* 802A7EDC-802A7F34 2A281C 0058+00 1/1 0/0 0/0 .text on_select_end__Q28JMessage10TProcessorFv */
void JMessage::TProcessor::on_select_end() {
TProcess_::rdata& rData = oProcess_.rData;
JUT_ASSERT(219, rData.uRest==0);
oProcess_.reset_normal();
JUT_ASSERT(223, stack_isPushable());
stack_popCurrent_();
do_select_end();
}
@@ -115,8 +124,17 @@ void JMessage::TProcessor::on_select_end() {
* on_select_separate__Q28JMessage10TProcessorFv */
void JMessage::TProcessor::on_select_separate() {
stack_popCurrent_();
JUT_ASSERT(234, stack_isPushable());
TProcess_::rdata& rData = oProcess_.rData;
JUT_ASSERT(237, rData.uRest>0);
const char* (*pfn)(TProcessor*) = rData.pfn;
JUT_ASSERT(240, pfn!=0);
const char* psz = pfn(this);
JUT_ASSERT(242, psz!=0);
const char* psz = oProcess_.rData.pfn(this);
stack_pushCurrent_(psz);
do_select_separate();
}
@@ -126,23 +144,23 @@ void JMessage::TProcessor::on_select_separate() {
void JMessage::TProcessor::do_reset() {}
/* 802A7FC4-802A7FC8 2A2904 0004+00 3/0 0/0 0/0 .text do_begin__Q28JMessage10TProcessorFPCvPCc */
void JMessage::TProcessor::do_begin(void const* param_0, char const* param_1) {}
void JMessage::TProcessor::do_begin(void const* pEntry, char const* pszText) {}
/* 802A7FC8-802A7FCC 2A2908 0004+00 3/0 0/0 0/0 .text do_end__Q28JMessage10TProcessorFv
*/
void JMessage::TProcessor::do_end() {}
/* 802A7FCC-802A7FD0 2A290C 0004+00 3/0 0/0 0/0 .text do_character__Q28JMessage10TProcessorFi */
void JMessage::TProcessor::do_character(int param_0) {}
void JMessage::TProcessor::do_character(int iCharacter) {}
/* 802A7FD0-802A7FD8 2A2910 0008+00 3/0 0/0 0/0 .text do_tag__Q28JMessage10TProcessorFUlPCvUl */
bool JMessage::TProcessor::do_tag(u32 param_0, void const* param_1, u32 param_2) {
bool JMessage::TProcessor::do_tag(u32 uTag, void const* pData, u32 uSize) {
return false;
}
/* 802A7FD8-802A7FDC 2A2918 0004+00 3/0 6/0 0/0 .text do_select_begin__Q28JMessage10TProcessorFUl
*/
void JMessage::TProcessor::do_select_begin(u32 param_0) {}
void JMessage::TProcessor::do_select_begin(u32 uNumber) {}
/* 802A7FDC-802A7FE0 2A291C 0004+00 3/0 6/0 0/0 .text do_select_end__Q28JMessage10TProcessorFv */
void JMessage::TProcessor::do_select_end() {}
@@ -154,22 +172,33 @@ void JMessage::TProcessor::do_select_separate() {}
/* 802A7FE4-802A8084 2A2924 00A0+00 1/1 0/0 0/0 .text on_tag___Q28JMessage10TProcessorFv
*/
void JMessage::TProcessor::on_tag_() {
u32 size;
u8* psz = (u8*)getCurrent();
size = *psz;
u32 uSize;
char* psz = (char*)getCurrent();
JUT_ASSERT(292, psz!=0);
JUT_ASSERT(293, psz[-1]==data::gcTagBegin);
pszCurrent_ = size + (char*)psz + -1;
uSize = *(u8*)psz;
pszCurrent_ = uSize + psz - 1;
u32 tag = (psz[1] << 0x8) | psz[2];
tag <<= 8;
tag |= psz[3];
psz++;
on_tag(tag, &psz[4], size - 5);
u32 uTag = *(u8*)psz & 0xFF;
psz++;
uTag <<= 8;
uTag |= *(u8*)psz & 0xFF;
psz++;
uTag <<= 8;
uTag |= *(u8*)psz & 0xFF;
psz++;
on_tag(uTag, psz, uSize - 5);
}
/* 802A8084-802A8088 2A29C4 0004+00 2/0 4/0 0/0 .text do_resetStatus___Q28JMessage10TProcessorFPCc
*/
void JMessage::TProcessor::do_resetStatus_(char const* param_0) {}
void JMessage::TProcessor::do_resetStatus_(char const* pszText) {}
/* 802A8088-802A8090 2A29C8 0008+00 2/0 4/0 0/0 .text
* do_setBegin_isReady___Q28JMessage10TProcessorCFv */
@@ -178,46 +207,58 @@ bool JMessage::TProcessor::do_setBegin_isReady_() const {
}
/* 802A8090-802A81EC 2A29D0 015C+00 2/2 0/0 0/0 .text do_tag___Q28JMessage10TProcessorFUlPCvUl */
void JMessage::TProcessor::do_tag_(u32 uTag, void const* data, u32 uSize) {
u32 group = data::getTagGroup(uTag);
u32 code = data::getTagCode(uTag);
void JMessage::TProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
u8 uGroupID = data::getTagGroup(uTag);
unsigned int uCode = data::getTagCode(uTag);
switch (group) {
switch (uGroupID) {
case 0xFF:
switch (code) {
switch (uCode & 0xFFFF) {
case 4:
stack_pushCurrent(
on_word(JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(data)));
JUT_ASSERT(331, uSize==4);
stack_pushCurrent(on_word(JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(pData)));
break;
case 5:
stack_pushCurrent(on_message(
JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(data)));
JUT_ASSERT(341, uSize==4);
stack_pushCurrent(on_message(JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(pData)));
break;
default:
JGADGET_WARNMSG1(351, "unknown system-tag-code : ", uCode & 0xFFFF);
}
break;
case 0xFE:
stack_pushCurrent(on_word(code));
JUT_ASSERT(356, uSize==0);
stack_pushCurrent(on_word(uCode & 0xFFFF));
break;
case 0xFD:
stack_pushCurrent(on_message_limited(code));
JUT_ASSERT(361, uSize==0);
stack_pushCurrent(on_message_limited(uCode));
break;
case 0xF6:
on_select_begin(process_onSelect_limited_, data, (char*)data + uSize, code);
break;
case 0xF5:
on_select_begin(process_onSelect_, data, (char*)data + uSize, code);
case 0xF6: {
u32 uNumber = uCode & 0xFFFF;
JUT_ASSERT(368, uSize==4*uNumber);
on_select_begin(process_onSelect_limited_, pData, (char*)pData + uSize, uCode);
break;
}
case 0xF5:
u32 uNumber = uCode & 0xFFFF;
JUT_ASSERT(377, uSize==4*uNumber);
on_select_begin(process_onSelect_, pData, (char*)pData + uSize, uCode);
break;
}
JGADGET_WARNMSG4(387, "unknown tag-value : [", (unsigned int)uGroupID, "-", uCode & 0xFFFF, ']');
}
/* 802A81EC-802A828C 2A2B2C 00A0+00 2/2 0/0 0/0 .text
* process_character___Q28JMessage10TProcessorFv */
bool JMessage::TProcessor::process_character_() {
int character = on_parseCharacter(&pszCurrent_);
JUT_ASSERT(397, pszCurrent_!=0);
int iCharacter = on_parseCharacter(&pszCurrent_);
switch (character) {
switch (iCharacter) {
case 0:
if (!oProcess_.pfnProcess_CharacterEnd(this)) {
if (!oProcess_.pfnProcess_onCharacterEnd(this)) {
return false;
}
break;
@@ -225,7 +266,7 @@ bool JMessage::TProcessor::process_character_() {
on_tag_();
break;
default:
on_character(character);
on_character(iCharacter);
}
return true;
@@ -234,6 +275,8 @@ bool JMessage::TProcessor::process_character_() {
/* 802A828C-802A82F4 2A2BCC 0068+00 6/6 6/6 0/0 .text
* process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
bool JMessage::TProcessor::process_onCharacterEnd_normal_(JMessage::TProcessor* pThis) {
JUT_ASSERT(420, pThis->oProcess_.pfnProcess_onCharacterEnd== &process_onCharacterEnd_normal_);
if (!pThis->oStack_.empty()) {
pThis->stack_popCurrent();
return true;
@@ -246,9 +289,14 @@ bool JMessage::TProcessor::process_onCharacterEnd_normal_(JMessage::TProcessor*
/* 802A82F4-802A833C 2A2C34 0048+00 1/1 0/0 0/0 .text
* process_onCharacterEnd_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
bool JMessage::TProcessor::process_onCharacterEnd_select_(JMessage::TProcessor* pThis) {
pThis->oProcess_.rData.uRest--;
JUT_ASSERT(435, pThis->oProcess_.pfnProcess_onCharacterEnd== &process_onCharacterEnd_select_);
JUT_ASSERT(436, !pThis->oStack_.empty());
if (pThis->oProcess_.rData.uRest != 0) {
TProcess_::rdata& rData = pThis->oProcess_.rData;
rData.uRest--;
u32 uRest = rData.uRest;
if (uRest != 0) {
pThis->on_select_separate();
return true;
}
@@ -260,77 +308,110 @@ bool JMessage::TProcessor::process_onCharacterEnd_select_(JMessage::TProcessor*
/* 802A833C-802A8358 2A2C7C 001C+00 1/1 0/0 0/0 .text
* process_onSelect_limited___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor* pThis) {
u16 data = JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse((u16*)pThis->oProcess_.rData.pOffset);
TProcess_::rdata& rData = pThis->oProcess_.rData;
JUT_ASSERT(454, rData.pfn==&process_onSelect_limited_);
JUT_ASSERT(455, rData.pcBase!=0);
JUT_ASSERT(456, rData.pOffset!=0);
JUT_ASSERT(457, rData.uRest>0);
pThis->oProcess_.rData.pOffset =
(void*)((u8*)pThis->oProcess_.rData.pOffset + 2);
u16* puOffset = (u16*)rData.pOffset;
u16 uData = JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(puOffset);
return &pThis->oProcess_.rData.pcBase[data];
rData.pOffset = (void*)(puOffset + 1);
return &rData.pcBase[uData];
}
/* 802A8358-802A8374 2A2C98 001C+00 1/1 0/0 0/0 .text
* process_onSelect___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
const char* JMessage::TProcessor::process_onSelect_(JMessage::TProcessor* pThis) {
u32 data = JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse((u32*)pThis->oProcess_.rData.pOffset);
TProcess_::rdata& rData = pThis->oProcess_.rData;
JUT_ASSERT(471, rData.pfn==&process_onSelect_);
JUT_ASSERT(472, rData.pcBase!=0);
JUT_ASSERT(473, rData.pOffset!=0);
JUT_ASSERT(474, rData.uRest>0);
pThis->oProcess_.rData.pOffset =
(void*)((u8*)pThis->oProcess_.rData.pOffset + 4);
u32* puOffset = (u32*)rData.pOffset;
u32 uData = JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(puOffset);
return &pThis->oProcess_.rData.pcBase[data];
rData.pOffset = (void*)(puOffset + 1);
return &rData.pcBase[uData];
}
/* 802A8374-802A83B8 2A2CB4 0044+00 0/0 2/2 0/0 .text
* __ct__Q28JMessage18TSequenceProcessorFPCQ28JMessage10TReferencePQ28JMessage8TControl */
JMessage::TSequenceProcessor::TSequenceProcessor(JMessage::TReference const* param_0,
JMessage::TControl* param_1)
: TProcessor(param_0), pControl_(param_1), eStatus_(STATUS_READY) {}
JMessage::TSequenceProcessor::TSequenceProcessor(JMessage::TReference const* pReference,
JMessage::TControl* pControl)
: TProcessor(pReference),
pControl_(pControl),
eStatus_(STATUS_READY)
{}
/* 802A83B8-802A8418 2A2CF8 0060+00 1/0 2/2 0/0 .text __dt__Q28JMessage18TSequenceProcessorFv */
JMessage::TSequenceProcessor::~TSequenceProcessor() {}
/* 802A8418-802A85A4 2A2D58 018C+00 0/0 1/1 0/0 .text process__Q28JMessage18TSequenceProcessorFPCc
*/
const char* JMessage::TSequenceProcessor::process(char const* param_0) {
const char* JMessage::TSequenceProcessor::process(char const* pszText) {
do {
switch (eStatus_) {
case STATUS_NORMAL:
break;
case STATUS_JUMP: {
JUT_ASSERT(549, pControl_!=0);
if (!on_jump_isReady()) {
return pszCurrent_;
}
eStatus_ = STATUS_NORMAL;
const void* data = oProcess2_.process.jump_process.jumpFn(this);
if (data != NULL) {
on_jump(data, pControl_->getMessageText_begin());
TProcess_& process = oProcess2_;
TSequenceProcessor::jumpPfn pfn = process.process.jump_process.jumpFn;
JUT_ASSERT(556, pfn!=0);
const void* pEntry = pfn(this);
if (pEntry != NULL) {
on_jump(pEntry, pControl_->getMessageText_begin());
}
break;
}
case STATUS_BRANCH:
u32 tmp = on_branch_queryResult();
if (tmp > 0x7FFFFFFF) {
switch (tmp) {
case STATUS_BRANCH: {
JUT_ASSERT(567, pControl_!=0);
u32 queryResult = on_branch_queryResult();
if (queryResult > 0x7FFFFFFF) {
switch (queryResult) {
case -1:
return pszCurrent_;
case -2:
eStatus_ = STATUS_NORMAL;
break;
default:
JUT_ASSERT(579, false);
}
} else {
eStatus_ = STATUS_NORMAL;
if (tmp < oProcess2_.process.branch_process.uTarget) {
const void* data = oProcess2_.process.branch_process.branchFn(this, tmp);
if (data != NULL) {
on_branch(data, pControl_->getMessageText_begin());
TProcess_& process = oProcess2_;
if (queryResult >= process.process.branch_process.uTarget) {
JGADGET_WARNMSG1(588, "unknown result : ", queryResult);
} else {
TSequenceProcessor::branchPfn pfn = process.process.branch_process.branchFn;
JUT_ASSERT(592, pfn!=0);
const void* pEntry = pfn(this, queryResult);
if (pEntry != NULL) {
on_branch(pEntry, pControl_->getMessageText_begin());
}
}
}
break;
}
default:
JUT_ASSERT(602, false);
}
if (pszCurrent_ == param_0) {
if (pszCurrent_ == pszText) {
on_end();
return NULL;
}
@@ -346,59 +427,76 @@ const char* JMessage::TSequenceProcessor::process(char const* param_0) {
/* 802A85A4-802A85D0 2A2EE4 002C+00 1/1 0/0 0/0 .text
* on_isReady__Q28JMessage18TSequenceProcessorFv */
bool JMessage::TSequenceProcessor::on_isReady() {
JUT_ASSERT(629, eStatus_==STATUS_NORMAL);
return do_isReady();
}
/* 802A85D0-802A85E4 2A2F10 0014+00 1/1 0/0 0/0 .text
* on_jump_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessor_PCvUl */
void JMessage::TSequenceProcessor::on_jump_register(JMessage::TSequenceProcessor::jumpPfn param_0,
u32 param_1) {
void JMessage::TSequenceProcessor::on_jump_register(JMessage::TSequenceProcessor::jumpPfn pfn, u32 u32Target) {
JUT_ASSERT(638, eStatus_==STATUS_NORMAL);
eStatus_ = STATUS_JUMP;
oProcess2_.process.jump_process.jumpFn = param_0;
oProcess2_.process.jump_process.u32Target = param_1;
TProcess_& process = oProcess2_;
process.process.jump_process.jumpFn = pfn;
process.process.jump_process.u32Target = u32Target;
}
/* 802A85E4-802A8610 2A2F24 002C+00 1/1 0/0 0/0 .text
* on_jump_isReady__Q28JMessage18TSequenceProcessorFv */
bool JMessage::TSequenceProcessor::on_jump_isReady() {
JUT_ASSERT(649, eStatus_==STATUS_JUMP);
return do_jump_isReady();
}
/* 802A8610-802A8690 2A2F50 0080+00 1/1 0/0 0/0 .text
* on_jump__Q28JMessage18TSequenceProcessorFPCvPCc */
void JMessage::TSequenceProcessor::on_jump(void const* param_0, char const* param_1) {
on_resetStatus_(param_1);
do_jump(param_0, param_1);
void JMessage::TSequenceProcessor::on_jump(void const* pEntry, char const* pszText) {
on_resetStatus_(pszText);
JUT_ASSERT(658, eStatus_==STATUS_NORMAL);
JUT_ASSERT(659, pEntry!=0);
JUT_ASSERT(660, pszText!=0);
do_jump(pEntry, pszText);
}
/* 802A8690-802A86A0 2A2FD0 0010+00 1/1 0/0 0/0 .text
* on_branch_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessorUl_PCvPCvUl
*/
void JMessage::TSequenceProcessor::on_branch_register(
JMessage::TSequenceProcessor::branchPfn param_0, void const* param_1, u32 param_2) {
oProcess2_.process.branch_process.branchFn = param_0;
oProcess2_.process.branch_process.pTarget = param_1;
oProcess2_.process.branch_process.uTarget = param_2;
void JMessage::TSequenceProcessor::on_branch_register(JMessage::TSequenceProcessor::branchPfn pfn, void const* pTarget, u32 uTarget) {
JUT_ASSERT(669, eStatus_==STATUS_NORMAL);
TProcess_& process = oProcess2_;
process.process.branch_process.branchFn = pfn;
process.process.branch_process.pTarget = pTarget;
process.process.branch_process.uTarget = uTarget;
}
/* 802A86A0-802A86D4 2A2FE0 0034+00 1/1 0/0 0/0 .text
* on_branch_query__Q28JMessage18TSequenceProcessorFUl */
void JMessage::TSequenceProcessor::on_branch_query(u32 param_0) {
void JMessage::TSequenceProcessor::on_branch_query(u32 uCode) {
JUT_ASSERT(680, eStatus_==STATUS_NORMAL);
eStatus_ = STATUS_BRANCH;
do_branch_query(param_0);
do_branch_query(uCode);
}
/* 802A86D4-802A8700 2A3014 002C+00 1/1 0/0 0/0 .text
* on_branch_queryResult__Q28JMessage18TSequenceProcessorFv */
u32 JMessage::TSequenceProcessor::on_branch_queryResult() {
return do_branch_queryResult();
JUT_ASSERT(691, eStatus_==STATUS_BRANCH);
u32 result = do_branch_queryResult();
return result;
}
/* 802A8700-802A8780 2A3040 0080+00 1/1 0/0 0/0 .text
* on_branch__Q28JMessage18TSequenceProcessorFPCvPCc */
void JMessage::TSequenceProcessor::on_branch(void const* param_0, char const* param_1) {
on_resetStatus_(param_1);
do_branch(param_0, param_1);
void JMessage::TSequenceProcessor::on_branch(void const* pEntry, char const* pszText) {
on_resetStatus_(pszText);
JUT_ASSERT(717, eStatus_==STATUS_NORMAL);
JUT_ASSERT(718, pEntry!=0);
JUT_ASSERT(719, pszText!=0);
do_branch(pEntry, pszText);
}
/* 802A8780-802A8788 2A30C0 0008+00 1/0 0/0 0/0 .text
@@ -415,11 +513,11 @@ bool JMessage::TSequenceProcessor::do_jump_isReady() {
/* 802A8790-802A8794 2A30D0 0004+00 1/0 0/0 0/0 .text
* do_jump__Q28JMessage18TSequenceProcessorFPCvPCc */
void JMessage::TSequenceProcessor::do_jump(void const* param_0, char const* param_1) {}
void JMessage::TSequenceProcessor::do_jump(void const* pEntry, char const* pszText) {}
/* 802A8794-802A8798 2A30D4 0004+00 1/0 2/0 0/0 .text
* do_branch_query__Q28JMessage18TSequenceProcessorFUl */
void JMessage::TSequenceProcessor::do_branch_query(u32 param_0) {}
void JMessage::TSequenceProcessor::do_branch_query(u32 uCode) {}
/* 802A8798-802A87A0 2A30D8 0008+00 1/0 2/0 0/0 .text
* do_branch_queryResult__Q28JMessage18TSequenceProcessorFv */
@@ -429,14 +527,14 @@ s32 JMessage::TSequenceProcessor::do_branch_queryResult() {
/* 802A87A0-802A87A4 2A30E0 0004+00 1/0 2/0 0/0 .text
* do_branch__Q28JMessage18TSequenceProcessorFPCvPCc */
void JMessage::TSequenceProcessor::do_branch(void const* param_0, char const* param_1) {}
void JMessage::TSequenceProcessor::do_branch(void const* pEntry, char const* pszText) {}
/* 802A87A4-802A87C0 2A30E4 001C+00 1/0 2/0 0/0 .text
* do_resetStatus___Q28JMessage18TSequenceProcessorFPCc */
void JMessage::TSequenceProcessor::do_resetStatus_(char const* param_0) {
void JMessage::TSequenceProcessor::do_resetStatus_(char const* pszText) {
eStatus_ = STATUS_READY;
if (param_0 != NULL) {
if (pszText != NULL) {
eStatus_ = STATUS_NORMAL;
}
}
@@ -449,145 +547,178 @@ bool JMessage::TSequenceProcessor::do_setBegin_isReady_() const {
/* 802A87D0-802A87D4 2A3110 0004+00 1/0 2/0 0/0 .text
* do_begin___Q28JMessage18TSequenceProcessorFPCvPCc */
void JMessage::TSequenceProcessor::do_begin_(void const* param_0, char const* param_1) {}
void JMessage::TSequenceProcessor::do_begin_(void const* pEntry, char const* pszText) {
JUT_ASSERT(782, eStatus_==STATUS_NORMAL);
}
/* 802A87D4-802A87E0 2A3114 000C+00 1/0 2/0 0/0 .text do_end___Q28JMessage18TSequenceProcessorFv
*/
void JMessage::TSequenceProcessor::do_end_() {
JUT_ASSERT(789, eStatus_==STATUS_NORMAL);
eStatus_ = STATUS_ONE;
}
/* 802A87E0-802A892C 2A3120 014C+00 2/0 2/0 0/0 .text
* do_tag___Q28JMessage18TSequenceProcessorFUlPCvUl */
void JMessage::TSequenceProcessor::do_tag_(u32 uTag, void const* data, u32 uSize) {
char* temp = (char*)data;
u32 group = data::getTagGroup(uTag);
u32 code = data::getTagCode(uTag);
void JMessage::TSequenceProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
u8 uGroupID = data::getTagGroup(uTag);
unsigned int uCode = data::getTagCode(uTag);
switch (group) {
switch (uGroupID) {
case 0xFF:
switch (code) {
switch (uCode & 0xFFFF) {
case 0:
case 1:
case 2:
case 3:
break;
case 6: {
u32 tmp = JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(temp);
on_jump_register(process_onJump_, tmp);
JUT_ASSERT(807, uSize==4);
u32 u32Target = JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(pData);
on_jump_register(process_onJump_, u32Target);
break;
}
case 7:
break;
default:
TProcessor::do_tag_(uTag, temp, uSize);
default: {
TProcessor::do_tag_(uTag, pData, uSize);
break;
}
}
break;
case 0xFC:
on_jump_register(process_onJump_limited_, code);
case 0xFC: {
JUT_ASSERT(828, uSize==0);
on_jump_register(process_onJump_limited_, uCode & 0xFFFF);
break;
case 0xFB:
on_branch_register(process_onBranch_limited_, temp, code);
}
case 0xFB: {
u32 uNumber = uCode & 0xFFFF;
JUT_ASSERT(835, uSize==2*uNumber);
on_branch_register(process_onBranch_limited_, pData, uNumber);
break;
case 0xFA:
on_branch_register(process_onBranch_, temp, code);
}
case 0xFA: {
u32 uNumber = uCode & 0xFFFF;
JUT_ASSERT(843, uSize==4*uNumber);
on_branch_register(process_onBranch_, pData, uNumber);
break;
case 0xF9:
on_branch_query(code);
}
case 0xF9: {
JUT_ASSERT(849, uSize==0);
on_branch_query(uCode & 0xFFFF);
break;
case 0xF8:
on_branch_register(process_onBranch_limited_, temp + 2,
JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(temp));
on_branch_query(code);
}
case 0xF8: {
u16* pu16Data = (u16*)pData;
u32 uNumber = JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(pu16Data);
JUT_ASSERT(859, uSize==2+2*uNumber);
on_branch_register(process_onBranch_limited_, pu16Data + 1, uNumber);
on_branch_query(uCode & 0xFFFF);
break;
case 0xF7:
on_branch_register(process_onBranch_, temp + 2,
JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(temp));
on_branch_query(code);
}
case 0xF7: {
u16* pu16Data = (u16*)pData;
u32 uNumber = JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(pu16Data);
JUT_ASSERT(871, uSize==2+4*uNumber);
on_branch_register(process_onBranch_, pu16Data + 1, uNumber);
on_branch_query(uCode & 0xFFFF);
break;
}
default:
TProcessor::do_tag_(uTag, temp, uSize);
break;
TProcessor::do_tag_(uTag, pData, uSize);
}
}
/* 802A892C-802A8944 2A326C 0018+00 1/1 0/0 0/0 .text
* process_setMessageIndex_reserved___Q28JMessage18TSequenceProcessorFUs */
// NONMATCHING
void JMessage::TSequenceProcessor::process_setMessageIndex_reserved_(u16 u16Index) {
JUT_ASSERT(890, u16Index >= 0xff00);
JUT_ASSERT(890, (data::MESSAGEINDEX_RESERVED_ENUM_MIN<=u16Index)&& (u16Index<=data::MESSAGEINDEX_RESERVED_ENUM_MAX));
switch (u16Index) {
case 0xffff:
case 0xFFFF:
JGADGET_WARNMSG1(896, "message-index reserved : ", u16Index);
return;
}
}
/* 802A8944-802A89B8 2A3284 0074+00 4/4 0/0 0/0 .text
* process_setMessageCode___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUsUs */
void* JMessage::TSequenceProcessor::process_setMessageCode_(
JMessage::TSequenceProcessor const* param_0, u16 param_1, u16 param_2) {
if (param_2 >= 0xFF00) {
process_setMessageIndex_reserved_(param_2);
void* JMessage::TSequenceProcessor::process_setMessageCode_(JMessage::TSequenceProcessor const* pProcessor, u16 u16GroupID, u16 u16Index) {
JGADGET_ASSERTWARN(904, u16GroupID<=data::MESSAGEGROUPID_USER_ENUM_MIN);
if (u16Index >= 0xFF00) {
process_setMessageIndex_reserved_(u16Index);
return NULL;
}
TControl* pControl = param_0->getControl();
TControl* pControl = pProcessor->getControl();
JUT_ASSERT(911, pControl!=0);
if (pControl->setMessageCode_inSequence_(param_0, param_1, param_2)) {
return pControl->getMessageEntry();
if (!pControl->setMessageCode_inSequence_(pProcessor, u16GroupID, u16Index)) {
JGADGET_WARNMSG1(914, "message-code undefined : ", pControl->getMessageCode());
return NULL;
}
return NULL;
return pControl->getMessageEntry();
}
/* 802A89B8-802A89EC 2A32F8 0034+00 1/1 0/0 0/0 .text
* process_onJump_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor */
const void*
JMessage::TSequenceProcessor::process_onJump_limited_(JMessage::TSequenceProcessor const* param_0) {
return process_setMessageIndex_(param_0, param_0->oProcess2_.process.jump_process.u32Target);
JMessage::TSequenceProcessor::process_onJump_limited_(JMessage::TSequenceProcessor const* pProcessor) {
const TProcess_::processData::jumpData& rData = pProcessor->oProcess2_.process.jump_process;
JUT_ASSERT(925, rData.u32Target<=std::uint16_t(-1));
return process_setMessageIndex_(pProcessor, rData.u32Target);
}
/* 802A89EC-802A8A18 2A332C 002C+00 1/1 0/0 0/0 .text
* process_onJump___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor */
const void*
JMessage::TSequenceProcessor::process_onJump_(JMessage::TSequenceProcessor const* param_0) {
return process_setMessageCode_(param_0, param_0->oProcess2_.process.jump_process.u32Target);
JMessage::TSequenceProcessor::process_onJump_(JMessage::TSequenceProcessor const* pProcessor) {
const TProcess_::processData::jumpData& rData = pProcessor->oProcess2_.process.jump_process;
return process_setMessageCode_(pProcessor, rData.u32Target);
}
/* 802A8A18-802A8A50 2A3358 0038+00 1/1 0/0 0/0 .text
* process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl */
const void*
JMessage::TSequenceProcessor::process_onBranch_limited_(JMessage::TSequenceProcessor const* param_0,
u32 uTargetIndex) {
return process_setMessageIndex_(
param_0, JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(
param_0->oProcess2_.process.branch_process.pTarget, uTargetIndex));
JMessage::TSequenceProcessor::process_onBranch_limited_(JMessage::TSequenceProcessor const* pProcessor, u32 uTargetIndex) {
const TProcess_::processData::branchData& rData = pProcessor->oProcess2_.process.branch_process;
JUT_ASSERT(942, rData.pTarget!=0);
JUT_ASSERT(943, uTargetIndex<rData.uTarget);
u16 u16Index = JGadget::binary::TParseValue<u16, JGadget::binary::TParseValue_endian_big_>::parse(rData.pTarget, uTargetIndex);
return process_setMessageIndex_(pProcessor, u16Index);
}
/* 802A8A50-802A8A84 2A3390 0034+00 1/1 0/0 0/0 .text
* process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl */
const void*
JMessage::TSequenceProcessor::process_onBranch_(JMessage::TSequenceProcessor const* param_0,
u32 uTargetIndex) {
return process_setMessageCode_(
param_0, JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(
param_0->oProcess2_.process.branch_process.pTarget, uTargetIndex));
JMessage::TSequenceProcessor::process_onBranch_(JMessage::TSequenceProcessor const* pProcessor, u32 uTargetIndex) {
const TProcess_::processData::branchData& rData = pProcessor->oProcess2_.process.branch_process;
JUT_ASSERT(957, rData.pTarget!=0);
JUT_ASSERT(958, uTargetIndex<rData.uTarget);
u32 uCode = JGadget::binary::TParseValue<u32, JGadget::binary::TParseValue_endian_big_>::parse(rData.pTarget, uTargetIndex);
return process_setMessageCode_(pProcessor, uCode);
}
/* 802A8A84-802A8AC0 2A33C4 003C+00 0/0 4/4 0/0 .text
* __ct__Q28JMessage19TRenderingProcessorFPCQ28JMessage10TReference */
JMessage::TRenderingProcessor::TRenderingProcessor(JMessage::TReference const* param_0)
: TProcessor(param_0) {}
JMessage::TRenderingProcessor::TRenderingProcessor(JMessage::TReference const* pReference)
: TProcessor(pReference) {}
/* 802A8AC0-802A8B20 2A3400 0060+00 1/0 6/6 0/0 .text __dt__Q28JMessage19TRenderingProcessorFv */
JMessage::TRenderingProcessor::~TRenderingProcessor() {}
/* 802A8B20-802A8BA4 2A3460 0084+00 0/0 4/4 0/0 .text
* process__Q28JMessage19TRenderingProcessorFPCc */
int JMessage::TRenderingProcessor::process(char const* param_0) {
int JMessage::TRenderingProcessor::process(char const* pszText) {
do {
if (pszCurrent_ == param_0) {
if (pszCurrent_ == pszText) {
on_end();
return 0;
}
@@ -598,7 +729,7 @@ int JMessage::TRenderingProcessor::process(char const* param_0) {
/* 802A8BA4-802A8BA8 2A34E4 0004+00 1/0 4/0 0/0 .text
* do_begin___Q28JMessage19TRenderingProcessorFPCvPCc */
void JMessage::TRenderingProcessor::do_begin_(void const* param_0, char const* param_1) {}
void JMessage::TRenderingProcessor::do_begin_(void const* pEntry, char const* pszText) {}
/* 802A8BA8-802A8BAC 2A34E8 0004+00 1/0 4/0 0/0 .text do_end___Q28JMessage19TRenderingProcessorFv
*/
@@ -606,24 +737,25 @@ void JMessage::TRenderingProcessor::do_end_() {}
/* 802A8BAC-802A8C24 2A34EC 0078+00 1/0 4/0 0/0 .text
* do_tag___Q28JMessage19TRenderingProcessorFUlPCvUl */
void JMessage::TRenderingProcessor::do_tag_(u32 uTag, void const* data, u32 uSize) {
u32 group = data::getTagGroup(uTag);
u32 code = data::getTagCode(uTag);
void JMessage::TRenderingProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
u8 uGroupID = data::getTagGroup(uTag);
unsigned int uCode = data::getTagCode(uTag);
switch (group) {
switch (uGroupID) {
case 0xFF:
switch (code) {
switch (uCode & 0xFFFF) {
case 0:
case 1:
case 2:
case 3:
JGADGET_WARNMSG1(1047, "system-tag-code ignored : ", uCode & 0xFFFF);
break;
case 6:
break;
case 7:
break;
default:
TProcessor::do_tag_(uTag, data, uSize);
TProcessor::do_tag_(uTag, pData, uSize);
break;
}
break;
@@ -635,7 +767,7 @@ void JMessage::TRenderingProcessor::do_tag_(u32 uTag, void const* data, u32 uSiz
case 0xF7:
break;
default:
TProcessor::do_tag_(uTag, data, uSize);
TProcessor::do_tag_(uTag, pData, uSize);
break;
}
}
src/JSystem/JMessage/resource.cpp
+127 -105
View File
@@ -1,87 +1,90 @@
//
// Generated By: dol2asm
// Translation Unit: resource
//
#include "JSystem/JMessage/resource.h"
#include "JSystem/JGadget/search.h"
#include "JSystem/JGadget/define.h"
#include <algorithm.h>
#include "string.h"
#include <string.h>
/* 802A8CDC-802A8EC0 2A361C 01E4+00 0/0 1/1 0/0 .text
* toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb */
u16 JMessage::TResource::toMessageIndex_messageID(u32 lowerHalf, u32 upperHalf,
bool* isMsgValid) const {
if (!mMessageID.getRaw()) {
u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, bool* pbValid) const {
if (!oParse_TBlock_messageID_.getRaw()) {
return 0xFFFF;
}
u32 val = -1;
bool check = true;
JUT_ASSERT(87, oParse_TBlock_messageID_.get_form()==0);
u8 sp0A = mMessageID.get_formSupplement();
switch (sp0A) {
u32 uMsgValue = 0xFFFFFFFF;
bool valid = true;
u8 uFormSupplement = oParse_TBlock_messageID_.get_formSupplement();
switch (uFormSupplement) {
case 0:
if (upperHalf) {
check = false;
if (upperHalf != 0) {
valid = false;
}
val = lowerHalf;
uMsgValue = uMsgID;
break;
case 1:
if (lowerHalf > 0xFFFFFF || upperHalf > 0xFF) {
check = false;
if (uMsgID > 0xFFFFFF || upperHalf > 0xFF) {
valid = false;
}
val = ((lowerHalf << 8) & 0xFFFFFF00) | (upperHalf & 0xFF);
uMsgValue = ((uMsgID << 8) & 0xFFFFFF00) | (upperHalf & 0xFF);
break;
case 2:
if (lowerHalf > 0xFFFF || upperHalf > 0xFFFF) {
check = false;
if (uMsgID > 0xFFFF || upperHalf > 0xFFFF) {
valid = false;
}
val = ((lowerHalf << 16) & 0xFFFF0000) | (upperHalf & 0xFFFF);
uMsgValue = ((uMsgID << 16) & 0xFFFF0000) | (upperHalf & 0xFFFF);
break;
case 3:
if (lowerHalf > 0xFF || upperHalf > 0xFFFFFF) {
check = false;
if (uMsgID > 0xFF || upperHalf > 0xFFFFFF) {
valid = false;
}
val = ((lowerHalf << 24) & 0xFF000000) | (upperHalf & 0x00FFFFFF);
uMsgValue = ((uMsgID << 24) & 0xFF000000) | (upperHalf & 0x00FFFFFF);
break;
case 4:
if (lowerHalf) {
check = false;
if (uMsgID != 0) {
valid = false;
}
val = upperHalf;
uMsgValue = upperHalf;
break;
default:
JGADGET_WARNMSG1(122, "form-supplement unknown", uFormSupplement);
return 0xFFFF;
}
if (isMsgValid) {
*isMsgValid = check;
if (pbValid) {
*pbValid = valid;
}
if (val == 0xFFFFFFFF) {
if (uMsgValue == 0xFFFFFFFF) {
return 0xFFFF;
}
int number = mMessageID.get_number();
const u32* first = mMessageID.getContent();
const u32* last = first + number;
int nMsgNumber = oParse_TBlock_messageID_.get_number();
const u32* lower;
if (mMessageID.get_isOrdered()) {
lower = std::lower_bound(first, last, val);
const u32* pContent = oParse_TBlock_messageID_.getContent();
JUT_ASSERT(131, pContent!=0);
if (lower == last || *lower != val) {
const u32* pFirst = pContent;
const u32* pLast = pFirst + nMsgNumber;
const u32* pEntry;
if (oParse_TBlock_messageID_.get_isOrdered()) {
pEntry = std::lower_bound(pFirst, pLast, uMsgValue);
if (pEntry == pLast || *pEntry != uMsgValue) {
return 0xFFFF;
}
} else {
lower = std::find(first, last, val);
if (lower == last) {
pEntry = std::find(pFirst, pLast, uMsgValue);
if (pEntry == pLast) {
return 0xFFFF;
}
}
return (lower - first);
int nIndex = pEntry - pFirst;
JUT_ASSERT(154, (data::MESSAGEINDEX_USER_ENUM_MIN<=nIndex)&& (nIndex<=data::MESSAGEINDEX_USER_ENUM_MAX));
return nIndex;
}
/* 803C9C80-803C9C94 -00001 0014+00 1/1 0/0 0/0 .data
@@ -100,45 +103,48 @@ JMessage::TResourceContainer::TCResource::TCResource() {}
/* 802A8EF8-802A8F6C 2A3838 0074+00 1/0 2/2 0/0 .text
* __dt__Q38JMessage18TResourceContainer10TCResourceFv */
JMessage::TResourceContainer::TCResource::~TCResource() {}
JMessage::TResourceContainer::TCResource::~TCResource() {
JGADGET_ASSERTWARN(173, empty());
}
/* 802A8F6C-802A8FFC 2A38AC 0090+00 0/0 1/1 0/0 .text
* Get_groupID__Q38JMessage18TResourceContainer10TCResourceFUs */
// NONMATCHING
JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 groupID) {
// NONMATCHING - likely due to incorrect enumerator setup compared to debug
JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 u16GroupID) {
JGadget::TContainerEnumerator<TResource, 0> enumerator(this);
while (enumerator) {
const TResource* res = &(*enumerator);
if (res->field_0xc.get_groupID() == groupID)
if (res->getGroupID() == u16GroupID)
return (TResource*)res;
}
return NULL;
}
/* 802A8FFC-802A9048 2A393C 004C+00 1/0 0/0 0/0 .text
* Do_create__Q38JMessage18TResourceContainer10TCResourceFv */
JMessage::TResource* JMessage::TResourceContainer::TCResource::Do_create() {
TResource* new_res = new TResource();
return new_res;
return new TResource();
}
/* 802A9048-802A906C 2A3988 0024+00 1/0 0/0 0/0 .text
* Do_destroy__Q38JMessage18TResourceContainer10TCResourceFPQ28JMessage9TResource */
// NONMATCHING extra null comparison
void JMessage::TResourceContainer::TCResource::Do_destroy(JMessage::TResource* param_0) {
delete param_0;
void JMessage::TResourceContainer::TCResource::Do_destroy(JMessage::TResource* pResource) {
delete pResource;
}
/* 802A906C-802A90B8 2A39AC 004C+00 0/0 2/2 0/0 .text __ct__Q28JMessage18TResourceContainerFv */
JMessage::TResourceContainer::TResourceContainer() : mEncodingType(0), pfnParseCharacter_(NULL) {}
JMessage::TResourceContainer::TResourceContainer() : encodingType_(0), pfnParseCharacter_(NULL) {}
/* 802A90B8-802A90F0 2A39F8 0038+00 1/1 0/0 0/0 .text
* setEncoding__Q28JMessage18TResourceContainerFUc */
void JMessage::TResourceContainer::setEncoding(u8 e) {
if (e == 0) {
mEncodingType = e;
encodingType_ = e;
pfnParseCharacter_ = NULL;
} else {
JGADGET_ASSERTWARN(285, isEncodingSettable(e));
setEncoding_(e);
}
}
@@ -146,14 +152,15 @@ void JMessage::TResourceContainer::setEncoding(u8 e) {
/* 802A90F0-802A9130 2A3A30 0040+00 1/1 0/0 0/0 .text
* setEncoding___Q28JMessage18TResourceContainerFUc */
void JMessage::TResourceContainer::setEncoding_(u8 e) {
mEncodingType = e;
pfnParseCharacter_ = JGadget::toValueFromIndex<JMessage::locale::parseCharacter_function>(
e, sapfnParseCharacter_, 5, NULL);
encodingType_ = e;
pfnParseCharacter_ = JGadget::toValueFromIndex<JMessage::locale::parseCharacter_function>(e, sapfnParseCharacter_, 5, NULL);
JUT_ASSERT(299, pfnParseCharacter_!=0);
}
/* 802A9130-802A9158 2A3A70 0028+00 0/0 2/2 0/0 .text
* __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer */
JMessage::TParse::TParse(JMessage::TResourceContainer* pContainer) {
JUT_ASSERT(324, pContainer!=0);
pContainer_ = pContainer;
pResource_ = NULL;
}
@@ -164,108 +171,121 @@ JMessage::TParse::~TParse() {}
/* 802A91B8-802A92F4 2A3AF8 013C+00 1/0 0/0 0/0 .text
* parseHeader_next__Q28JMessage6TParseFPPCvPUlUl */
// NONMATCHING regalloc, missing clrlwi
bool JMessage::TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 param_2) {
bool JMessage::TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 param_2) {
JUT_ASSERT(343, ppData_inout!=0);
JUT_ASSERT(344, puBlock_out!=0);
const void* pData = *ppData_inout;
JUT_ASSERT(346, pData!=0);
data::TParse_THeader header(pData);
*ppData_inout = header.getContent();
*puBlock_out = header.get_blockNumber();
data::TParse_THeader oHeader(pData);
*ppData_inout = oHeader.getContent();
*puBlock_out = oHeader.get_blockNumber();
if (memcmp(header.get_signature(), &data::ga4cSignature, sizeof(data::ga4cSignature))) {
JUT_ASSERT(350, pContainer_!=0);
if (memcmp(oHeader.get_signature(), &data::ga4cSignature, sizeof(data::ga4cSignature)) != 0) {
JGADGET_WARNMSG(355, "unknown signature");
return 0;
}
if (header.get_type() != 'bmg1') {
if (oHeader.get_type() != 'bmg1') {
JGADGET_WARNMSG(360, "unknown type");
return 0;
}
u8 encoding = header.get_encoding();
if (encoding != 0) {
if (!pContainer_->isEncodingSettable(encoding)) {
u8 uEncoding = oHeader.get_encoding();
if (uEncoding != 0) {
if (!pContainer_->isEncodingSettable(uEncoding)) {
JGADGET_WARNMSG(369, "encoding not acceptable");
return 0;
}
pContainer_->setEncoding(encoding);
pContainer_->setEncoding(uEncoding);
}
if (param_2 & 0x10) {
return 1;
}
TResourceContainer::TCResource* resContainer = &pContainer_->resContainer_;
pResource_ = resContainer->Do_create();
TResourceContainer::TCResource* pResContainer = &pContainer_->resContainer_;
pResource_ = pResContainer->Do_create();
if (pResource_ == NULL) {
return param_2 & 0x20;
JGADGET_WARNMSG(384, "can't create resource");
if (param_2 & 0x20) {
return 1;
} else {
return 0;
}
} else {
resContainer->Push_back(pResource_);
pResource_->setData_header(header.getRaw());
pResContainer->Push_back(pResource_);
pResource_->setData_header(oHeader.getRaw());
return 1;
}
}
/* 802A92F4-802A9490 2A3C34 019C+00 1/0 0/0 0/0 .text
* parseBlock_next__Q28JMessage6TParseFPPCvPUlUl */
bool JMessage::TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 param_2) {
bool JMessage::TParse::parseBlock_next(const void** ppData_inout, u32* puData_out, u32 param_2) {
JUT_ASSERT(401, ppData_inout!=0);
JUT_ASSERT(402, puData_out!=0);
const void* pData = *ppData_inout;
JUT_ASSERT(404, pData!=0);
data::TParse_TBlock sp34(pData);
data::TParse_TBlock oBlock(pData);
*ppData_inout = sp34.getNext();
*puData_out = sp34.get_size();
*ppData_inout = oBlock.getNext();
*puData_out = oBlock.get_size();
TResourceContainer::TCResource& rcResource = pContainer_->resContainer_;
JUT_ASSERT(412, pResource_==&*--(rcResource.end()));
u32 sp30 = sp34.get_type();
switch (sp30) {
case 'INF1':
u32 uType = oBlock.get_type();
switch (uType) {
case 'INF1': {
pResource_->setData_block_info(pData);
break;
}
case 'FLI1':
break;
case 'FLW1':
break;
case 'DAT1':
case 'DAT1': {
pResource_->setData_block_messageText(pData);
u16 temp_r26 = pResource_->getGroupID();
u16 u16GroupID = pResource_->getGroupID();
if (param_2 & 0x80) {
JGadget::TLinkList<JMessage::TResource, 0>::iterator sp2C(rcResource.begin());
JMessage::TResource* sp28;
while ((sp28 = &*sp2C) != pResource_) {
if ((u16)temp_r26 != sp28->getGroupID()) {
++sp2C;
JGadget::TLinkList<JMessage::TResource, 0>::iterator iResource(rcResource.begin());
JMessage::TResource* pResource;
while ((pResource = &*iResource) != pResource_) {
if ((u16)u16GroupID != pResource->getGroupID()) {
++iResource;
} else {
sp2C = rcResource.Erase_destroy(sp28);
iResource = rcResource.Erase_destroy(pResource);
}
}
} else {
#ifdef DEBUG
JMessage::TResource* sp24 = rcResource.Get_groupID(temp_r26);
if (sp24 != pResource_) {
JGadget_outMessage sp148(JGadget_outMessage::warning, __FILE__, 444);
sp148 << "group-ID already exist : " << temp_r26;
JMessage::TResource* pResource = rcResource.Get_groupID(u16GroupID);
if (pResource != pResource_) {
JGADGET_WARNMSG1(444, "group-ID already exist : ", u16GroupID);
}
#endif
}
break;
case 'STR1':
}
case 'STR1': {
pResource_->setData_block_stringAttribute(pData);
break;
case 'MID1':
}
case 'MID1': {
pResource_->setData_block_messageID(pData);
break;
}
default:
#ifdef DEBUG
JGadget_outMessage sp148(JGadget_outMessage::warning, __FILE__, 463);
sp148 << "unknown block : " << sp30;
#endif
JGADGET_WARNMSG1(463, "unknown block : ", uType);
if (!(param_2 & 0x40)) {
return 0;
}
@@ -277,24 +297,26 @@ bool JMessage::TParse::parseBlock_next(void const** ppData_inout, u32* puData_ou
/* 802A9490-802A94A8 2A3DD0 0018+00 1/0 0/0 0/0 .text
* parseCharacter_1Byte__Q28JMessage6localeFPPCc */
int JMessage::locale::parseCharacter_1Byte(char const** string) {
u8 parse_char = **string;
int JMessage::locale::parseCharacter_1Byte(char const** ppszText) {
u8** ppuText = (u8**)ppszText;
int parse_char = **ppuText & 0xFF;
*string = *string + 1;
(*ppuText)++;
return parse_char;
}
/* 802A94A8-802A94D4 2A3DE8 002C+00 1/0 0/0 0/0 .text
* parseCharacter_2Byte__Q28JMessage6localeFPPCc */
int JMessage::locale::parseCharacter_2Byte(char const** string) {
u8** tmp_str = (u8**)string;
int JMessage::locale::parseCharacter_2Byte(char const** ppszText) {
u8** ppuText = (u8**)ppszText;
u8 hi = **tmp_str;
*tmp_str = *tmp_str + 1;
int parse_char = **ppuText & 0xFF;
(*ppuText)++;
u8 lo = **tmp_str;
int parse_char = (hi << 8) | lo;
*tmp_str = *tmp_str + 1;
parse_char <<= 8;
parse_char |= **ppuText & 0xFF;
(*ppuText)++;
return parse_char;
}