merge namespace mem

This commit is contained in:
Charlotte 🦝 Delenk 2022-10-21 19:22:32 +01:00
parent 6104a7b1d3
commit 7c4713d6ca
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
31 changed files with 469 additions and 227 deletions

View file

@ -1,34 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global __vt__Q23mem14HeapCompaction
__vt__Q23mem14HeapCompaction:
.4byte 0
.4byte 0
.4byte __dt__Q23mem14HeapCompactionFv
.4byte heapName__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte fragmentBlockCount__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte usedBlockCount__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte totalHeapSize__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte usedHeapSize__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte startAddress__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte endAddress__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte drawUsedBlocks__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer
.4byte drawFragmentBlocks__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer
.4byte 0
.4byte 0
.4byte "@4@__dt__Q23mem14HeapCompactionFv"
.4byte "@4@allocatorAlloc__Q23mem14HeapCompactionFUll"
.4byte "@4@allocatorFree__Q23mem14HeapCompactionFPv"
.4byte allocatorAlloc__Q23mem14HeapCompactionFUll
.4byte allocatorFree__Q23mem14HeapCompactionFPv
.global __vt__Q33mem14HeapCompaction22AllocFromTailAllocator
__vt__Q33mem14HeapCompaction22AllocFromTailAllocator:
.4byte 0
.4byte 0
.4byte __dt__Q33mem14HeapCompaction22AllocFromTailAllocatorFv
.4byte allocatorAlloc__Q33mem14HeapCompaction22AllocFromTailAllocatorFUll
.4byte allocatorFree__Q33mem14HeapCompaction22AllocFromTailAllocatorFPv

View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49358"
"@49358":
.4byte 0x00000020
.4byte 0

View file

@ -1,14 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49831"
"@49831":
.4byte 0x25730000
.4byte 0
.global "@49832"
"@49832":
.4byte 0x25732530
.4byte 0x326C7500

View file

@ -1,24 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global __vt__Q23mem7HeapExp
__vt__Q23mem7HeapExp:
.4byte 0
.4byte 0
.4byte __dt__Q23mem7HeapExpFv
.4byte allocatorAlloc__Q23mem7HeapExpFUll
.4byte allocatorFree__Q23mem7HeapExpFPv
.4byte heapName__Q23mem7HeapExpCFv
.4byte heapMemBlock__Q23mem7HeapExpCFv
.4byte heapUsingBlockCount__Q23mem7HeapExpCFv
.4byte heapDump__Q23mem7HeapExpCFv
.global __vt__Q33mem7HeapExp22AllocFromTailAllocator
__vt__Q33mem7HeapExp22AllocFromTailAllocator:
.4byte 0
.4byte 0
.4byte __dt__Q33mem7HeapExp22AllocFromTailAllocatorFv
.4byte allocatorAlloc__Q33mem7HeapExp22AllocFromTailAllocatorFUll
.4byte allocatorFree__Q33mem7HeapExp22AllocFromTailAllocatorFPv

View file

@ -1,4 +0,0 @@
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_\\HeapMapUserRepos_cpp"

View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global "@48741_805453E8"
"@48741_805453E8":
.skip 0xC
.global "t_repos__Q23mem30@unnamed@HeapMapUserRepos_cpp@"
"t_repos__Q23mem30@unnamed@HeapMapUserRepos_cpp@":
.skip 0x804

View file

@ -1,16 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global __vt__Q23mem8HeapUnit
__vt__Q23mem8HeapUnit:
.4byte 0
.4byte 0
.4byte __dt__Q23mem8HeapUnitFv
.4byte allocatorAlloc__Q23mem8HeapUnitFUll
.4byte allocatorFree__Q23mem8HeapUnitFPv
.4byte heapName__Q23mem8HeapUnitCFv
.4byte heapMemBlock__Q23mem8HeapUnitCFv
.4byte heapUsingBlockCount__Q23mem8HeapUnitCFv
.4byte heapDump__Q23mem8HeapUnitCFv
.4byte 0

View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@49237_80459D70"
"@49237_80459D70":
.4byte 0x45787465
.4byte 0x726E616C
.4byte 0
.4byte 0

View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global "@48941_80545BF8"
"@48941_80545BF8":
.skip 0xC
.global "@LOCAL@SetupIfNotSetup__Q23mem6MemoryFv@obj"
"@LOCAL@SetupIfNotSetup__Q23mem6MemoryFv@obj":
.skip 0x2CC

View file

@ -1,44 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49232_80557280"
"@49232_80557280":
.4byte 0x4172656E
.4byte 0x614D3100
.global "@49233_80557288"
"@49233_80557288":
.4byte 0x4172656E
.4byte 0x614D3200
.global "@49234_80557290"
"@49234_80557290":
.4byte 0x4D656D31
.4byte 0x46697800
.global "@49235_80557298"
"@49235_80557298":
.4byte 0x5363656E
.4byte 0x65000000
.global "@49236_805572A0"
"@49236_805572A0":
.4byte 0x4D656D32
.4byte 0x46697800
.global "@49238_805572A8"
"@49238_805572A8":
.4byte 0x44656275
.4byte 0x67000000
.global "@49239_805572B0"
"@49239_805572B0":
.4byte 0x53657100
.4byte 0

