mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-06 09:53:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix/simplify assert macros (#1929)

Browse Source
This commit is contained in:
TakaRikka
2023-09-16 10:17:56 -07:00
committed by GitHub
parent 3d8048edba
commit 76b94a8916
16 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/JKernel/JKRDvdFile.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ s32 JKRDvdFile::readData(void* param_1, long length, long param_3) {
// The assert condition gets stringified as "( length & 0x1f ) == 0",
// with out disabling clang-format the spaces in the condition will
// get removed and the string will be incorrect.
JUT_ASSERT(__FILE__, 238, ( length & 0x1f ) == 0);
JUT_ASSERT(238, ( length & 0x1f ) == 0);
/* clang-format on */
OSLockMutex(&mMutex1);
libs/JSystem/JKernel/JKRHeap.cpp
+12 -12
View File
@@ -156,7 +156,7 @@ void* JKRHeap::alloc(u32 size, int alignment, JKRHeap* heap) {
/* 802CE4D4-802CE500 2C8E14 002C+00 1/1 30/30 1/1 .text alloc__7JKRHeapFUli */
void* JKRHeap::alloc(u32 size, int alignment) {
if (mInitFlag) {
JUT_WARN(__FILE__, 393, "alloc %x byte in heap %x", size, this);
JUT_WARN(393, "alloc %x byte in heap %x", size, this);
}
return do_alloc(size, alignment);
}
@@ -175,7 +175,7 @@ void JKRHeap::free(void* ptr, JKRHeap* heap) {
/* 802CE548-802CE574 2C8E88 002C+00 1/1 29/29 0/0 .text free__7JKRHeapFPv */
void JKRHeap::free(void* ptr) {
if (mInitFlag) {
JUT_WARN(__FILE__, 441, "free %x in heap %x", ptr, this);
JUT_WARN(441, "free %x in heap %x", ptr, this);
}
do_free(ptr);
}
@@ -192,7 +192,7 @@ void JKRHeap::callAllDisposer() {
/* 802CE5CC-802CE5F8 2C8F0C 002C+00 0/0 12/12 0/0 .text freeAll__7JKRHeapFv */
void JKRHeap::freeAll() {
if (mInitFlag) {
JUT_WARN(__FILE__, 493, "freeAll in heap %x", this);
JUT_WARN(493, "freeAll in heap %x", this);
}
do_freeAll();
}
@@ -200,7 +200,7 @@ void JKRHeap::freeAll() {
/* 802CE5F8-802CE624 2C8F38 002C+00 0/0 1/1 0/0 .text freeTail__7JKRHeapFv */
void JKRHeap::freeTail() {
if (mInitFlag) {
JUT_WARN(__FILE__, 507, "freeTail in heap %x", this);
JUT_WARN(507, "freeTail in heap %x", this);
}
do_freeTail();
}
@@ -219,7 +219,7 @@ s32 JKRHeap::resize(void* ptr, u32 size, JKRHeap* heap) {
/* 802CE684-802CE6B0 2C8FC4 002C+00 1/1 1/1 0/0 .text resize__7JKRHeapFPvUl */
s32 JKRHeap::resize(void* ptr, u32 size) {
if (mInitFlag) {
JUT_WARN(__FILE__, 567, "resize block %x into %x in heap %x", ptr, size, this);
JUT_WARN(567, "resize block %x into %x in heap %x", ptr, size, this);
}
return do_resize(ptr, size);
}
@@ -258,7 +258,7 @@ s32 JKRHeap::getTotalFreeSize() {
/* 802CE7B0-802CE7DC 2C90F0 002C+00 0/0 1/1 0/0 .text changeGroupID__7JKRHeapFUc */
s32 JKRHeap::changeGroupID(u8 groupID) {
if (mInitFlag) {
JUT_WARN(__FILE__, 646, "change heap ID into %x in heap %x", groupID, this);
JUT_WARN(646, "change heap ID into %x in heap %x", groupID, this);
}
return do_changeGroupID(groupID);
}
@@ -482,22 +482,22 @@ void operator delete[](void* ptr) {
/* 802CED84-802CED88 2C96C4 0004+00 1/0 1/0 0/0 .text
* state_register__7JKRHeapCFPQ27JKRHeap6TStateUl */
u32 JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(__FILE__, 1213, p != 0);
JUT_ASSERT(__FILE__, 1214, p->getHeap() == this);
JUT_ASSERT(1213, p != 0);
JUT_ASSERT(1214, p->getHeap() == this);
}
/* 802CED88-802CEDA0 2C96C8 0018+00 1/0 1/0 0/0 .text
* state_compare__7JKRHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState */
bool JKRHeap::state_compare(const JKRHeap::TState& r1, const JKRHeap::TState& r2) const {
JUT_ASSERT(__FILE__, 1222, r1.getHeap() == r2.getHeap());
JUT_ASSERT(1222, r1.getHeap() == r2.getHeap());
return r1.getCheckCode() == r2.getCheckCode();
}
/* 802CEDA0-802CEDA4 2C96E0 0004+00 1/0 3/0 0/0 .text state_dump__7JKRHeapCFRCQ27JKRHeap6TState */
void JKRHeap::state_dump(const JKRHeap::TState& p) const {
JUT_LOG(__FILE__, 1246, "check-code : 0x%08x", p.getCheckCode());
JUT_LOG(__FILE__, 1247, "id : 0x%08x", p.getId());
JUT_LOG(__FILE__, 1248, "used size : %u", p.getUsedSize());
JUT_LOG(1246, "check-code : 0x%08x", p.getCheckCode());
JUT_LOG(1247, "id : 0x%08x", p.getId());
JUT_LOG(1248, "used size : %u", p.getUsedSize());
}
/* 802CEDA4-802CEDAC 2C96E4 0008+00 1/0 1/0 0/0 .text do_changeGroupID__7JKRHeapFUc */
libs/JSystem/JKernel/JKRSolidHeap.cpp
+5 -5
View File
@@ -99,8 +99,8 @@ void* JKRSolidHeap::do_alloc(u32 size, int alignment) {
// TODO(Julgodis): JUTAssertion::setConfirmMessage
if (alignment != 0) {
int u = abs(alignment);
JUT_ASSERT(__FILE__, 0xdb, u < 0x80);
JUT_ASSERT(__FILE__, 0xdc, JGadget::binary::isPower2(u));
JUT_ASSERT(219, u < 0x80);
JUT_ASSERT(220, JGadget::binary::isPower2(u));
}
#endif
@@ -266,8 +266,8 @@ bool JKRSolidHeap::dump(void) {
/* 802D11FC-802D1258 2CBB3C 005C+00 1/0 0/0 0/0 .text
* state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl */
u32 JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(__FILE__, 0x25c, p != 0);
JUT_ASSERT(__FILE__, 0x25d, p->getHeap() == this);
JUT_ASSERT(604, p != 0);
JUT_ASSERT(605, p->getHeap() == this);
getState_(p);
setState_u32ID_(p, id);
@@ -279,7 +279,7 @@ u32 JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
/* 802D1258-802D1288 2CBB98 0030+00 1/0 0/0 0/0 .text
* state_compare__12JKRSolidHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState */
bool JKRSolidHeap::state_compare(JKRHeap::TState const& r1, JKRHeap::TState const& r2) const {
JUT_ASSERT(__FILE__, 632, r1.getHeap() == r2.getHeap());
JUT_ASSERT(632, r1.getHeap() == r2.getHeap());
bool result = true;
if (r1.getCheckCode() != r2.getCheckCode()) {
libs/JSystem/JKernel/JKRThread.cpp
+2 -2
View File
@@ -143,7 +143,7 @@ JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) {
/* 802D1A14-802D1A70 2CC354 005C+00 0/0 1/1 0/0 .text createManager__15JKRThreadSwitchFP7JKRHeap
*/
JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) {
JUT_ASSERT(__FILE__, 343, sManager == 0);
JUT_ASSERT(343, sManager == 0);
if (!heap) {
heap = JKRGetCurrentHeap();
@@ -224,7 +224,7 @@ void JKRThreadSwitch::callback(OSThread* current, OSThread* next) {
} else {
switch (thread->getCurrentHeapError()) {
case 0:
JUT_PANIC(__FILE__, 508, "JKRThreadSwitch: currentHeap destroyed.");
JUT_PANIC(508, "JKRThreadSwitch: currentHeap destroyed.");
break;
case 1:
JUTWarningConsole("JKRThreadSwitch: currentHeap destroyed.\n");