Game-Decompilation/mkdd
1
0
Fork 0
mirror of https://github.com/SwareJonge/mkdd.git synced 2024-11-23 05:19:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more cleaning

Browse Source
This commit is contained in:
SwareJonge 2024-05-27 23:41:26 +02:00
parent d3cc2f742f
commit bafff28e8e
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/JSystem/JKernel/JKRHeap.h
View File

@ -52,7 +52,7 @@ public:
~TState();
void dump() const { mArgument.mHeap->state_dump(*this); }
bool isVerbose() { return bVerbose_; };
static bool isVerbose() { return bVerbose_; };
bool isCompareOnDestructed() const { return mArgument.mIsCompareOnDestructed; };
u32 getUsedSize() const { return mUsedSize; }
u32 getCheckCode() const { return mCheckCode; }
@ -123,12 +123,12 @@ public:
u8 getCurrentGroupId();
u8 changeGroupID(u8 newGroupId);
u32 getMaxAllocatableSize(int alignment);
JKRHeap *find(void *const) const; // 0x80084640
JKRHeap *find(void *const) const; // 0x80084640
JKRHeap *findAllHeap(void *const) const; // 0x8008492c
bool dispose(void *, u32); // 0x80084b9c
void dispose(void *, void *); // 0x80084c2c
void dispose(); // 0x80084cb8
void dispose_subroutine(u32 begin, u32 end);
bool dispose(void *, u32); // 0x80084b9c
void dispose(void *, void *); // 0x80084c2c
void dispose(); // 0x80084cb8
void appendDisposer(JKRDisposer * disposer) {
mDisposerList.append(&disposer->mPointerLinks);

45
libs/JSystem/JKernel/JKRHeap.cpp
View File

@ -256,10 +256,7 @@ JKRHeap *JKRHeap::findAllHeap(void *memory) const
void JKRHeap::dispose_subroutine(u32 begin, u32 end)
{
JSUListIterator<JKRDisposer> last_iterator;
JSUListIterator<JKRDisposer> next_iterator;
JSUListIterator<JKRDisposer> iterator;
for (iterator = mDisposerList.getFirst(); iterator != mDisposerList.getEnd();
iterator = next_iterator)
for (JSUListIterator<JKRDisposer> iterator(mDisposerList.getFirst()); iterator != mDisposerList.getEnd();)
{
JKRDisposer *disposer = iterator.getObject();
@ -268,19 +265,18 @@ void JKRHeap::dispose_subroutine(u32 begin, u32 end)
disposer->~JKRDisposer();
if (last_iterator == nullptr)
{
next_iterator = mDisposerList.getFirst();
iterator = mDisposerList.getFirst();
}
else
{
next_iterator = last_iterator;
next_iterator++;
iterator = last_iterator;
iterator++;
}
}
else
{
last_iterator = iterator;
next_iterator = iterator;
next_iterator++;
iterator++;
}
}
}
@ -329,16 +325,6 @@ void JKRDefaultMemoryErrorRoutine(void *heap, u32 size, int alignment)
JUT_PANIC("abort\n");
}
// attempt to reconstruct function but lazy
void JKRHeap::checkMemoryFilled(u8 *address, u32 size, u8 p3)
{
for (int i = 0; i < size; i++)
{
#line 999
JUT_WARNING_F(p3 == address[i], "**** checkMemoryFilled:\n address %08x size %x:\n (%08x = %02x)\n", address, size, address[i], address[i]);
}
}
JKRHeapErrorHandler *JKRHeap::setErrorHandler(JKRHeapErrorHandler *newHandler)
{
JKRHeapErrorHandler *oldHandler = mErrorHandler;
@ -350,6 +336,16 @@ JKRHeapErrorHandler *JKRHeap::setErrorHandler(JKRHeapErrorHandler *newHandler)
return oldHandler;
}
// attempt to reconstruct function but lazy
void JKRHeap::checkMemoryFilled(u8 *address, u32 size, u8 p3)
{
for (int i = 0; i < size; i++)
{
#line 999
JUT_WARNING_F(p3 == address[i], "**** checkMemoryFilled:\n address %08x size %x:\n (%08x = %02x)\n", address, size, address[i], address[i]);
}
}
bool JKRHeap::isSubHeap(JKRHeap *heap) const
{
if (!heap)
@ -357,8 +353,8 @@ bool JKRHeap::isSubHeap(JKRHeap *heap) const
if (mHeapTree.getNumChildren() != 0)
{
JSUTreeIterator<JKRHeap> iterator;
for (iterator = mHeapTree.getFirstChild(); iterator != mHeapTree.getEndChild(); ++iterator)
for (JSUTreeIterator<JKRHeap> iterator(mHeapTree.getFirstChild()); iterator != mHeapTree.getEndChild(); ++iterator)
{
if (iterator.getObject() == heap)
{
@ -404,20 +400,23 @@ void *operator new[](u32 byteCount, JKRHeap *heap, int alignment)
void operator delete(void *memory) { JKRHeap::free(memory, nullptr); }
void operator delete[](void *memory) { JKRHeap::free(memory, nullptr); }
/*JKRHeap::TState::TState(const JKRHeap::TState::TArgument &arg, const JKRHeap::TState::TLocation &location)
JKRHeap::TState::TState(const JKRHeap::TState::TArgument &arg, const JKRHeap::TState::TLocation &location)
: mArgument(arg), mLocation(location)
{
// UNUSED FUNCTION
}
JKRHeap::TState::TState(const JKRHeap::TState &other, bool p2)
: mArgument(other.getHeap(), 0, p2)
{
// UNUSED FUNCTION
}
JKRHeap::TState::TState(const JKRHeap::TState &other, const JKRHeap::TState::TLocation &location, bool p3)
: mArgument(other.getHeap(), 0, p3), mLocation()
{
// UNUSED FUNCTION
}*/
}
JKRHeap::TState::~TState()
{

0
tools/1.3.2/.gitkeep
View File