Skip to content

Commit

Permalink
Match all 8-byte functions (#1464)
Browse files Browse the repository at this point in the history
Except for `GetR2_80322F20` (see #1181).
  • Loading branch information
ribbanya authored Sep 24, 2024
1 parent 5012fbe commit 82c86ff
Show file tree
Hide file tree
Showing 251 changed files with 7,325 additions and 972 deletions.
4 changes: 2 additions & 2 deletions config/GALE01/splits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3049,7 +3049,7 @@ melee/it/items/itmetamon.c:
melee/it/items/itpippi.c:
.text start:0x802D3260 end:0x802D36B0
.data start:0x803F7FF8 end:0x803F8058
.sdata2 start:0x804DD4A8 end:0x804DD4B0
.sdata2 start:0x804DD4A8 end:0x804DD4AC

melee/it/items/ittogepy.c:
.text start:0x802D36B0 end:0x802D3B18
Expand Down Expand Up @@ -3105,7 +3105,7 @@ melee/it/items/itoldkuri.c:
melee/it/items/itmato.c:
.text start:0x802D84F8 end:0x802D8618
.data start:0x803F83E0 end:0x803F83F0
.sdata2 start:0x804DD5B0 end:0x804DD5B8
.sdata2 start:0x804DD5B0 end:0x804DD5B4

melee/it/items/itheiho.c:
.text start:0x802D8618 end:0x802D9A2C
Expand Down
4 changes: 2 additions & 2 deletions config/GALE01/symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32600,7 +32600,7 @@ it_804DD498 = .sdata2:0x804DD498; // type:object size:0x4 scope:global data:floa
it_804DD49C = .sdata2:0x804DD49C; // type:object size:0x4 scope:global data:float
it_804DD4A0 = .sdata2:0x804DD4A0; // type:object size:0x4 scope:global data:float
it_804DD4A4 = .sdata2:0x804DD4A4; // type:object size:0x4 scope:global data:float
@176 = .sdata2:0x804DD4A8; // type:object size:0x4 scope:local data:float
@179 = .sdata2:0x804DD4A8; // type:object size:0x4 scope:local data:float
@176 = .sdata2:0x804DD4B0; // type:object size:0x4 scope:local data:float
@175 = .sdata2:0x804DD4B8; // type:object size:0x4 scope:local data:float
@182 = .sdata2:0x804DD4BC; // type:object size:0x4 scope:local data:float
Expand Down Expand Up @@ -32643,7 +32643,7 @@ it_804DD594 = .sdata2:0x804DD594; // type:object size:0x4 scope:global data:floa
it_804DD598 = .sdata2:0x804DD598; // type:object size:0x8 scope:global data:double
it_804DD5A0 = .sdata2:0x804DD5A0; // type:object size:0x4 scope:global data:float
it_804DD5A8 = .sdata2:0x804DD5A8; // type:object size:0x8 scope:global data:double
@177 = .sdata2:0x804DD5B0; // type:object size:0x4 scope:local data:float
@180 = .sdata2:0x804DD5B0; // type:object size:0x4 scope:local data:float
it_804DD5B8 = .sdata2:0x804DD5B8; // type:object size:0x4 scope:global data:float
it_804DD5BC = .sdata2:0x804DD5BC; // type:object size:0x4 scope:global data:float
it_804DD5C0 = .sdata2:0x804DD5C0; // type:object size:0x4 scope:global data:float
Expand Down
40 changes: 20 additions & 20 deletions extern/dolphin/src/dolphin/ax/__ax.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@
#include <dolphin/ax.h>

// AXAlloc.c
AXVPB * __AXGetStackHead(u32 priority);
AXVPB* __AXGetStackHead(u32 priority);
void __AXServiceCallbackStack(void);
void __AXInitVoiceStacks(void);
void __AXAllocInit(void);
void __AXAllocQuit(void);
void __AXPushFreeStack(AXVPB * p);
AXVPB * __AXPopFreeStack(void);
void __AXPushCallbackStack(AXVPB * p);
AXVPB * __AXPopCallbackStack(void);
void __AXRemoveFromStack(AXVPB * p);
void __AXPushStackHead(AXVPB * p, u32 priority);
AXVPB * __AXPopStackFromBottom(u32 priority);
void __AXPushFreeStack(AXVPB* p);
AXVPB* __AXPopFreeStack(void);
void __AXPushCallbackStack(AXVPB* p);
AXVPB* __AXPopCallbackStack(void);
void __AXRemoveFromStack(AXVPB* p);
void __AXPushStackHead(AXVPB* p, u32 priority);
AXVPB* __AXPopStackFromBottom(u32 priority);

// AXAux.c
void __AXAuxInit(void);
void __AXAuxQuit(void);
void __AXGetAuxAInput(u32 * p);
void __AXGetAuxAOutput(u32 * p);
void __AXGetAuxBInput(u32 * p);
void __AXGetAuxBOutput(u32 * p);
void __AXGetAuxAInput(u32* p);
void __AXGetAuxAOutput(u32* p);
void __AXGetAuxBInput(u32* p);
void __AXGetAuxBOutput(u32* p);
void __AXProcessAux(void);

// AXCL.c
Expand All @@ -32,7 +32,7 @@ extern u32 __AXClMode;
u32 __AXGetCommandListCycles(void);
u32 __AXGetCommandListAddress(void);
void __AXWriteToCommandList(u16 data);
void __AXNextFrame(void * sbuffer, void * buffer);
void __AXNextFrame(void* sbuffer, void* buffer);
void __AXClInit(void);
void __AXClQuit(void);

Expand All @@ -44,23 +44,23 @@ void __AXOutInit(void);
void __AXOutQuit(void);

// AXProf.c
AXPROFILE * __AXGetCurrentProfile(void);
AXPROFILE* __AXGetCurrentProfile(void);

// AXSPB.c
u32 __AXGetStudio(void);
void __AXDepopFade(long * hostSum, long * dspVolume, s16 * dspDelta);
void __AXDepopFade(long* hostSum, long* dspVolume, s16* dspDelta);
void __AXPrintStudio(void);
void __AXSPBInit(void);
void __AXSPBQuit(void);
void __AXDepopVoice(AXPB * p);
void __AXDepopVoice(AXPB* p);

// AXVPB.c
u32 __AXGetNumVoices(void);
void __AXServiceVPB(AXVPB *pvpb);
void __AXDumpVPB(AXVPB * pvpb);
void __AXServiceVPB(AXVPB* pvpb);
void __AXDumpVPB(AXVPB* pvpb);
void __AXSyncPBs(u32 lessDspCycles);
AXPB * __AXGetPBs(void);
void __AXSetPBDefault(AXVPB * p);
AXPB* __AXGetPBs(void);
void __AXSetPBDefault(AXVPB* p);
void __AXVPBInit(void);
void __AXVPBQuit(void);

Expand Down
11 changes: 11 additions & 0 deletions src/MetroTRK/mpc_7xx_603e.c
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
#include "mpc_7xx_603e.h"

static int const target_cpu_minor_type = 84;

/// #TRKSaveExtended1Block

/// #TRKRestoreExtended1Block

int TRKTargetCPUMinorType(void)
{
return target_cpu_minor_type;
}
9 changes: 9 additions & 0 deletions src/MetroTRK/mpc_7xx_603e.h
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
#ifndef GALE01_32A868
#define GALE01_32A868

#include <placeholder.h>

/* 32A868 */ UNK_RET TRKSaveExtended1Block(UNK_PARAMS);
/* 32AA20 */ UNK_RET TRKRestoreExtended1Block(UNK_PARAMS);
/* 32ABD8 */ int TRKTargetCPUMinorType(void);

#endif
43 changes: 43 additions & 0 deletions src/MetroTRK/msgbuf.c
Original file line number Diff line number Diff line change
@@ -1 +1,44 @@
#include "msgbuf.h"

void TRKSetBufferUsed(UNK_T arg0, int arg1)
{
M2C_FIELD(arg0, int*, 4) = arg1;
}

/// #TRKInitializeMessageBuffers

/// #TRKGetFreeBuffer

/// #TRKGetBuffer

/// #TRKReleaseBuffer

/// #TRKResetBuffer

/// #TRKSetBufferPosition

/// #TRKAppendBuffer

/// #TRKReadBuffer

/// #TRKAppendBuffer1_ui16

/// #TRKAppendBuffer1_ui32

/// #TRKAppendBuffer1_ui64

/// #TRKAppendBuffer_ui8

/// #TRKAppendBuffer_ui32

/// #TRKReadBuffer1_ui8

/// #TRKReadBuffer1_ui16

/// #TRKReadBuffer1_ui32

/// #TRKReadBuffer1_ui64

/// #TRKReadBuffer_ui8

/// #TRKReadBuffer_ui32
26 changes: 26 additions & 0 deletions src/MetroTRK/msgbuf.h
Original file line number Diff line number Diff line change
@@ -1 +1,27 @@
#ifndef GALE01_326C94
#define GALE01_326C94

#include <placeholder.h>

/* 326C94 */ void TRKSetBufferUsed(UNK_T arg0, int arg1);
/* 326C9C */ UNK_RET TRKInitializeMessageBuffers(UNK_PARAMS);
/* 326D14 */ UNK_RET TRKGetFreeBuffer(UNK_PARAMS);
/* 326DB0 */ UNK_RET TRKGetBuffer(UNK_PARAMS);
/* 326DDC */ UNK_RET TRKReleaseBuffer(UNK_PARAMS);
/* 326E44 */ UNK_RET TRKResetBuffer(UNK_PARAMS);
/* 326E84 */ UNK_RET TRKSetBufferPosition(UNK_PARAMS);
/* 326EB4 */ UNK_RET TRKAppendBuffer(UNK_PARAMS);
/* 326F58 */ UNK_RET TRKReadBuffer(UNK_PARAMS);
/* 326FE4 */ UNK_RET TRKAppendBuffer1_ui16(UNK_PARAMS);
/* 327038 */ UNK_RET TRKAppendBuffer1_ui32(UNK_PARAMS);
/* 32709C */ UNK_RET TRKAppendBuffer1_ui64(UNK_PARAMS);
/* 327124 */ UNK_RET TRKAppendBuffer_ui8(UNK_PARAMS);
/* 32718C */ UNK_RET TRKAppendBuffer_ui32(UNK_PARAMS);
/* 327208 */ UNK_RET TRKReadBuffer1_ui8(UNK_PARAMS);
/* 32722C */ UNK_RET TRKReadBuffer1_ui16(UNK_PARAMS);
/* 3272AC */ UNK_RET TRKReadBuffer1_ui32(UNK_PARAMS);
/* 32733C */ UNK_RET TRKReadBuffer1_ui64(UNK_PARAMS);
/* 3273EC */ UNK_RET TRKReadBuffer_ui8(UNK_PARAMS);
/* 327460 */ UNK_RET TRKReadBuffer_ui32(UNK_PARAMS);

#endif
57 changes: 57 additions & 0 deletions src/MetroTRK/msghndlr.c
Original file line number Diff line number Diff line change
@@ -1 +1,58 @@
#include "msghndlr.h"

/// #TRKMessageIntoReply

/// #TRKSendACK

/// #TRKStandardACK

/// #MTRK_MsgHndlr_8032785C

/// #MTRK_MsgHndlr_80327884

/// #MTRK_MsgHndlr_803278AC

/// #TRKDoReset

/// #TRKDoVersions

/// #TRKDoSupportMask

/// #TRKDoCPUType

/// #TRKDoReadMemory

/// #TRKDoWriteMemory

/// #TRKDoReadRegisters

/// #TRKDoWriteRegisters

/// #TRKDoFlushCache

/// #TRKDoContinue

/// #TRKDoStep

/// #TRKDoStop

/// #TRKSuppAccessFile

/// #TRKRequestSend

bool TRKInitializeMutex(void)
{
return false;
}

bool TRKAcquireMutex(void)
{
return false;
}

bool TRKReleaseMutex(void)
{
return false;
}

/// #TRKDoNotifyStopped
30 changes: 30 additions & 0 deletions src/MetroTRK/msghndlr.h
Original file line number Diff line number Diff line change
@@ -1 +1,31 @@
#ifndef GALE01_327740
#define GALE01_327740

#include <placeholder.h>

/* 327740 */ UNK_RET TRKMessageIntoReply(UNK_PARAMS);
/* 3277D8 */ UNK_RET TRKSendACK(UNK_PARAMS);
/* 327828 */ UNK_RET TRKStandardACK(UNK_PARAMS);
/* 32785C */ UNK_RET MTRK_MsgHndlr_8032785C(UNK_PARAMS);
/* 327884 */ UNK_RET MTRK_MsgHndlr_80327884(UNK_PARAMS);
/* 3278AC */ UNK_RET MTRK_MsgHndlr_803278AC(UNK_PARAMS);
/* 3278FC */ UNK_RET TRKDoReset(UNK_PARAMS);
/* 32792C */ UNK_RET TRKDoVersions(UNK_PARAMS);
/* 327AB0 */ UNK_RET TRKDoSupportMask(UNK_PARAMS);
/* 327B8C */ UNK_RET TRKDoCPUType(UNK_PARAMS);
/* 327DD0 */ UNK_RET TRKDoReadMemory(UNK_PARAMS);
/* 327FB8 */ UNK_RET TRKDoWriteMemory(UNK_PARAMS);
/* 3281B4 */ UNK_RET TRKDoReadRegisters(UNK_PARAMS);
/* 3283B8 */ UNK_RET TRKDoWriteRegisters(UNK_PARAMS);
/* 3285C0 */ UNK_RET TRKDoFlushCache(UNK_PARAMS);
/* 3286F8 */ UNK_RET TRKDoContinue(UNK_PARAMS);
/* 32875C */ UNK_RET TRKDoStep(UNK_PARAMS);
/* 328960 */ UNK_RET TRKDoStop(UNK_PARAMS);
/* 3289E4 */ UNK_RET TRKSuppAccessFile(UNK_PARAMS);
/* 328CBC */ UNK_RET TRKRequestSend(UNK_PARAMS);
/* 328E60 */ bool TRKInitializeMutex(void);
/* 328E68 */ bool TRKAcquireMutex(void);
/* 328E70 */ bool TRKReleaseMutex(void);
/* 328E78 */ UNK_RET TRKDoNotifyStopped(UNK_PARAMS);

#endif
7 changes: 6 additions & 1 deletion src/MetroTRK/serpoll.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include "serpoll.h"

/// #TRKTestForPacket

/// #TRKGetInput
Expand All @@ -6,6 +8,9 @@

/// #TRKInitializeSerialHandler

/// #TRKTerminateSerialHandler
bool TRKTerminateSerialHandler(void)
{
return false;
}

void usr_put_initialize(void) {}
2 changes: 1 addition & 1 deletion src/MetroTRK/serpoll.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/* 3275AC */ UNK_RET TRKGetInput(UNK_PARAMS);
/* 327628 */ UNK_RET TRKProcessInput(UNK_PARAMS);
/* 327678 */ UNK_RET TRKInitializeSerialHandler(UNK_PARAMS);
/* 32769C */ UNK_RET TRKTerminateSerialHandler(UNK_PARAMS);
/* 32769C */ bool TRKTerminateSerialHandler(void);
/* 3276A4 */ UNK_RET usr_put_initialize(UNK_PARAMS);

#endif
Loading

0 comments on commit 82c86ff

Please sign in to comment.