View file

@ -1,6 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "@GUARD@SetupIfNotSetup__Q23mem6MemoryFv@obj"
"@GUARD@SetupIfNotSetup__Q23mem6MemoryFv@obj":
.skip 0x8

View file

@ -1,4 +0,0 @@
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_\\OperatorNewDelete_cpp"

View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "t_allocator__31@unnamed@OperatorNewDelete_cpp@"
"t_allocator__31@unnamed@OperatorNewDelete_cpp@":
.skip 0x4
.global "t_globalNewDeleteAllocator__31@unnamed@OperatorNewDelete_cpp@"
"t_globalNewDeleteAllocator__31@unnamed@OperatorNewDelete_cpp@":
.skip 0x4

View file

@ -1102,3 +1102,45 @@ allocatorFree__Q33mem14HeapCompaction22AllocFromTailAllocatorFPv:
"@4@__dt__Q23mem14HeapCompactionFv":
/* 801BE1F0 001BA030 38 63 FF FC */ addi r3, r3, -0x4
/* 801BE1F4 001BA034 4B FF F5 2C */ b __dt__Q23mem14HeapCompactionFv
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global __vt__Q23mem14HeapCompaction
__vt__Q23mem14HeapCompaction:
.4byte 0
.4byte 0
.4byte __dt__Q23mem14HeapCompactionFv
.4byte heapName__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte fragmentBlockCount__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte usedBlockCount__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte totalHeapSize__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte usedHeapSize__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte startAddress__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte endAddress__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte drawUsedBlocks__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer
.4byte drawFragmentBlocks__Q23mem14HeapCompactionCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer
.4byte 0
.4byte 0
.4byte "@4@__dt__Q23mem14HeapCompactionFv"
.4byte "@4@allocatorAlloc__Q23mem14HeapCompactionFUll"
.4byte "@4@allocatorFree__Q23mem14HeapCompactionFPv"
.4byte allocatorAlloc__Q23mem14HeapCompactionFUll
.4byte allocatorFree__Q23mem14HeapCompactionFPv
.global __vt__Q33mem14HeapCompaction22AllocFromTailAllocator
__vt__Q33mem14HeapCompaction22AllocFromTailAllocator:
.4byte 0
.4byte 0
.4byte __dt__Q33mem14HeapCompaction22AllocFromTailAllocatorFv
.4byte allocatorAlloc__Q33mem14HeapCompaction22AllocFromTailAllocatorFUll
.4byte allocatorFree__Q33mem14HeapCompaction22AllocFromTailAllocatorFPv
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49358"
"@49358":
.4byte 0x00000020
.4byte 0

View file

@ -295,3 +295,27 @@ allocatorAlloc__Q33mem7HeapExp22AllocFromTailAllocatorFUll:
allocatorFree__Q33mem7HeapExp22AllocFromTailAllocatorFPv:
/* 801BE638 001BA478 80 63 00 04 */ lwz r3, 0x4(r3)
/* 801BE63C 001BA47C 4B FF FF 64 */ b free__Q23mem7HeapExpFPv
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global __vt__Q23mem7HeapExp
__vt__Q23mem7HeapExp:
.4byte 0
.4byte 0
.4byte __dt__Q23mem7HeapExpFv
.4byte allocatorAlloc__Q23mem7HeapExpFUll
.4byte allocatorFree__Q23mem7HeapExpFPv
.4byte heapName__Q23mem7HeapExpCFv
.4byte heapMemBlock__Q23mem7HeapExpCFv
.4byte heapUsingBlockCount__Q23mem7HeapExpCFv
.4byte heapDump__Q23mem7HeapExpCFv
.global __vt__Q33mem7HeapExp22AllocFromTailAllocator
__vt__Q33mem7HeapExp22AllocFromTailAllocator:
.4byte 0
.4byte 0
.4byte __dt__Q33mem7HeapExp22AllocFromTailAllocatorFv
.4byte allocatorAlloc__Q33mem7HeapExp22AllocFromTailAllocatorFUll
.4byte allocatorFree__Q33mem7HeapExp22AllocFromTailAllocatorFPv

View file

@ -466,3 +466,17 @@ clearIfUsing__Q33mem12HeapExpArray5BlockFv:
/* 801BEC18 001BAA58 80 83 00 10 */ lwz r4, 0x10(r3)
/* 801BEC1C 001BAA5C 4B FF FF E4 */ b unref__Q33mem12HeapExpArray5BlockFRQ23mem10IAllocator
/* 801BEC20 001BAA60 4E 80 00 20 */ blr
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49831"
"@49831":
.4byte 0x25730000
.4byte 0
.global "@49832"
"@49832":
.4byte 0x25732530
.4byte 0x326C7500

