Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add metrotrk splits #48

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Add metrotrk splits #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 81 additions & 4 deletions config/oot-j/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ revolution/ipc/ipcProfile.c:

revolution/fs/fs.c:
.text start:0x800B9EF8 end:0x800BB2B8
.data start:0x8018AAF8 end:0x8018AB1C
.data start:0x8018AAF8 end:0x8018AB20
.sdata start:0x8025CBC8 end:0x8025CBD8
.sbss start:0x8025DA70 end:0x8025DA88

Expand Down Expand Up @@ -617,9 +617,6 @@ runtime/global_destructor_chain.c:
runtime/__mem.c:
.init start:0x80004338 end:0x8000446C

metrotrk/mem_TRK.c:
.init start:0x8000446C end:0x800044C0

runtime/code_8015263C.c:
extab start:0x80006688 end:0x800066BC
extabindex start:0x80006C1C end:0x80006C34
Expand All @@ -644,5 +641,85 @@ runtime/Gecko_setjmp.c:
runtime/Gecko_ExceptionPPC.c:
.text start:0x8015389C end:0x80153988

metrotrk/mainloop.c:
.text start:0x80164F94 end:0x8016525C

metrotrk/nubevent.c:
.text start:0x8016525C end:0x801652B4

metrotrk/nubinit.c:
.text start:0x801652B4 end:0x80165438

metrotrk/msg.c:
.text start:0x80165438 end:0x80165464

metrotrk/msgbuf.c:
.text start:0x80165464 end:0x80165CA8

metrotrk/serpoll.c:
.text start:0x80165CA8 end:0x80165E4C

metrotrk/usr_put.c:
.text start:0x80165E4C end:0x80165E50

metrotrk/dispatch.c:
.text start:0x80165E50 end:0x80166020

metrotrk/msghndlr.c:
.text start:0x80166020 end:0x801670FC

metrotrk/support.c:
.text start:0x801670FC end:0x801677B0

metrotrk/mutex_TRK.c:
.text start:0x801677B0 end:0x801677C8

metrotrk/notify.c:
.text start:0x801677C8 end:0x80167860

metrotrk/flush_cache.c:
.text start:0x80167860 end:0x80167898

metrotrk/mem_TRK.c:
.init start:0x8000446C end:0x800044C0
.text start:0x80167898 end:0x80167950

metrotrk/targimpl.c:
.text start:0x80167950 end:0x80169390

metrotrk/targsupp.c:
.text start:0x80169390 end:0x801693B0

metrotrk/mpc_7xx_603e.c:
.text start:0x801693B0 end:0x80169720

metrotrk/mslsupp.c:
.text start:0x80169720 end:0x80169898

metrotrk/dolphin_trk.c:
.init start:0x800063F4 end:0x80006420
.text start:0x80169898 end:0x80169BB4

metrotrk/main_TRK.c:
.text start:0x80169BB4 end:0x80169BF8

metrotrk/dolphin_trk_glue.c:
.text start:0x80169BF8 end:0x8016A0B8

metrotrk/targcont.c:
.text start:0x8016A0B8 end:0x8016A0EC

metrotrk/code_8016A0EC.c:
.text start:0x8016A0EC end:0x8016A108

metrotrk/cc_udp.c:
.text start:0x8016A108 end:0x8016A150

metrotrk/cc_gdev.c:
.text start:0x8016A150 end:0x8016A3C4

metrotrk/CircleBuffer.c:
.text start:0x8016A3C4 end:0x8016A678

