falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

True match zMalloc (#659) 

* True match zMalloc

* Cleanup
This commit is contained in:
KEKW555 2023-12-24 10:38:30 +05:30 committed by GitHub
parent 50b8efb7d9
commit 1e8ced01e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/common.c
View File

@ -350,9 +350,8 @@ void sub_0801D898(void* dest, void* src, u32 word, u32 size) {
} }
void* zMalloc(u32 size) { void* zMalloc(u32 size) {
FORCE_REGISTER(u32 slotFound, r5);
u16* heapStartOffset; u16* heapStartOffset;
u32 slotFound;
u8* allocatedEntryStartOffset; u8* allocatedEntryStartOffset;
u8* allocatedEntryEndOffset; u8* allocatedEntryEndOffset;
u8* candidateSlotEndOffset; u8* candidateSlotEndOffset;
@ -377,7 +376,8 @@ void* zMalloc(u32 size) {
if ((allocatedEntryStartOffset <= candidateSlotStartOffset && if ((allocatedEntryStartOffset <= candidateSlotStartOffset &&
candidateSlotStartOffset <= allocatedEntryEndOffset)) { candidateSlotStartOffset <= allocatedEntryEndOffset)) {
goto other_search; slotFound = FALSE;
break;
} }
if ((allocatedEntryStartOffset <= candidateSlotEndOffset && if ((allocatedEntryStartOffset <= candidateSlotEndOffset &&
@ -390,17 +390,15 @@ void* zMalloc(u32 size) {
candidateSlotEndOffset <= allocatedEntryEndOffset) || candidateSlotEndOffset <= allocatedEntryEndOffset) ||
(candidateSlotStartOffset <= allocatedEntryStartOffset && (candidateSlotStartOffset <= allocatedEntryStartOffset &&
allocatedEntryEndOffset <= candidateSlotEndOffset)) { allocatedEntryEndOffset <= candidateSlotEndOffset)) {
goto other_search; slotFound = FALSE;
break;
} }
} }
if (!slotFound) { if (!slotFound) {
other_search:
index1 = 0; index1 = 0;
// Start searching for candidate slot from the left side of the heap buffer. // Start searching for candidate slot from the left side of the heap buffer.
do { do {
candidateSlotEndOffset = gzHeap + heapStartOffset[(index1 * 2) + 1]; candidateSlotEndOffset = gzHeap + heapStartOffset[(index1 * 2) + 1];
candidateSlotStartOffset = candidateSlotEndOffset - size; candidateSlotStartOffset = candidateSlotEndOffset - size;
slotFound = FALSE; slotFound = FALSE;
@ -417,7 +415,8 @@ void* zMalloc(u32 size) {
if ((allocatedEntryStartOffset <= candidateSlotStartOffset && if ((allocatedEntryStartOffset <= candidateSlotStartOffset &&
candidateSlotStartOffset < allocatedEntryEndOffset)) { candidateSlotStartOffset < allocatedEntryEndOffset)) {
goto iter_end; slotFound = FALSE;
break;
} }
if ((allocatedEntryStartOffset < candidateSlotEndOffset && if ((allocatedEntryStartOffset < candidateSlotEndOffset &&
@ -430,17 +429,13 @@ void* zMalloc(u32 size) {
candidateSlotEndOffset <= allocatedEntryEndOffset) || candidateSlotEndOffset <= allocatedEntryEndOffset) ||
(candidateSlotStartOffset <= allocatedEntryStartOffset && (candidateSlotStartOffset <= allocatedEntryStartOffset &&
allocatedEntryEndOffset <= candidateSlotEndOffset)) { allocatedEntryEndOffset <= candidateSlotEndOffset)) {
goto iter_end; slotFound = FALSE;
break;
} }
} }
if (slotFound) { if (slotFound) {
break; break;
} else {
continue;
} }
iter_end:
slotFound = FALSE;
} }
} while ((index1 = (u16)(index1 + 1)) < numEntries); } while ((index1 = (u16)(index1 + 1)) < numEntries);
} }