True match zMalloc (#659)

* True match zMalloc

* Cleanup

1 files changed, 9 insertions, 14 deletions

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