ñmatch malloc,link memtrk

config/dol_slices.yml

@@ -1,90 +1,93 @@
-#dolphin/os/__start.c:
-#    .init: [0x80003100, 0x80003354] can't link because there's two mains
-#dolphin/os/__ppc_eabi_init.cpp:
-#    .init: [0x80003354, 0x800033a8]
-#    .text: [0x8007FDFC, 0x8007fe90]
-runtime/__mem.c:
-    .init: [0x800033a8, 0x800034e0]
-#TRK/mem_TRK.c:
-#    .init: [0x800034e0, 0x80003510]
-asm/__exception.s:
-    .init: [0x80003534, 0x80005468]
-jaudio_NES/dummyprobe.c:
-    .text: [0x800083f8, 0x80008400]
-#jaudio_NES/verysimple.c:
-#    .text: [0x80008400, 0x80008480]
-#    .sdata: [0x80217b80, 0x80217b88]
-libforest/ReconfigBATs.c:
-    .text: [0x8005adac, 0x8005aed4]
-#libu64/debug.c: //not match
-#    .text: [0x8005aed4, 0x8005af30]
-#    .data: [0x800dc7c8, 0x800dc7f0]
-#libu64/gfxprint.c: specify ranges later
-libc64/aprintf.c:
-    .text: [0x8005cbdc, 0x8005cc14]
-#libc64/math64.c: //not match
-#    .text: [0x8005cc14, 0x8005cccc]
-#    .sdata2: [0x80219118, 0x80219130]
-libc64/qrand.c:
-    .text: [0x8005cccc, 0x8005cd64]
-    .sdata: [0x80217de8, 0x80217df0]
-    .sbss: [0x80218640, 0x80218648]
-    .sdata2: [0x80219130, 0x80219138]
-#libultra/ultra.c:                  won't link
-#    .text: [0x8005d01c, 0x8005d15c]
-#    .bss: [0x80206f60, 0x80206fa0]
-#libultra/gu/scale.c:
-#    .text: [0x8005e7d4, 0x8005e860]
-#    .sdata2: [0x80219208, 0x80219210]
-#libultra/gu/translate.c:
-#    .text: [0x8005e8ac, 0x8005e918]
-libultra/gu/sins.c:
-    .text: [0x8005e860, 0x8005e8ac]
-    .data: [0x800dd360, 0x800ddb60]
-#libultra/xldtob.c:
-#    .text: [0x8005e918, 0x8005f2a0]
-#    .rodata: [0x800ab110, 0x800ab158]
-#    .sdata: [0x80217df8, 0x80217e08]
-#    .sdata2: [0x80219210, 0x80219230]
-#libultra/xlitob.c:
-#    .text: [0x8005f2a0, 0x8005f4cc]
-#    .data: [0x800ddb60, 0x800ddb88]
-#libultra/xprintf.c:
-#    .text: [0x8005f4cc, 0x8005ff74]
-#    .rodata: [0x800ab158, 0x800ab170]
-#    .data: [0x800ddb88, 0x800ddd20]
-#    .sdata: [0x80217e08, 0x80217e10]
-#    .sdata2: [0x80219230, 0x80219238]
-JSystem/JKernel/JKRHeap.cpp:
-    .text: [0x80063748, 0x80064028]
-    .data: [0x800ddf20, 0x800ddf98]
-    .sdata: [0x80217e58, 0x80217e80]
-    .sbss: [0x802186d8, 0x80218700]
-JSystem/JKernel/JKRDisposer.cpp:
-    .text: [0x80065aa0, 0x80065b8c]
-    .data: [0x800de3a8, 0x800de3c0]
-    .sdata: [0x80217ec0, 0x80217ec8]
-dolphin/BASE/ppcarch.c:
-    .text: [0x8007867c, 0x80078718]
-dolphin/os/OSArena.c:
-    .text: [0x8007988c, 0x800798ac]
-    .sdata: [0x80218178, 0x80218180]
-    .sbss: [0x802188f8, 0x80218900]
-#dolphin/os/OSCache.c:
-#    .text: [0x80079b40, 0x8007a01c]
-#    .data: [0x800dfa00, 0x800dfc30]
-#dolphin/os/OSDisableInterrupts.c:
-    # .text: [0x8007ac24, 0x8007ac38]
-dolphin/os/OSEnableInterrupts.c:
-    .text: [0x8007ac38, 0x8007ac4c]
-dolphin/os/OSRestoreInterrupts.c:
-    .text: [0x8007ac4c, 0x8007ac70]
-MSL_C/rand.c:
-    .text: [0x8009f46c, 0x8009f494]
-    .sdata: [0x80218260, 0x80218268]
-dolphin/odenotstub/odenotstub.c:
-    .text: [0x800a9770, 0x800a9780]
-dolphin/amcstubs/AmcExi2Stubs.c:
-    .text: [0x800a8cc0, 0x800a8cf0]
-dolphin/gx/GXStubs.c:
-    .text: [0x800998d4, 0x800998d8]
+#dolphin/os/__start.c:
+#    .init: [0x80003100, 0x80003354]
+#dolphin/os/__ppc_eabi_init.cpp:
+#    .init: [0x80003354, 0x800033a8]
+#    .text: [0x8007FDFC, 0x8007fe90]
+runtime/__mem.c:
+    .init: [0x800033a8, 0x800034e0]
+TRK/mem_TRK.c:
+    .init: [0x800034e0, 0x80003534]
+asm/__exception.s:
+    .init: [0x80003534, 0x80005468]
+jaudio_NES/dummyprobe.c:
+    .text: [0x800083f8, 0x80008400]
+#jaudio_NES/verysimple.c:
+#    .text: [0x80008400, 0x80008480]
+#    .sdata: [0x80217b80, 0x80217b88]
+libforest/ReconfigBATs.c:
+    .text: [0x8005adac, 0x8005aed4]
+#libu64/debug.c: //not match
+#    .text: [0x8005aed4, 0x8005af30]
+#    .data: [0x800dc7c8, 0x800dc7f0]
+#libu64/gfxprint.c: specify ranges later
+libc64/aprintf.c:
+    .text: [0x8005cbdc, 0x8005cc14]
+#libc64/math64.c: //not match
+#    .text: [0x8005cc14, 0x8005cccc]
+#    .sdata2: [0x80219118, 0x80219130]
+libc64/qrand.c:
+    .text: [0x8005cccc, 0x8005cd64]
+    .sdata: [0x80217de8, 0x80217df0]
+    .sbss: [0x80218640, 0x80218648]
+    .sdata2: [0x80219130, 0x80219138]
+#libc64/malloc.c:
+#    .text: [0x8005cf08, 0x8005d01c]
+#    .bss: [0x80206F30, 0x80206F60]
+#libultra/ultra.c:                  won't link
+#    .text: [0x8005d01c, 0x8005d15c]
+#    .bss: [0x80206f60, 0x80206fa0]
+#libultra/gu/scale.c:
+#    .text: [0x8005e7d4, 0x8005e860]
+#    .sdata2: [0x80219208, 0x80219210]
+#libultra/gu/translate.c:
+#    .text: [0x8005e8ac, 0x8005e918]
+libultra/gu/sins.c:
+    .text: [0x8005e860, 0x8005e8ac]
+    .data: [0x800dd360, 0x800ddb60]
+#libultra/xldtob.c:
+#    .text: [0x8005e918, 0x8005f2a0]
+#    .rodata: [0x800ab110, 0x800ab158]
+#    .sdata: [0x80217df8, 0x80217e08]
+#    .sdata2: [0x80219210, 0x80219230]
+#libultra/xlitob.c:
+#    .text: [0x8005f2a0, 0x8005f4cc]
+#    .data: [0x800ddb60, 0x800ddb88]
+#libultra/xprintf.c:
+#    .text: [0x8005f4cc, 0x8005ff74]
+#    .rodata: [0x800ab158, 0x800ab170]
+#    .data: [0x800ddb88, 0x800ddd20]
+#    .sdata: [0x80217e08, 0x80217e10]
+#    .sdata2: [0x80219230, 0x80219238]
+JSystem/JKernel/JKRHeap.cpp:
+    .text: [0x80063748, 0x80064028]
+    .data: [0x800ddf20, 0x800ddf98]
+    .sdata: [0x80217e58, 0x80217e80]
+    .sbss: [0x802186d8, 0x80218700]
+JSystem/JKernel/JKRDisposer.cpp:
+    .text: [0x80065aa0, 0x80065b8c]
+    .data: [0x800de3a8, 0x800de3c0]
+    .sdata: [0x80217ec0, 0x80217ec8]
+dolphin/BASE/ppcarch.c:
+    .text: [0x8007867c, 0x80078718]
+dolphin/os/OSArena.c:
+    .text: [0x8007988c, 0x800798ac]
+    .sdata: [0x80218178, 0x80218180]
+    .sbss: [0x802188f8, 0x80218900]
+#dolphin/os/OSCache.c:
+#    .text: [0x80079b40, 0x8007a01c]
+#    .data: [0x800dfa00, 0x800dfc30]
+#dolphin/os/OSDisableInterrupts.c:
+    # .text: [0x8007ac24, 0x8007ac38]
+dolphin/os/OSEnableInterrupts.c:
+    .text: [0x8007ac38, 0x8007ac4c]
+dolphin/os/OSRestoreInterrupts.c:
+    .text: [0x8007ac4c, 0x8007ac70]
+MSL_C/rand.c:
+    .text: [0x8009f46c, 0x8009f494]
+    .sdata: [0x80218260, 0x80218268]
+dolphin/odenotstub/odenotstub.c:
+    .text: [0x800a9770, 0x800a9780]
+dolphin/amcstubs/AmcExi2Stubs.c:
+    .text: [0x800a8cc0, 0x800a8cf0]
+dolphin/gx/GXStubs.c:
+    .text: [0x800998d4, 0x800998d8]

