From c7289d19907eb79aeebe3b70850d8e487885ee45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 17 Oct 2022 09:44:24 +0100 Subject: [PATCH] merge mem --- ...{mem_allocator_800a37d0.s => mem_allocator.s} | 8 ++++++++ asm/mem/mem_allocator_8055e968.s | 8 -------- .../{mem_expHeap_800a2ab0.s => mem_expHeap.s} | 0 ...{mem_frameHeap_800a32e0.s => mem_frameHeap.s} | 0 ...em_heapCommon_800a2640.s => mem_heapCommon.s} | 16 ++++++++++++++++ asm/mem/mem_heapCommon_804fe258.s | 10 ---------- asm/mem/mem_heapCommon_8055cf18.s | 6 ------ asm/mem/{mem_list_800a3830.s => mem_list.s} | 0 .../{mem_unitHeap_800a3530.s => mem_unitHeap.s} | 0 obj_files.mk | 16 +++++++--------- 10 files changed, 31 insertions(+), 33 deletions(-) rename asm/mem/{mem_allocator_800a37d0.s => mem_allocator.s} (83%) delete mode 100644 asm/mem/mem_allocator_8055e968.s rename asm/mem/{mem_expHeap_800a2ab0.s => mem_expHeap.s} (100%) rename asm/mem/{mem_frameHeap_800a32e0.s => mem_frameHeap.s} (100%) rename asm/mem/{mem_heapCommon_800a2640.s => mem_heapCommon.s} (98%) delete mode 100644 asm/mem/mem_heapCommon_804fe258.s delete mode 100644 asm/mem/mem_heapCommon_8055cf18.s rename asm/mem/{mem_list_800a3830.s => mem_list.s} (100%) rename asm/mem/{mem_unitHeap_800a3530.s => mem_unitHeap.s} (100%) diff --git a/asm/mem/mem_allocator_800a37d0.s b/asm/mem/mem_allocator.s similarity index 83% rename from asm/mem/mem_allocator_800a37d0.s rename to asm/mem/mem_allocator.s index cc0f3e25..12434533 100644 --- a/asm/mem/mem_allocator_800a37d0.s +++ b/asm/mem/mem_allocator.s @@ -36,3 +36,11 @@ MEMInitAllocatorForExpHeap: /* 800A3824 0009F664 90 03 00 0C */ stw r0, 0xc(r3) /* 800A3828 0009F668 4E 80 00 20 */ blr /* 800A382C 0009F66C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@LOCAL@MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi@sAllocatorFunc" +"@LOCAL@MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi@sAllocatorFunc": + + .4byte AllocatorAllocForExpHeap_ + .4byte AllocatorFreeForExpHeap_ diff --git a/asm/mem/mem_allocator_8055e968.s b/asm/mem/mem_allocator_8055e968.s deleted file mode 100644 index db382615..00000000 --- a/asm/mem/mem_allocator_8055e968.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@LOCAL@MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi@sAllocatorFunc" -"@LOCAL@MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi@sAllocatorFunc": - - .4byte AllocatorAllocForExpHeap_ - .4byte AllocatorFreeForExpHeap_ diff --git a/asm/mem/mem_expHeap_800a2ab0.s b/asm/mem/mem_expHeap.s similarity index 100% rename from asm/mem/mem_expHeap_800a2ab0.s rename to asm/mem/mem_expHeap.s diff --git a/asm/mem/mem_frameHeap_800a32e0.s b/asm/mem/mem_frameHeap.s similarity index 100% rename from asm/mem/mem_frameHeap_800a32e0.s rename to asm/mem/mem_frameHeap.s diff --git a/asm/mem/mem_heapCommon_800a2640.s b/asm/mem/mem_heapCommon.s similarity index 98% rename from asm/mem/mem_heapCommon_800a2640.s rename to asm/mem/mem_heapCommon.s index eb6848e0..188b8c98 100644 --- a/asm/mem/mem_heapCommon_800a2640.s +++ b/asm/mem/mem_heapCommon.s @@ -369,3 +369,19 @@ lbl_800A2A74: /* 800A2AA4 0009E8E4 38 21 00 20 */ addi r1, r1, 0x20 /* 800A2AA8 0009E8E8 4E 80 00 20 */ blr /* 800A2AAC 0009E8EC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global sRootList +sRootList: + .skip 0x10 + +.global sRootMutex +sRootMutex: + .skip 0x18 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global sRootListInitialized +sRootListInitialized: + .skip 0x8 diff --git a/asm/mem/mem_heapCommon_804fe258.s b/asm/mem/mem_heapCommon_804fe258.s deleted file mode 100644 index af997c1f..00000000 --- a/asm/mem/mem_heapCommon_804fe258.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global sRootList -sRootList: - .skip 0x10 - -.global sRootMutex -sRootMutex: - .skip 0x18 diff --git a/asm/mem/mem_heapCommon_8055cf18.s b/asm/mem/mem_heapCommon_8055cf18.s deleted file mode 100644 index 7d8dd8e3..00000000 --- a/asm/mem/mem_heapCommon_8055cf18.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global sRootListInitialized -sRootListInitialized: - .skip 0x8 diff --git a/asm/mem/mem_list_800a3830.s b/asm/mem/mem_list.s similarity index 100% rename from asm/mem/mem_list_800a3830.s rename to asm/mem/mem_list.s diff --git a/asm/mem/mem_unitHeap_800a3530.s b/asm/mem/mem_unitHeap.s similarity index 100% rename from asm/mem/mem_unitHeap_800a3530.s rename to asm/mem/mem_unitHeap.s diff --git a/obj_files.mk b/obj_files.mk index c187c071..d4c02839 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -330,14 +330,15 @@ $(BUILD_DIR)/asm/tpl/TPL.o \ \ $(BUILD_DIR)/asm/esp/esp.o \ \ +$(BUILD_DIR)/asm/mem/mem_heapCommon.o \ +$(BUILD_DIR)/asm/mem/mem_expHeap.o \ +$(BUILD_DIR)/asm/mem/mem_frameHeap.o \ +$(BUILD_DIR)/asm/mem/mem_unitHeap.o \ +$(BUILD_DIR)/asm/mem/mem_allocator.o \ +$(BUILD_DIR)/asm/mem/mem_list.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/mem/mem_heapCommon_800a2640.o \ -$(BUILD_DIR)/asm/mem/mem_expHeap_800a2ab0.o \ -$(BUILD_DIR)/asm/mem/mem_frameHeap_800a32e0.o \ -$(BUILD_DIR)/asm/mem/mem_unitHeap_800a3530.o \ -$(BUILD_DIR)/asm/mem/mem_allocator_800a37d0.o \ -$(BUILD_DIR)/asm/mem/mem_list_800a3830.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_draworder_800a3950.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effect_800a3a70.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_800a4670.o \ @@ -4961,7 +4962,6 @@ $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \ $(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \ $(BUILD_DIR)/asm/src/Alarm_804966e0.o \ $(BUILD_DIR)/asm/src/StateChanger_804966f0.o \ -$(BUILD_DIR)/asm/mem/mem_heapCommon_804fe258.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_804fe280.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_8050a398.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_resource_8050a3c8.o \ @@ -5470,7 +5470,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \ $(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \ $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \ -$(BUILD_DIR)/asm/mem/mem_heapCommon_8055cf18.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_8055cf20.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_8055cf30.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_emform_8055cf38.o \ @@ -5655,7 +5654,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \ $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \ $(BUILD_DIR)/asm/src/Alarm_8055df68.o \ -$(BUILD_DIR)/asm/mem/mem_allocator_8055e968.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effect_8055e970.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_8055e978.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_emitter_8055e980.o \