View file

@ -158,3 +158,17 @@ lbl_801BEEA4:
.global "__dt__Q33hel6common55MutableArray<PQ44nrel6devkit7heapmap12IHeapMapUser,512>Fv"
"__dt__Q33hel6common55MutableArray<PQ44nrel6devkit7heapmap12IHeapMapUser,512>Fv":
/* 801BEEB4 001BACF4 4B FB 6C B4 */ b __dt__Q23scn6ISceneFv
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_\\HeapMapUserRepos_cpp"
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global "@48741_805453E8"
"@48741_805453E8":
.skip 0xC
.global "t_repos__Q23mem30@unnamed@HeapMapUserRepos_cpp@"
"t_repos__Q23mem30@unnamed@HeapMapUserRepos_cpp@":
.skip 0x804

View file

@ -242,3 +242,19 @@ heapUsingBlockCount__Q23mem8HeapUnitCFv:
.global heapDump__Q23mem8HeapUnitCFv
heapDump__Q23mem8HeapUnitCFv:
/* 801BF1B0 001BAFF0 4E 80 00 20 */ blr
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global __vt__Q23mem8HeapUnit
__vt__Q23mem8HeapUnit:
.4byte 0
.4byte 0
.4byte __dt__Q23mem8HeapUnitFv
.4byte allocatorAlloc__Q23mem8HeapUnitFUll
.4byte allocatorFree__Q23mem8HeapUnitFPv
.4byte heapName__Q23mem8HeapUnitCFv
.4byte heapMemBlock__Q23mem8HeapUnitCFv
.4byte heapUsingBlockCount__Q23mem8HeapUnitCFv
.4byte heapDump__Q23mem8HeapUnitCFv
.4byte 0

View file

@ -289,3 +289,73 @@ debugHeap__Q23mem6MemoryFv:
seqHeap__Q23mem6MemoryFv:
/* 801BF610 001BB450 38 63 02 78 */ addi r3, r3, 0x278
/* 801BF614 001BB454 4E 80 00 20 */ blr
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@49237_80459D70"
"@49237_80459D70":
.4byte 0x45787465
.4byte 0x726E616C
.4byte 0
.4byte 0
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global "@48941_80545BF8"
"@48941_80545BF8":
.skip 0xC
.global "@LOCAL@SetupIfNotSetup__Q23mem6MemoryFv@obj"
"@LOCAL@SetupIfNotSetup__Q23mem6MemoryFv@obj":
.skip 0x2CC
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49232_80557280"
"@49232_80557280":
.4byte 0x4172656E
.4byte 0x614D3100
.global "@49233_80557288"
"@49233_80557288":
.4byte 0x4172656E
.4byte 0x614D3200
.global "@49234_80557290"
"@49234_80557290":
.4byte 0x4D656D31
.4byte 0x46697800
.global "@49235_80557298"
"@49235_80557298":
.4byte 0x5363656E
.4byte 0x65000000
.global "@49236_805572A0"
"@49236_805572A0":
.4byte 0x4D656D32
.4byte 0x46697800
.global "@49238_805572A8"
"@49238_805572A8":
.4byte 0x44656275
.4byte 0x67000000
.global "@49239_805572B0"
"@49239_805572B0":
.4byte 0x53657100
.4byte 0
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "@GUARD@SetupIfNotSetup__Q23mem6MemoryFv@obj"
"@GUARD@SetupIfNotSetup__Q23mem6MemoryFv@obj":
.skip 0x8

View file

@ -114,3 +114,17 @@ UnsetGlobalNewDeleteAllocator__Q23mem17OperatorNewDeleteFRQ23mem10IAllocator:
/* 801BF754 001BB594 7C 08 03 A6 */ mtlr r0
/* 801BF758 001BB598 38 21 00 10 */ addi r1, r1, 0x10
/* 801BF75C 001BB59C 4E 80 00 20 */ blr
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_\\OperatorNewDelete_cpp"
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "t_allocator__31@unnamed@OperatorNewDelete_cpp@"
"t_allocator__31@unnamed@OperatorNewDelete_cpp@":
.skip 0x4
.global "t_globalNewDeleteAllocator__31@unnamed@OperatorNewDelete_cpp@"
"t_globalNewDeleteAllocator__31@unnamed@OperatorNewDelete_cpp@":
.skip 0x4

View file