config/symbols.yml

@@ -28,6 +28,7 @@ global:
     0x80005cf0: fault_callback_vimode
     0x80005dc0: fault_callback_scroll
     0x80006004: adjustOSArena
+    0x800060f8: main
     0x8000663c: ReportDiskID__Fv
     0x8000665c: JW_UpdateVideoMode
     0x800067b4: JW_SetProgressiveMode
@@ -7895,6 +7896,7 @@ global:
     0x80407A78: lbRk_HarvestMoonDay
     0x80407AE8: mainproc
     0x80407C70: entry
+    0x80407CB9: foresta_main
     0x80407CF4: padmgr_LockSerialMesgQ
     0x80407D30: padmgr_UnlockSerialMesgQ
     0x80407D64: padmgr_LockContData
@@ -52864,10 +52866,10 @@ src/dvdfs.c:
     0x802189d8: BootInfo
 src/OSResetSW.c:
     0x80218938: LastState
-src/boot.c:
-    0x800060f8: main
-rel/main.c:
-    0x80407CB9: main
+#src/boot.c:
+#    0x800060f8: main
+#rel/main.c:
+#    0x80407CB9: main
 rel/ac_quest_talk_island.c:
     0x8048D769: aQMgr_init_normal_info
     0x8048D7A5: aQMgr_set_number_free_str
@@ -58146,4 +58148,4 @@ rel/irqmgr.c:
     0x812F357C: this
 foresta.rel:
     0x80641254: _ctors
-    0x80641258: _dtors
+    0x80641258: _dtors