mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-05 02:37:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix JUT_ASSERT and several other macros (#2711)

Browse Source 
* Fix JUT_ASSERT to be a nested define

* Switch names that appear in asserts to be constants instead of defines

* Replace `0` in asserts with `NULL` or `FALSE`

* Fix fpclassify

* Fix ARRAY_SIZE

* Use G_CM3D_F_INF

* More fixes for fpclassify

* Remove FLOAT_LABEL

* Remove incorrect FLAG_ON macro

* Remove UNK_BSS macro

* Silence clangd unused header warning for PCH
This commit is contained in:
LagoLunatic
2025-09-28 16:11:07 -04:00
committed by GitHub
parent 737250d7f5
commit 6ec6fce8cb
1008 changed files with 3172 additions and 3237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JMessage/control.cpp
+3 -3
View File
@@ -67,14 +67,14 @@ void JMessage::TControl::render() {
/* 802A77E8-802A78F4 2A2128 010C+00 0/0 1/1 0/0 .text setMessageCode__Q28JMessage8TControlFUsUs */
int JMessage::TControl::setMessageCode(u16 u16GroupID, u16 u16Index) {
TProcessor* pProcessor = getProcessor();
JUT_ASSERT(120, pProcessor!=0);
JUT_ASSERT(120, pProcessor!=NULL);
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 uMsgID, u32 param_1, bool* pbValid) {
TProcessor* pProcessor = getProcessor();
JUT_ASSERT(132, pProcessor!=0);
JUT_ASSERT(132, pProcessor!=NULL);
u32 uCode = pProcessor->toMessageCode_messageID(uMsgID, param_1, pbValid);
if (uCode == 0xFFFFFFFF) {
@@ -96,7 +96,7 @@ bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const*
uMessageID_ = u16Index;
pResourceCache_ = pProcessor->getResourceCache();
JUT_ASSERT(155, pResourceCache_!=0);
JUT_ASSERT(155, pResourceCache_!=NULL);
pMessageText_begin_ = pResourceCache_->getMessageText_messageEntry(pEntry_);
pMessageText_current_ = pMessageText_begin_;
src/JSystem/JMessage/processor.cpp
+21 -21
View File
@@ -101,9 +101,9 @@ void JMessage::TProcessor::on_select_begin(char const* (*pfn)(JMessage::TProcess
oProcess_.rData.pOffset = pOffset;
oProcess_.rData.uRest = uNumber;
JUT_ASSERT(205, pfn!=0);
JUT_ASSERT(205, pfn!=NULL);
const char* psz = pfn(this);
JUT_ASSERT(207, psz!=0);
JUT_ASSERT(207, psz!=NULL);
stack_pushCurrent_(psz);
do_select_begin(uNumber);
@@ -131,10 +131,10 @@ void JMessage::TProcessor::on_select_separate() {
JUT_ASSERT(237, rData.uRest>0);
const char* (*pfn)(TProcessor*) = rData.pfn;
JUT_ASSERT(240, pfn!=0);
JUT_ASSERT(240, pfn!=NULL);
const char* psz = pfn(this);
JUT_ASSERT(242, psz!=0);
JUT_ASSERT(242, psz!=NULL);
stack_pushCurrent_(psz);
do_select_separate();
@@ -175,7 +175,7 @@ void JMessage::TProcessor::do_select_separate() {}
void JMessage::TProcessor::on_tag_() {
u32 uSize;
char* psz = (char*)getCurrent();
JUT_ASSERT(292, psz!=0);
JUT_ASSERT(292, psz!=NULL);
JUT_ASSERT(293, psz[-1]==data::gcTagBegin);
uSize = *(u8*)psz;
@@ -254,7 +254,7 @@ void JMessage::TProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
/* 802A81EC-802A828C 2A2B2C 00A0+00 2/2 0/0 0/0 .text
* process_character___Q28JMessage10TProcessorFv */
bool JMessage::TProcessor::process_character_() {
JUT_ASSERT(397, pszCurrent_!=0);
JUT_ASSERT(397, pszCurrent_!=NULL);
int iCharacter = on_parseCharacter(&pszCurrent_);
switch (iCharacter) {
@@ -311,8 +311,8 @@ bool JMessage::TProcessor::process_onCharacterEnd_select_(JMessage::TProcessor*
const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor* pThis) {
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(455, rData.pcBase!=NULL);
JUT_ASSERT(456, rData.pOffset!=NULL);
JUT_ASSERT(457, rData.uRest>0);
u16* puOffset = (u16*)rData.pOffset;
@@ -327,8 +327,8 @@ const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor
const char* JMessage::TProcessor::process_onSelect_(JMessage::TProcessor* pThis) {
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(472, rData.pcBase!=NULL);
JUT_ASSERT(473, rData.pOffset!=NULL);
JUT_ASSERT(474, rData.uRest>0);
u32* puOffset = (u32*)rData.pOffset;
@@ -358,7 +358,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
case STATUS_NORMAL:
break;
case STATUS_JUMP: {
JUT_ASSERT(549, pControl_!=0);
JUT_ASSERT(549, pControl_!=NULL);
if (!on_jump_isReady()) {
return pszCurrent_;
@@ -368,7 +368,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
TProcess_& process = oProcess2_;
TSequenceProcessor::jumpPfn pfn = process.process.jump_process.jumpFn;
JUT_ASSERT(556, pfn!=0);
JUT_ASSERT(556, pfn!=NULL);
const void* pEntry = pfn(this);
if (pEntry != NULL) {
@@ -377,7 +377,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
break;
}
case STATUS_BRANCH: {
JUT_ASSERT(567, pControl_!=0);
JUT_ASSERT(567, pControl_!=NULL);
u32 queryResult = on_branch_queryResult();
if (queryResult > 0x7FFFFFFF) {
@@ -398,7 +398,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
JGADGET_WARNMSG1(588, "unknown result : ", queryResult);
} else {
TSequenceProcessor::branchPfn pfn = process.process.branch_process.branchFn;
JUT_ASSERT(592, pfn!=0);
JUT_ASSERT(592, pfn!=NULL);
const void* pEntry = pfn(this, queryResult);
if (pEntry != NULL) {
@@ -456,8 +456,8 @@ void JMessage::TSequenceProcessor::on_jump(void const* pEntry, char const* pszTe
on_resetStatus_(pszText);
JUT_ASSERT(658, eStatus_==STATUS_NORMAL);
JUT_ASSERT(659, pEntry!=0);
JUT_ASSERT(660, pszText!=0);
JUT_ASSERT(659, pEntry!=NULL);
JUT_ASSERT(660, pszText!=NULL);
do_jump(pEntry, pszText);
}
@@ -495,8 +495,8 @@ void JMessage::TSequenceProcessor::on_branch(void const* pEntry, char const* psz
on_resetStatus_(pszText);
JUT_ASSERT(717, eStatus_==STATUS_NORMAL);
JUT_ASSERT(718, pEntry!=0);
JUT_ASSERT(719, pszText!=0);
JUT_ASSERT(718, pEntry!=NULL);
JUT_ASSERT(719, pszText!=NULL);
do_branch(pEntry, pszText);
}
@@ -653,7 +653,7 @@ void* JMessage::TSequenceProcessor::process_setMessageCode_(JMessage::TSequenceP
}
TControl* pControl = pProcessor->getControl();
JUT_ASSERT(911, pControl!=0);
JUT_ASSERT(911, pControl!=NULL);
if (!pControl->setMessageCode_inSequence_(pProcessor, u16GroupID, u16Index)) {
JGADGET_WARNMSG1(914, "message-code undefined : ", pControl->getMessageCode());
@@ -687,7 +687,7 @@ const void*
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(942, rData.pTarget!=NULL);
JUT_ASSERT(943, uTargetIndex<rData.uTarget);
u16 u16Index = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u16> >::parse(rData.pTarget, uTargetIndex);
@@ -700,7 +700,7 @@ const void*
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(957, rData.pTarget!=NULL);
JUT_ASSERT(958, uTargetIndex<rData.uTarget);
u32 uCode = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u32> >::parse(rData.pTarget, uTargetIndex);
src/JSystem/JMessage/resource.cpp
+10 -10
View File
@@ -66,7 +66,7 @@ u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, boo
int nMsgNumber = oParse_TBlock_messageID_.get_number();
const u32* pContent = oParse_TBlock_messageID_.getContent();
JUT_ASSERT(131, pContent!=0);
JUT_ASSERT(131, pContent!=NULL);
const u32* pFirst = pContent;
const u32* pLast = pFirst + nMsgNumber;
@@ -156,13 +156,13 @@ void JMessage::TResourceContainer::setEncoding(u8 e) {
void JMessage::TResourceContainer::setEncoding_(u8 e) {
encodingType_ = e;
pfnParseCharacter_ = JGadget::toValueFromIndex<JMessage::locale::parseCharacter_function>(e, sapfnParseCharacter_, 5, NULL);
JUT_ASSERT(299, pfnParseCharacter_!=0);
JUT_ASSERT(299, pfnParseCharacter_!=NULL);
}
/* 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);
JUT_ASSERT(324, pContainer!=NULL);
pContainer_ = pContainer;
pResource_ = NULL;
}
@@ -174,17 +174,17 @@ JMessage::TParse::~TParse() {}
* parseHeader_next__Q28JMessage6TParseFPPCvPUlUl */
// NONMATCHING regalloc, missing clrlwi
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);
JUT_ASSERT(343, ppData_inout!=NULL);
JUT_ASSERT(344, puBlock_out!=NULL);
const void* pData = *ppData_inout;
JUT_ASSERT(346, pData!=0);
JUT_ASSERT(346, pData!=NULL);
data::TParse_THeader oHeader(pData);
*ppData_inout = oHeader.getContent();
*puBlock_out = oHeader.get_blockNumber();
JUT_ASSERT(350, pContainer_!=0);
JUT_ASSERT(350, pContainer_!=NULL);
if (memcmp(oHeader.get_signature(), &data::ga4cSignature, sizeof(data::ga4cSignature)) != 0) {
JGADGET_WARNMSG(355, "unknown signature");
@@ -230,11 +230,11 @@ bool JMessage::TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_
/* 802A92F4-802A9490 2A3C34 019C+00 1/0 0/0 0/0 .text
* parseBlock_next__Q28JMessage6TParseFPPCvPUlUl */
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);
JUT_ASSERT(401, ppData_inout!=NULL);
JUT_ASSERT(402, puData_out!=NULL);
const void* pData = *ppData_inout;
JUT_ASSERT(404, pData!=0);
JUT_ASSERT(404, pData!=NULL);
data::TParse_TBlock oBlock(pData);