@ -0,0 +1,38 @@
.include "macros.inc"
.section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860
.global __ct__Q23mem12SDKAllocatorFRQ23mem10IAllocatori
__ct__Q23mem12SDKAllocatorFRQ23mem10IAllocatori:
/* 801BF760 001BB5A0 90 83 00 00 */ stw r4, 0x0(r3)
/* 801BF764 001BB5A4 90 A3 00 04 */ stw r5, 0x4(r3)
/* 801BF768 001BB5A8 38 02 9C 38 */ addi r0, r2, AllocatorFunc__Q23mem12SDKAllocator@sda21
/* 801BF76C 001BB5AC 90 03 00 08 */ stw r0, 0x8(r3)
/* 801BF770 001BB5B0 90 63 00 0C */ stw r3, 0xc(r3)
/* 801BF774 001BB5B4 4E 80 00 20 */ blr
.global Alloc__Q23mem12SDKAllocatorFP12MEMAllocatorUl
Alloc__Q23mem12SDKAllocatorFP12MEMAllocatorUl:
/* 801BF778 001BB5B8 80 A3 00 04 */ lwz r5, 0x4(r3)
/* 801BF77C 001BB5BC 80 65 00 00 */ lwz r3, 0x0(r5)
/* 801BF780 001BB5C0 80 A5 00 04 */ lwz r5, 0x4(r5)
/* 801BF784 001BB5C4 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF788 001BB5C8 81 8C 00 0C */ lwz r12, 0xc(r12)
/* 801BF78C 001BB5CC 7D 89 03 A6 */ mtctr r12
/* 801BF790 001BB5D0 4E 80 04 20 */ bctr
.global Free__Q23mem12SDKAllocatorFP12MEMAllocatorPv
Free__Q23mem12SDKAllocatorFP12MEMAllocatorPv:
/* 801BF794 001BB5D4 80 63 00 04 */ lwz r3, 0x4(r3)
/* 801BF798 001BB5D8 80 63 00 00 */ lwz r3, 0x0(r3)
/* 801BF79C 001BB5DC 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF7A0 001BB5E0 81 8C 00 10 */ lwz r12, 0x10(r12)
/* 801BF7A4 001BB5E4 7D 89 03 A6 */ mtctr r12
/* 801BF7A8 001BB5E8 4E 80 04 20 */ bctr
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global AllocatorFunc__Q23mem12SDKAllocator
AllocatorFunc__Q23mem12SDKAllocator:
.4byte Alloc__Q23mem12SDKAllocatorFP12MEMAllocatorUl
.4byte Free__Q23mem12SDKAllocatorFP12MEMAllocatorPv

View file

