From 9be264da9d03a52b5115011ed5d4c0331ac69450 Mon Sep 17 00:00:00 2001
From: AdamKiddle <54328813+AdamKiddle@users.noreply.github.com>
Date: Fri, 15 Jan 2021 22:18:15 +0000
Subject: [PATCH] TwoHeadArena Cleanup (#633)

* TwoHeadArena cleanup

* remove params

* remove params

* prettying up the struct a little

* remove unecessary cast
---
 include/z64.h           |  6 +++---
 src/code/TwoHeadArena.c | 24 +++++++++++-------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/include/z64.h b/include/z64.h
index fbc6977aba..e6a29b9f5d 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -70,9 +70,9 @@ typedef struct {
 
 typedef struct {
     /* 0x0000 */ u32    size;
-    /* 0x0004 */ u8*    bufp;
-    /* 0x0008 */ u8*    head;
-    /* 0x000C */ u8*    tail;
+    /* 0x0004 */ void*  bufp;
+    /* 0x0008 */ void*  head;
+    /* 0x000C */ void*  tail;
 } TwoHeadArena; // size = 0x10
 
 typedef struct {
diff --git a/src/code/TwoHeadArena.c b/src/code/TwoHeadArena.c
index fa2a6aafd3..5a3fadc16f 100644
--- a/src/code/TwoHeadArena.c
+++ b/src/code/TwoHeadArena.c
@@ -78,7 +78,7 @@ void* THA_GetTail(TwoHeadArena* tha) {
 
 void* THA_AllocStart(TwoHeadArena* tha, u32 size) {
     void* start = tha->head;
-    tha->head += size;
+    tha->head = (u32)tha->head + size;
     return start;
 }
 
@@ -88,7 +88,6 @@ void* THA_AllocStart1(TwoHeadArena* tha) {
 
 void* THA_AllocEnd(TwoHeadArena* tha, u32 size) {
     u32 mask;
-    u32* temp;
 
     if (size == 8) {
         mask = ~7;
@@ -100,25 +99,24 @@ void* THA_AllocEnd(TwoHeadArena* tha, u32 size) {
         mask = (size >= 0x10) ? ~0xF : 0;
     }
 
-    temp = (u32*)&tha->tail; // required to match
-    return tha->tail = (void*)(((*temp & mask) - size) & mask);
+    tha->tail = (((u32)tha->tail & mask) - size) & mask;
+    return tha->tail;
 }
 
 void* THA_AllocEndAlign16(TwoHeadArena* tha, u32 size) {
-    void* ret = (void*)(u32)((((u32)tha->tail & ~0xF) - size) &
-                             ((~(0xF & 0xFFFFFFFFFFFFFFFF)) & 0xFFFFFFFFu)); // required to match
-    tha->tail = ret;
-    return ret;
+    u32 mask = ~0xF;
+
+    tha->tail = (((u32)tha->tail & mask) - size) & (u64)mask;
+    return tha->tail;
 }
 
 void* THA_AllocEndAlign(TwoHeadArena* tha, u32 size, u32 mask) {
-    void* ret = (void*)((((u32)tha->tail & mask) - size) & mask);
-    tha->tail = ret;
-    return ret;
+    tha->tail = (((u32)tha->tail & mask) - size) & mask;
+    return tha->tail;
 }
 
 s32 THA_GetSize(TwoHeadArena* tha) {
-    return tha->tail - tha->head;
+    return (u32)tha->tail - (u32)tha->head;
 }
 
 u32 THA_IsCrash(TwoHeadArena* tha) {
@@ -127,7 +125,7 @@ u32 THA_IsCrash(TwoHeadArena* tha) {
 
 void THA_Init(TwoHeadArena* tha) {
     tha->head = tha->bufp;
-    tha->tail = tha->bufp + tha->size;
+    tha->tail = (u32)tha->bufp + tha->size;
 }
 
 void THA_Ct(TwoHeadArena* tha, void* ptr, u32 size) {