metrotrk/MWCriticalSection_gc.cpp:
.text start:0x8016A678 end:0x8016A6D0
102 changes: 51 additions & 51 deletions config/oot-j/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ memset = .init:0x8000443C; // type:function size:0x30 scope:global
TRK_memset = .init:0x8000446C; // type:function size:0x30
TRK_memcpy = .init:0x8000449C; // type:function size:0x24
gTRKInterruptVectorTable = .init:0x800044C0; // type:label scope:global
fn_800063F4 = .init:0x800063F4; // type:function size:0x2C
__TRKreset = .init:0x800063F4; // type:function size:0x2C
gTRKInterruptVectorTableEnd = .init:0x800063F4; // type:label scope:global
_rom_copy_info = .init:0x80006420; // type:object size:0x84 scope:global data:4byte
_bss_init_info = .init:0x800064A4; // type:object size:0x20 scope:global data:4byte
Expand Down Expand Up @@ -4537,27 +4537,27 @@ fn_80164F8C = .text:0x80164F8C; // type:function size:0x4
sqrt = .text:0x80164F90; // type:function size:0x4
TRKNubMainLoop = .text:0x80164F94; // type:function size:0xF8 scope:global
TRKDestructEvent = .text:0x8016508C; // type:function size:0x24 scope:global
fn_801650B0 = .text:0x801650B0; // type:function size:0x18
fn_801650C8 = .text:0x801650C8; // type:function size:0xE0
TRKConstructEvent = .text:0x801650B0; // type:function size:0x18
TRKPostEvent = .text:0x801650C8; // type:function size:0xE0
TRKGetNextEvent = .text:0x801651A8; // type:function size:0xB4 scope:global
TRKInitializeEventQueue = .text:0x8016525C; // type:function size:0x58 scope:global
TRKNubWelcome = .text:0x801652B4; // type:function size:0x28 scope:global
TRKTerminateNub = .text:0x801652DC; // type:function size:0x24 scope:global
TRKInitializeNub = .text:0x80165300; // type:function size:0x138 scope:global
fn_80165438 = .text:0x80165438; // type:function size:0x2C
TRK_MessageSend = .text:0x80165438; // type:function size:0x2C
fn_80165464 = .text:0x80165464; // type:function size:0xF0
fn_80165554 = .text:0x80165554; // type:function size:0x98
TRKReadBuffer_ui8 = .text:0x80165554; // type:function size:0x98
fn_801655EC = .text:0x801655EC; // type:function size:0xE8
fn_801656D4 = .text:0x801656D4; // type:function size:0xFC
fn_801657D0 = .text:0x801657D0; // type:function size:0x68
TRKAppendBuffer_ui8 = .text:0x801657D0; // type:function size:0x68
fn_80165838 = .text:0x80165838; // type:function size:0xFC
fn_80165934 = .text:0x80165934; // type:function size:0x8C
fn_801659C0 = .text:0x801659C0; // type:function size:0xA4
fn_80165A64 = .text:0x80165A64; // type:function size:0x30
TRK_SetBufferPosition = .text:0x80165A64; // type:function size:0x30
fn_80165A94 = .text:0x80165A94; // type:function size:0x40
fn_80165AD4 = .text:0x80165AD4; // type:function size:0x64
TRK_ReleaseBuffer = .text:0x80165AD4; // type:function size:0x64
TRKGetBuffer = .text:0x80165B38; // type:function size:0x2C scope:global
fn_80165B64 = .text:0x80165B64; // type:function size:0xC8
TRK_GetFreeBuffer = .text:0x80165B64; // type:function size:0xC8
TRKInitializeMessageBuffers = .text:0x80165C2C; // type:function size:0x74 scope:global
fn_80165CA0 = .text:0x80165CA0; // type:function size:0x8
TRKInitializeSerialHandler = .text:0x80165CA8; // type:function size:0x24 scope:global
Expand All @@ -4578,27 +4578,27 @@ fn_80166A50 = .text:0x80166A50; // type:function size:0x21C
fn_80166C6C = .text:0x80166C6C; // type:function size:0x248
fn_80166EB4 = .text:0x80166EB4; // type:function size:0x8
fn_80166EBC = .text:0x80166EBC; // type:function size:0x8
fn_80166EC4 = .text:0x80166EC4; // type:function size:0x7C
fn_80166F40 = .text:0x80166F40; // type:function size:0x7C
fn_80166FBC = .text:0x80166FBC; // type:function size:0x9C
fn_80167058 = .text:0x80167058; // type:function size:0x88
fn_801670E0 = .text:0x801670E0; // type:function size:0xC
fn_801670EC = .text:0x801670EC; // type:function size:0x10
fn_801670FC = .text:0x801670FC; // type:function size:0x110
fn_8016720C = .text:0x8016720C; // type:function size:0xE8
fn_801672F4 = .text:0x801672F4; // type:function size:0x11C
fn_80167410 = .text:0x80167410; // type:function size:0x180
fn_80167590 = .text:0x80167590; // type:function size:0x220
fn_801677B0 = .text:0x801677B0; // type:function size:0x8
fn_801677B8 = .text:0x801677B8; // type:function size:0x8
fn_801677C0 = .text:0x801677C0; // type:function size:0x8
fn_801677C8 = .text:0x801677C8; // type:function size:0x98
fn_80167860 = .text:0x80167860; // type:function size:0x38
TRKDoOverride = .text:0x80166EC4; // type:function size:0x7C
TRKDoReset = .text:0x80166F40; // type:function size:0x7C
TRKDoDisconnect = .text:0x80166FBC; // type:function size:0x9C
TRKStandardACK = .text:0x80167058; // type:function size:0x88
SetTRKConnected = .text:0x801670E0; // type:function size:0xC
GetTRKConnected = .text:0x801670EC; // type:function size:0x10
HandlePositionFileSupportRequest = .text:0x801670FC; // type:function size:0x110
HandleCloseFileSupportRequest = .text:0x8016720C; // type:function size:0xE8
HandleOpenFileSupportRequest = .text:0x801672F4; // type:function size:0x11C
TRK_RequestSend = .text:0x80167410; // type:function size:0x180
TRK_SuppAccessFile = .text:0x80167590; // type:function size:0x220
TRKInitializeMutex = .text:0x801677B0; // type:function size:0x8
TRKAcquireMutex = .text:0x801677B8; // type:function size:0x8
TRKReleaseMutex = .text:0x801677C0; // type:function size:0x8
TRKDoNotifyStopped = .text:0x801677C8; // type:function size:0x98
TRK_flush_cache = .text:0x80167860; // type:function size:0x38
TRK_fill_mem = .text:0x80167898; // type:function size:0xB8
fn_80167950 = .text:0x80167950; // type:function size:0x1C
fn_8016796C = .text:0x8016796C; // type:function size:0x8
fn_80167974 = .text:0x80167974; // type:function size:0x8
fn_8016797C = .text:0x8016797C; // type:function size:0x3C
__TRK_get_MSR = .text:0x8016796C; // type:function size:0x8
__TRK_set_MSR = .text:0x80167974; // type:function size:0x8
TRK_ppc_memcpy = .text:0x8016797C; // type:function size:0x3C
TRKInterruptHandler = .text:0x801679B8; // type:function size:0x194 scope:global
TRKExceptionHandler = .text:0x80167B4C; // type:function size:0x9C scope:global
TRKSwapAndGo = .text:0x80167BE8; // type:function size:0xC4 scope:global
Expand All @@ -4613,30 +4613,30 @@ TRKTargetSupportRequest = .text:0x80167D90; // type:function size:0x200 scope:gl
fn_80167F90 = .text:0x80167F90; // type:function size:0x10
fn_80167FA0 = .text:0x80167FA0; // type:function size:0x7C
fn_8016801C = .text:0x8016801C; // type:function size:0x6C
fn_80168088 = .text:0x80168088; // type:function size:0x84
TRKTargetAddExceptionInfo = .text:0x80168088; // type:function size:0x84
fn_8016810C = .text:0x8016810C; // type:function size:0x8C
TRKTargetInterrupt = .text:0x80168198; // type:function size:0x15C scope:global
TRKPostInterruptEvent = .text:0x801682F4; // type:function size:0xAC scope:global
fn_801683A0 = .text:0x801683A0; // type:function size:0x438
fn_801687D8 = .text:0x801687D8; // type:function size:0x170
fn_80168948 = .text:0x80168948; // type:function size:0x50C
fn_80168E54 = .text:0x80168E54; // type:function size:0xF4
fn_80168F48 = .text:0x80168F48; // type:function size:0x4C
fn_80168F94 = .text:0x80168F94; // type:function size:0x14C
fn_801690E0 = .text:0x801690E0; // type:function size:0x2A4
fn_80169390 = .text:0x80169390; // type:function size:0x8
fn_80169398 = .text:0x80169398; // type:function size:0x8
fn_801693A0 = .text:0x801693A0; // type:function size:0x8
fn_801693A8 = .text:0x801693A8; // type:function size:0x8
TRKTargetReadInstruction = .text:0x80168F48; // type:function size:0x4C
TRKTargetAccessMemory = .text:0x80168F94; // type:function size:0x14C
TRKValidMemory32 = .text:0x801690E0; // type:function size:0x2A4
TRKAccessFile = .text:0x80169390; // type:function size:0x8
TRKOpenFile = .text:0x80169398; // type:function size:0x8
TRKCloseFile = .text:0x801693A0; // type:function size:0x8
TRKPositionFile = .text:0x801693A8; // type:function size:0x8
TRKSaveExtended1Block = .text:0x801693B0; // type:function size:0x1B8 scope:global
TRKRestoreExtended1Block = .text:0x80169568; // type:function size:0x1B8 scope:global
fn_80169720 = .text:0x80169720; // type:function size:0xBC
fn_801697DC = .text:0x801697DC; // type:function size:0xBC
__TRK_write_console = .text:0x80169720; // type:function size:0xBC
__read_console = .text:0x801697DC; // type:function size:0xBC
InitMetroTRK = .text:0x80169898; // type:function size:0x94 scope:global
InitMetroTRK_BBA = .text:0x80169930; // type:function size:0x94 scope:global
TRKInitializeTarget = .text:0x801699C4; // type:function size:0x4C scope:global
fn_80169A10 = .text:0x80169A10; // type:function size:0x12C
fn_80169B3C = .text:0x80169B3C; // type:function size:0x58
__TRK_copy_vectors = .text:0x80169A10; // type:function size:0x12C
TRKTargetTranslate = .text:0x80169B3C; // type:function size:0x58
EnableMetroTRKInterrupts = .text:0x80169B94; // type:function size:0x20 scope:global
TRK_main = .text:0x80169BB4; // type:function size:0x44 scope:global
TRKLoadContext = .text:0x80169BF8; // type:function size:0x88 scope:global
Expand All @@ -4645,10 +4645,10 @@ InitializeProgramEndTrap = .text:0x80169C84; // type:function size:0x58 scope:gl
TRK_board_display = .text:0x80169CDC; // type:function size:0x30 scope:global
UnreserveEXI2Port = .text:0x80169D0C; // type:function size:0x30 scope:global
ReserveEXI2Port = .text:0x80169D3C; // type:function size:0x30 scope:global
fn_80169D6C = .text:0x80169D6C; // type:function size:0x3C
fn_80169DA8 = .text:0x80169DA8; // type:function size:0x3C
fn_80169DE4 = .text:0x80169DE4; // type:function size:0x30
fn_80169E14 = .text:0x80169E14; // type:function size:0x48
TRK_WriteUARTN = .text:0x80169D6C; // type:function size:0x3C
TRKReadUARTN = .text:0x80169DA8; // type:function size:0x3C
TRKPollUART = .text:0x80169DE4; // type:function size:0x30
EnableEXI2Interrupts = .text:0x80169E14; // type:function size:0x48
TRKInitializeIntDrivenUART = .text:0x80169E5C; // type:function size:0x50 scope:global
InitMetroTRKCommTable = .text:0x80169EAC; // type:function size:0x1D4 scope:global
TRKEXICallBack = .text:0x8016A080; // type:function size:0x38 scope:global
Expand All @@ -4675,13 +4675,13 @@ gdev_cc_open = .text:0x8016A35C; // type:function size:0x24 scope:global
gdev_cc_shutdown = .text:0x8016A380; // type:function size:0x8 scope:global
gdev_cc_initialize = .text:0x8016A388; // type:function size:0x3C scope:global
fn_8016A3C4 = .text:0x8016A3C4; // type:function size:0x4C
fn_8016A410 = .text:0x8016A410; // type:function size:0x108
fn_8016A518 = .text:0x8016A518; // type:function size:0x108
fn_8016A620 = .text:0x8016A620; // type:function size:0x50
fn_8016A670 = .text:0x8016A670; // type:function size:0x8
fn_8016A678 = .text:0x8016A678; // type:function size:0x24
fn_8016A69C = .text:0x8016A69C; // type:function size:0x30
fn_8016A6CC = .text:0x8016A6CC; // type:function size:0x4
CircleBufferReadBytes = .text:0x8016A410; // type:function size:0x108
CircleBufferWriteBytes = .text:0x8016A518; // type:function size:0x108
CircleBufferInitialize = .text:0x8016A620; // type:function size:0x50
CBGetBytesAvailableForRead = .text:0x8016A670; // type:function size:0x8
MWExitCriticalSection = .text:0x8016A678; // type:function size:0x24
MWEnterCriticalSection = .text:0x8016A69C; // type:function size:0x30
MWInitializeCriticalSection = .text:0x8016A6CC; // type:function size:0x4
_ctors = .ctors:0x8016A6E0; // type:label scope:global data:4byte
__init_cpp_exceptions_reference = .ctors:0x8016A6E0; // type:object size:0x4 scope:global align:32
_dtors = .dtors:0x8016A740; // type:label scope:global data:4byte
Expand Down
29 changes: 27 additions & 2 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,33 @@ def LinkedFor(*versions):
MetroTRKLib(
"metrotrk",
[
Object(LinkedFor("oot-j"), "metrotrk/mem_TRK.c"),
Object(LinkedFor("oot-j"), "metrotrk/dolphin_trk.c"),
Object(NotLinked, "metrotrk/mainloop.c"),
Object(NotLinked, "metrotrk/nubevent.c"),
Object(NotLinked, "metrotrk/nubinit.c"),
Object(NotLinked, "metrotrk/msg.c"),
Object(NotLinked, "metrotrk/msgbuf.c"),
Object(NotLinked, "metrotrk/serpoll.c"),
Object(NotLinked, "metrotrk/usr_put.c"),
Object(NotLinked, "metrotrk/dispatch.c"),
Object(NotLinked, "metrotrk/msghndlr.c"),
Object(NotLinked, "metrotrk/support.c"),
Object(NotLinked, "metrotrk/mutex_TRK.c"),
Object(NotLinked, "metrotrk/notify.c"),
Object(NotLinked, "metrotrk/flush_cache.c"),
Object(NotLinked, "metrotrk/mem_TRK.c"),
Object(NotLinked, "metrotrk/targimpl.c"),
Object(NotLinked, "metrotrk/targsupp.c"),
Object(NotLinked, "metrotrk/mpc_7xx_603e.c"),
Object(NotLinked, "metrotrk/mslsupp.c"),
Object(NotLinked, "metrotrk/dolphin_trk.c"),
Object(NotLinked, "metrotrk/main_TRK.c"),
Object(NotLinked, "metrotrk/dolphin_trk_glue.c"),
Object(NotLinked, "metrotrk/targcont.c"),
Object(NotLinked, "metrotrk/code_8016A0EC.c"),
Object(NotLinked, "metrotrk/cc_udp.c"),
Object(NotLinked, "metrotrk/cc_gdev.c"),
Object(NotLinked, "metrotrk/CircleBuffer.c"),
Object(NotLinked, "metrotrk/MWCriticalSection_gc.cpp"),
]
)
]
Expand Down