@ -0,0 +1,219 @@
.include "macros.inc"
.section .text, "ax" # 0x80006A00 - 0x80406260 ; 0x003FF860
.global __ct__Q23mem15UnitHeapMapUserFRCQ23mem8HeapUnit
__ct__Q23mem15UnitHeapMapUserFRCQ23mem8HeapUnit:
/* 801BF7AC 001BB5EC 3C A0 80 46 */ lis r5, __vt__Q23mem15UnitHeapMapUser@ha
/* 801BF7B0 001BB5F0 38 05 9D 80 */ addi r0, r5, __vt__Q23mem15UnitHeapMapUser@l
/* 801BF7B4 001BB5F4 90 03 00 00 */ stw r0, 0x0(r3)
/* 801BF7B8 001BB5F8 90 83 00 04 */ stw r4, 0x4(r3)
/* 801BF7BC 001BB5FC 4E 80 00 20 */ blr
.global heapName__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
heapName__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap:
/* 801BF7C0 001BB600 80 63 00 04 */ lwz r3, 0x4(r3)
/* 801BF7C4 001BB604 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF7C8 001BB608 81 8C 00 14 */ lwz r12, 0x14(r12)
/* 801BF7CC 001BB60C 7D 89 03 A6 */ mtctr r12
/* 801BF7D0 001BB610 4E 80 04 20 */ bctr
.global fragmentBlockCount__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
fragmentBlockCount__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap:
/* 801BF7D4 001BB614 4B E9 46 1C */ b __wpadNoAlloc
.global usedBlockCount__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
usedBlockCount__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap:
/* 801BF7D8 001BB618 80 63 00 04 */ lwz r3, 0x4(r3)
/* 801BF7DC 001BB61C 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF7E0 001BB620 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 801BF7E4 001BB624 7D 89 03 A6 */ mtctr r12
/* 801BF7E8 001BB628 4E 80 04 20 */ bctr
.global totalHeapSize__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
totalHeapSize__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap:
/* 801BF7EC 001BB62C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801BF7F0 001BB630 7C 08 02 A6 */ mflr r0
/* 801BF7F4 001BB634 90 01 00 14 */ stw r0, 0x14(r1)
/* 801BF7F8 001BB638 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801BF7FC 001BB63C 93 C1 00 08 */ stw r30, 0x8(r1)
/* 801BF800 001BB640 7C 7E 1B 78 */ mr r30, r3
/* 801BF804 001BB644 80 63 00 04 */ lwz r3, 0x4(r3)
/* 801BF808 001BB648 4B FF F9 79 */ bl freeMemBlockCount__Q23mem8HeapUnitCFv
/* 801BF80C 001BB64C 7C 7F 1B 78 */ mr r31, r3
/* 801BF810 001BB650 80 7E 00 04 */ lwz r3, 0x4(r30)
/* 801BF814 001BB654 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF818 001BB658 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 801BF81C 001BB65C 7D 89 03 A6 */ mtctr r12
/* 801BF820 001BB660 4E 80 04 21 */ bctrl
/* 801BF824 001BB664 7F E3 FA 14 */ add r31, r3, r31
/* 801BF828 001BB668 80 7E 00 04 */ lwz r3, 0x4(r30)
/* 801BF82C 001BB66C 4B F6 A3 95 */ bl getDrawInfo__Q310homebutton3gui11PaneManagerFv
/* 801BF830 001BB670 7C 63 F9 D6 */ mullw r3, r3, r31
/* 801BF834 001BB674 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801BF838 001BB678 83 C1 00 08 */ lwz r30, 0x8(r1)
/* 801BF83C 001BB67C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801BF840 001BB680 7C 08 03 A6 */ mtlr r0
/* 801BF844 001BB684 38 21 00 10 */ addi r1, r1, 0x10
/* 801BF848 001BB688 4E 80 00 20 */ blr
.global usedHeapSize__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
usedHeapSize__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap:
/* 801BF84C 001BB68C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801BF850 001BB690 7C 08 02 A6 */ mflr r0
/* 801BF854 001BB694 90 01 00 14 */ stw r0, 0x14(r1)
/* 801BF858 001BB698 93 E1 00 0C */ stw r31, 0xc(r1)
/* 801BF85C 001BB69C 93 C1 00 08 */ stw r30, 0x8(r1)
/* 801BF860 001BB6A0 7C 7E 1B 78 */ mr r30, r3
/* 801BF864 001BB6A4 80 63 00 04 */ lwz r3, 0x4(r3)
/* 801BF868 001BB6A8 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF86C 001BB6AC 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 801BF870 001BB6B0 7D 89 03 A6 */ mtctr r12
/* 801BF874 001BB6B4 4E 80 04 21 */ bctrl
/* 801BF878 001BB6B8 7C 7F 1B 78 */ mr r31, r3
/* 801BF87C 001BB6BC 80 7E 00 04 */ lwz r3, 0x4(r30)
/* 801BF880 001BB6C0 4B F6 A3 41 */ bl getDrawInfo__Q310homebutton3gui11PaneManagerFv
/* 801BF884 001BB6C4 7C 63 F9 D6 */ mullw r3, r3, r31
/* 801BF888 001BB6C8 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 801BF88C 001BB6CC 83 C1 00 08 */ lwz r30, 0x8(r1)
/* 801BF890 001BB6D0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801BF894 001BB6D4 7C 08 03 A6 */ mtlr r0
/* 801BF898 001BB6D8 38 21 00 10 */ addi r1, r1, 0x10
/* 801BF89C 001BB6DC 4E 80 00 20 */ blr
.global startAddress__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
startAddress__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap:
/* 801BF8A0 001BB6E0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801BF8A4 001BB6E4 7C 08 02 A6 */ mflr r0
/* 801BF8A8 001BB6E8 90 01 00 14 */ stw r0, 0x14(r1)
/* 801BF8AC 001BB6EC 80 63 00 04 */ lwz r3, 0x4(r3)
/* 801BF8B0 001BB6F0 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF8B4 001BB6F4 81 8C 00 18 */ lwz r12, 0x18(r12)
/* 801BF8B8 001BB6F8 7D 89 03 A6 */ mtctr r12
/* 801BF8BC 001BB6FC 4E 80 04 21 */ bctrl
/* 801BF8C0 001BB700 90 81 00 0C */ stw r4, 0xc(r1)
/* 801BF8C4 001BB704 90 61 00 08 */ stw r3, 0x8(r1)
/* 801BF8C8 001BB708 7C 83 23 78 */ mr r3, r4
/* 801BF8CC 001BB70C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 801BF8D0 001BB710 7C 08 03 A6 */ mtlr r0
/* 801BF8D4 001BB714 38 21 00 10 */ addi r1, r1, 0x10
/* 801BF8D8 001BB718 4E 80 00 20 */ blr
.global endAddress__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
endAddress__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap:
/* 801BF8DC 001BB71C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801BF8E0 001BB720 7C 08 02 A6 */ mflr r0
/* 801BF8E4 001BB724 90 01 00 24 */ stw r0, 0x24(r1)
/* 801BF8E8 001BB728 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 801BF8EC 001BB72C 93 C1 00 18 */ stw r30, 0x18(r1)
/* 801BF8F0 001BB730 7C 7E 1B 78 */ mr r30, r3
/* 801BF8F4 001BB734 7C 9F 23 78 */ mr r31, r4
/* 801BF8F8 001BB738 80 63 00 04 */ lwz r3, 0x4(r3)
/* 801BF8FC 001BB73C 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF900 001BB740 81 8C 00 18 */ lwz r12, 0x18(r12)
/* 801BF904 001BB744 7D 89 03 A6 */ mtctr r12
/* 801BF908 001BB748 4E 80 04 21 */ bctrl
/* 801BF90C 001BB74C 90 81 00 0C */ stw r4, 0xc(r1)
/* 801BF910 001BB750 90 61 00 08 */ stw r3, 0x8(r1)
/* 801BF914 001BB754 7F C3 F3 78 */ mr r3, r30
/* 801BF918 001BB758 7F E4 FB 78 */ mr r4, r31
/* 801BF91C 001BB75C 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF920 001BB760 81 8C 00 20 */ lwz r12, 0x20(r12)
/* 801BF924 001BB764 7D 89 03 A6 */ mtctr r12
/* 801BF928 001BB768 4E 80 04 21 */ bctrl
/* 801BF92C 001BB76C 80 01 00 08 */ lwz r0, 0x8(r1)
/* 801BF930 001BB770 7C 63 02 14 */ add r3, r3, r0
/* 801BF934 001BB774 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 801BF938 001BB778 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 801BF93C 001BB77C 80 01 00 24 */ lwz r0, 0x24(r1)
/* 801BF940 001BB780 7C 08 03 A6 */ mtlr r0
/* 801BF944 001BB784 38 21 00 20 */ addi r1, r1, 0x20
/* 801BF948 001BB788 4E 80 00 20 */ blr
.global drawUsedBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer
drawUsedBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer:
/* 801BF94C 001BB78C 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 801BF950 001BB790 7C 08 02 A6 */ mflr r0
/* 801BF954 001BB794 90 01 00 44 */ stw r0, 0x44(r1)
/* 801BF958 001BB798 39 61 00 40 */ addi r11, r1, 0x40
/* 801BF95C 001BB79C 4B E4 79 E1 */ bl lbl_8000733C
/* 801BF960 001BB7A0 7C 7B 1B 78 */ mr r27, r3
/* 801BF964 001BB7A4 7C 9C 23 78 */ mr r28, r4
/* 801BF968 001BB7A8 7C BD 2B 78 */ mr r29, r5
/* 801BF96C 001BB7AC 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF970 001BB7B0 81 8C 00 20 */ lwz r12, 0x20(r12)
/* 801BF974 001BB7B4 7D 89 03 A6 */ mtctr r12
/* 801BF978 001BB7B8 4E 80 04 21 */ bctrl
/* 801BF97C 001BB7BC 7C 7E 1B 78 */ mr r30, r3
/* 801BF980 001BB7C0 80 02 9C 40 */ lwz r0, "@49027_8055FBC0"@sda21(r2)
/* 801BF984 001BB7C4 90 01 00 08 */ stw r0, 0x8(r1)
/* 801BF988 001BB7C8 80 7B 00 04 */ lwz r3, 0x4(r27)
/* 801BF98C 001BB7CC 4B F3 B2 85 */ bl GetTexMapAry__Q34nw4r3lyt8MaterialCFv
/* 801BF990 001BB7D0 7C 7F 1B 78 */ mr r31, r3
/* 801BF994 001BB7D4 80 7B 00 04 */ lwz r3, 0x4(r27)
/* 801BF998 001BB7D8 4B F6 A2 29 */ bl getDrawInfo__Q310homebutton3gui11PaneManagerFv
/* 801BF99C 001BB7DC 7C 03 F9 D6 */ mullw r0, r3, r31
/* 801BF9A0 001BB7E0 7C BE 02 14 */ add r5, r30, r0
/* 801BF9A4 001BB7E4 38 61 00 18 */ addi r3, r1, 0x18
/* 801BF9A8 001BB7E8 7F C4 F3 78 */ mr r4, r30
/* 801BF9AC 001BB7EC 38 C0 00 00 */ li r6, 0x0
/* 801BF9B0 001BB7F0 4B F8 CD 29 */ bl __ct__Q34nrel3mem5BlockFPCvPCvUl
/* 801BF9B4 001BB7F4 7F A3 EB 78 */ mr r3, r29
/* 801BF9B8 001BB7F8 38 81 00 18 */ addi r4, r1, 0x18
/* 801BF9BC 001BB7FC 38 A1 00 08 */ addi r5, r1, 0x8
/* 801BF9C0 001BB800 4B F8 C3 D9 */ bl tryToDrawWithColor__Q44nrel6devkit7heapmap18HeapMapBlockDrawerFRCQ34nrel3mem5BlockRC8_GXColor
/* 801BF9C4 001BB804 38 61 00 18 */ addi r3, r1, 0x18
/* 801BF9C8 001BB808 38 80 FF FF */ li r4, -0x1
/* 801BF9CC 001BB80C 4B FB 61 9D */ bl __dt__Q23scn6ISceneFv
/* 801BF9D0 001BB810 7F 63 DB 78 */ mr r3, r27
/* 801BF9D4 001BB814 7F 84 E3 78 */ mr r4, r28
/* 801BF9D8 001BB818 81 83 00 00 */ lwz r12, 0x0(r3)
/* 801BF9DC 001BB81C 81 8C 00 1C */ lwz r12, 0x1c(r12)
/* 801BF9E0 001BB820 7D 89 03 A6 */ mtctr r12
/* 801BF9E4 001BB824 4E 80 04 21 */ bctrl
/* 801BF9E8 001BB828 7C BE 1A 14 */ add r5, r30, r3
/* 801BF9EC 001BB82C 38 61 00 0C */ addi r3, r1, 0xc
/* 801BF9F0 001BB830 7F C4 F3 78 */ mr r4, r30
/* 801BF9F4 001BB834 38 C0 00 00 */ li r6, 0x0
/* 801BF9F8 001BB838 4B F8 CC E1 */ bl __ct__Q34nrel3mem5BlockFPCvPCvUl
/* 801BF9FC 001BB83C 7F A3 EB 78 */ mr r3, r29
/* 801BFA00 001BB840 38 81 00 0C */ addi r4, r1, 0xc
/* 801BFA04 001BB844 4B F8 C3 8D */ bl tryToDraw__Q44nrel6devkit7heapmap18HeapMapBlockDrawerFRCQ34nrel3mem5Block
/* 801BFA08 001BB848 38 61 00 0C */ addi r3, r1, 0xc
/* 801BFA0C 001BB84C 38 80 FF FF */ li r4, -0x1
/* 801BFA10 001BB850 4B FB 61 59 */ bl __dt__Q23scn6ISceneFv
/* 801BFA14 001BB854 39 61 00 40 */ addi r11, r1, 0x40
/* 801BFA18 001BB858 4B E4 79 71 */ bl lbl_80007388
/* 801BFA1C 001BB85C 80 01 00 44 */ lwz r0, 0x44(r1)
/* 801BFA20 001BB860 7C 08 03 A6 */ mtlr r0
/* 801BFA24 001BB864 38 21 00 40 */ addi r1, r1, 0x40
/* 801BFA28 001BB868 4E 80 00 20 */ blr
.global drawFragmentBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer
drawFragmentBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer:
/* 801BFA2C 001BB86C 4E 80 00 20 */ blr
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global __vt__Q23mem15UnitHeapMapUser
__vt__Q23mem15UnitHeapMapUser:
.4byte 0
.4byte 0
.4byte __dt__Q23mem15UnitHeapMapUserFv
.4byte heapName__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte fragmentBlockCount__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte usedBlockCount__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte totalHeapSize__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte usedHeapSize__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte startAddress__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte endAddress__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap
.4byte drawUsedBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer
.4byte drawFragmentBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@49027_8055FBC0"
"@49027_8055FBC0":
.4byte 0x00FFFF40
.4byte 0

View file

@ -913,25 +913,26 @@ $(BUILD_DIR)/asm/src/mcoll/detail/RayChecker.o \
$(BUILD_DIR)/asm/src/mcoll/detail/ShapeDiamondContext.o \
$(BUILD_DIR)/asm/src/mcoll/detail/StdResponder.o \
\
$(BUILD_DIR)/asm/src/mem/AutoHeapExp.o \
$(BUILD_DIR)/asm/src/mem/DataBlock.o \
$(BUILD_DIR)/asm/src/mem/GlobalNewDeleteChanger.o \
$(BUILD_DIR)/asm/src/mem/HeapCompaction.o \
$(BUILD_DIR)/asm/src/mem/HeapCompactionNode.o \
$(BUILD_DIR)/asm/src/mem/HeapCompactionNodeHandle.o \
$(BUILD_DIR)/asm/src/mem/HeapExp.o \
$(BUILD_DIR)/asm/src/mem/HeapExpArray.o \
$(BUILD_DIR)/asm/src/mem/HeapExpArrayUser.o \
$(BUILD_DIR)/asm/src/mem/HeapMapUserRepos.o \
$(BUILD_DIR)/asm/src/mem/HeapUnit.o \
$(BUILD_DIR)/asm/src/mem/MemBlock.o \
$(BUILD_DIR)/asm/src/mem/Memory.o \
$(BUILD_DIR)/asm/src/mem/OperatorNewDelete.o \
$(BUILD_DIR)/asm/src/mem/SDKAllocator.o \
$(BUILD_DIR)/asm/src/mem/UnitHeapMapUser.o \
$(BUILD_DIR)/asm/src/mem/Utility.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/AutoHeapExp_801bd204.o \
$(BUILD_DIR)/asm/src/DataBlock_801bd2a4.o \
$(BUILD_DIR)/asm/src/GlobalNewDeleteChanger_801bd370.o \
$(BUILD_DIR)/asm/src/HeapCompaction_801bd404.o \
$(BUILD_DIR)/asm/src/HeapCompactionNode_801be1f8.o \
$(BUILD_DIR)/asm/src/HeapCompactionNodeHandle_801be2a8.o \
$(BUILD_DIR)/asm/src/HeapExp_801be2b0.o \
$(BUILD_DIR)/asm/src/HeapExpArray_801be640.o \
$(BUILD_DIR)/asm/src/HeapExpArrayUser_801bec24.o \
$(BUILD_DIR)/asm/src/HeapMapUserRepos_801becc0.o \
$(BUILD_DIR)/asm/src/HeapUnit_801beeb8.o \
$(BUILD_DIR)/asm/src/MemBlock_801bf1b4.o \
$(BUILD_DIR)/asm/src/Memory_801bf1f8.o \
$(BUILD_DIR)/asm/src/OperatorNewDelete_801bf618.o \
$(BUILD_DIR)/asm/src/SDKAllocator_801bf760.o \
$(BUILD_DIR)/asm/src/UnitHeapMapUser_801bf7ac.o \
$(BUILD_DIR)/asm/src/Utility_801bfa30.o \
$(BUILD_DIR)/asm/src/Engine_801bfad4.o \
$(BUILD_DIR)/asm/src/Heap_801bfcec.o \
$(BUILD_DIR)/asm/src/Manager_801c05fc.o \
@ -2956,8 +2957,6 @@ $(BUILD_DIR)/asm/src/Thread_80405f14.o \
$(BUILD_DIR)/asm/src/UIntAABBox_8040603c.o
# .ctors
O_FILES += \
$(BUILD_DIR)/asm/src/HeapMapUserRepos_80406334.o \
$(BUILD_DIR)/asm/src/OperatorNewDelete_80406338.o \
$(BUILD_DIR)/asm/src/DvdControl_8040633c.o \
$(BUILD_DIR)/asm/src/MovieKindUtil_80406340.o \
$(BUILD_DIR)/asm/src/Manager_80406344.o \
@ -3139,11 +3138,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
# .data
O_FILES += \
$(BUILD_DIR)/asm/src/HeapCompaction_80459cb0.o \
$(BUILD_DIR)/asm/src/HeapExp_80459d10.o \
$(BUILD_DIR)/asm/src/HeapUnit_80459d48.o \
$(BUILD_DIR)/asm/src/Memory_80459d70.o \
$(BUILD_DIR)/asm/src/UnitHeapMapUser_80459d80.o \
$(BUILD_DIR)/asm/src/Heap_80459db0.o \
$(BUILD_DIR)/asm/src/Manager_80459dc0.o \
$(BUILD_DIR)/asm/src/Runner_80459de0.o \
@ -4655,8 +4649,6 @@ $(BUILD_DIR)/asm/src/Alarm_804966e0.o \
$(BUILD_DIR)/asm/src/StateChanger_804966f0.o
# .bss
O_FILES += \
$(BUILD_DIR)/asm/src/HeapMapUserRepos_805453e8.o \
$(BUILD_DIR)/asm/src/Memory_80545bf8.o \
$(BUILD_DIR)/asm/src/Trophy_80545ed0.o \
$(BUILD_DIR)/asm/src/Table_80545ee0.o \
$(BUILD_DIR)/asm/src/AbilityKindUtil_80545f20.o \
@ -4699,9 +4691,6 @@ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o
# .sdata
O_FILES += \
$(BUILD_DIR)/asm/src/HeapCompaction_80557268.o \
$(BUILD_DIR)/asm/src/HeapExpArray_80557270.o \
$(BUILD_DIR)/asm/src/Memory_80557280.o \
$(BUILD_DIR)/asm/src/Engine_805572b8.o \
$(BUILD_DIR)/asm/src/Heap_805572c8.o \
$(BUILD_DIR)/asm/src/ScriptArchive_805572d8.o \
@ -5021,8 +5010,6 @@ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o
# .sbss
O_FILES += \
$(BUILD_DIR)/asm/src/Memory_8055d2a0.o \
$(BUILD_DIR)/asm/src/OperatorNewDelete_8055d2a8.o \
$(BUILD_DIR)/asm/src/Heap_8055d2b0.o \
$(BUILD_DIR)/asm/src/Manager_8055d2b8.o \
$(BUILD_DIR)/asm/src/Runner_8055d2c0.o \
@ -5128,8 +5115,6 @@ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
$(BUILD_DIR)/asm/src/Alarm_8055df68.o
# .sdata2
O_FILES += \
$(BUILD_DIR)/asm/src/SDKAllocator_8055fbb8.o \
$(BUILD_DIR)/asm/src/UnitHeapMapUser_8055fbc0.o \
$(BUILD_DIR)/asm/src/Scn__ChallengeTitle__Chara_8055fbc8.o \
$(BUILD_DIR)/asm/src/Scn__GrandTitle__Chara_8055fbd0.o \
$(BUILD_DIR)/asm/src/N_Mint_Cast_8055fbd8.o \