Skip to content

Commit 41b3047

Browse files
ribbanyaribbanya
committed
Match all 8-byte functions
Except for `GetR2_80322F20` (see #1181).
1 parent 5012fbe commit 41b3047

File tree

251 files changed

+7325
-972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+7325
-972
lines changed

‎config/GALE01/splits.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3049,7 +3049,7 @@ melee/it/items/itmetamon.c:
30493049
melee/it/items/itpippi.c:
30503050
.text start:0x802D3260 end:0x802D36B0
30513051
.data start:0x803F7FF8 end:0x803F8058
3052-
.sdata2 start:0x804DD4A8 end:0x804DD4B0
3052+
.sdata2 start:0x804DD4A8 end:0x804DD4AC
30533053

30543054
melee/it/items/ittogepy.c:
30553055
.text start:0x802D36B0 end:0x802D3B18
@@ -3105,7 +3105,7 @@ melee/it/items/itoldkuri.c:
31053105
melee/it/items/itmato.c:
31063106
.text start:0x802D84F8 end:0x802D8618
31073107
.data start:0x803F83E0 end:0x803F83F0
3108-
.sdata2 start:0x804DD5B0 end:0x804DD5B8
3108+
.sdata2 start:0x804DD5B0 end:0x804DD5B4
31093109

31103110
melee/it/items/itheiho.c:
31113111
.text start:0x802D8618 end:0x802D9A2C

‎config/GALE01/symbols.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32600,7 +32600,7 @@ it_804DD498 = .sdata2:0x804DD498; // type:object size:0x4 scope:global data:floa
3260032600
it_804DD49C = .sdata2:0x804DD49C; // type:object size:0x4 scope:global data:float
3260132601
it_804DD4A0 = .sdata2:0x804DD4A0; // type:object size:0x4 scope:global data:float
3260232602
it_804DD4A4 = .sdata2:0x804DD4A4; // type:object size:0x4 scope:global data:float
32603-
@176 = .sdata2:0x804DD4A8; // type:object size:0x4 scope:local data:float
32603+
@179 = .sdata2:0x804DD4A8; // type:object size:0x4 scope:local data:float
3260432604
@176 = .sdata2:0x804DD4B0; // type:object size:0x4 scope:local data:float
3260532605
@175 = .sdata2:0x804DD4B8; // type:object size:0x4 scope:local data:float
3260632606
@182 = .sdata2:0x804DD4BC; // type:object size:0x4 scope:local data:float
@@ -32643,7 +32643,7 @@ it_804DD594 = .sdata2:0x804DD594; // type:object size:0x4 scope:global data:floa
3264332643
it_804DD598 = .sdata2:0x804DD598; // type:object size:0x8 scope:global data:double
3264432644
it_804DD5A0 = .sdata2:0x804DD5A0; // type:object size:0x4 scope:global data:float
3264532645
it_804DD5A8 = .sdata2:0x804DD5A8; // type:object size:0x8 scope:global data:double
32646-
@177 = .sdata2:0x804DD5B0; // type:object size:0x4 scope:local data:float
32646+
@180 = .sdata2:0x804DD5B0; // type:object size:0x4 scope:local data:float
3264732647
it_804DD5B8 = .sdata2:0x804DD5B8; // type:object size:0x4 scope:global data:float
3264832648
it_804DD5BC = .sdata2:0x804DD5BC; // type:object size:0x4 scope:global data:float
3264932649
it_804DD5C0 = .sdata2:0x804DD5C0; // type:object size:0x4 scope:global data:float

‎extern/dolphin/src/dolphin/ax/__ax.h

+20-20
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
#include <dolphin/ax.h>
55

66
// AXAlloc.c
7-
AXVPB * __AXGetStackHead(u32 priority);
7+
AXVPB* __AXGetStackHead(u32 priority);
88
void __AXServiceCallbackStack(void);
99
void __AXInitVoiceStacks(void);
1010
void __AXAllocInit(void);
1111
void __AXAllocQuit(void);
12-
void __AXPushFreeStack(AXVPB * p);
13-
AXVPB * __AXPopFreeStack(void);
14-
void __AXPushCallbackStack(AXVPB * p);
15-
AXVPB * __AXPopCallbackStack(void);
16-
void __AXRemoveFromStack(AXVPB * p);
17-
void __AXPushStackHead(AXVPB * p, u32 priority);
18-
AXVPB * __AXPopStackFromBottom(u32 priority);
12+
void __AXPushFreeStack(AXVPB* p);
13+
AXVPB* __AXPopFreeStack(void);
14+
void __AXPushCallbackStack(AXVPB* p);
15+
AXVPB* __AXPopCallbackStack(void);
16+
void __AXRemoveFromStack(AXVPB* p);
17+
void __AXPushStackHead(AXVPB* p, u32 priority);
18+
AXVPB* __AXPopStackFromBottom(u32 priority);
1919

2020
// AXAux.c
2121
void __AXAuxInit(void);
2222
void __AXAuxQuit(void);
23-
void __AXGetAuxAInput(u32 * p);
24-
void __AXGetAuxAOutput(u32 * p);
25-
void __AXGetAuxBInput(u32 * p);
26-
void __AXGetAuxBOutput(u32 * p);
23+
void __AXGetAuxAInput(u32* p);
24+
void __AXGetAuxAOutput(u32* p);
25+
void __AXGetAuxBInput(u32* p);
26+
void __AXGetAuxBOutput(u32* p);
2727
void __AXProcessAux(void);
2828

2929
// AXCL.c
@@ -32,7 +32,7 @@ extern u32 __AXClMode;
3232
u32 __AXGetCommandListCycles(void);
3333
u32 __AXGetCommandListAddress(void);
3434
void __AXWriteToCommandList(u16 data);
35-
void __AXNextFrame(void * sbuffer, void * buffer);
35+
void __AXNextFrame(void* sbuffer, void* buffer);
3636
void __AXClInit(void);
3737
void __AXClQuit(void);
3838

@@ -44,23 +44,23 @@ void __AXOutInit(void);
4444
void __AXOutQuit(void);
4545

4646
// AXProf.c
47-
AXPROFILE * __AXGetCurrentProfile(void);
47+
AXPROFILE* __AXGetCurrentProfile(void);
4848

4949
// AXSPB.c
5050
u32 __AXGetStudio(void);
51-
void __AXDepopFade(long * hostSum, long * dspVolume, s16 * dspDelta);
51+
void __AXDepopFade(long* hostSum, long* dspVolume, s16* dspDelta);
5252
void __AXPrintStudio(void);
5353
void __AXSPBInit(void);
5454
void __AXSPBQuit(void);
55-
void __AXDepopVoice(AXPB * p);
55+
void __AXDepopVoice(AXPB* p);
5656

5757
// AXVPB.c
5858
u32 __AXGetNumVoices(void);
59-
void __AXServiceVPB(AXVPB *pvpb);
60-
void __AXDumpVPB(AXVPB * pvpb);
59+
void __AXServiceVPB(AXVPB* pvpb);
60+
void __AXDumpVPB(AXVPB* pvpb);
6161
void __AXSyncPBs(u32 lessDspCycles);
62-
AXPB * __AXGetPBs(void);
63-
void __AXSetPBDefault(AXVPB * p);
62+
AXPB* __AXGetPBs(void);
63+
void __AXSetPBDefault(AXVPB* p);
6464
void __AXVPBInit(void);
6565
void __AXVPBQuit(void);
6666

‎src/MetroTRK/mpc_7xx_603e.c

+11
Original file line numberDiff line numberDiff line change
@@ -1 +1,12 @@
1+
#include "mpc_7xx_603e.h"
12

3+
static int const target_cpu_minor_type = 84;
4+
5+
/// #TRKSaveExtended1Block
6+
7+
/// #TRKRestoreExtended1Block
8+
9+
int TRKTargetCPUMinorType(void)
10+
{
11+
return target_cpu_minor_type;
12+
}

‎src/MetroTRK/mpc_7xx_603e.h

+9
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1+
#ifndef GALE01_32A868
2+
#define GALE01_32A868
13

4+
#include <placeholder.h>
5+
6+
/* 32A868 */ UNK_RET TRKSaveExtended1Block(UNK_PARAMS);
7+
/* 32AA20 */ UNK_RET TRKRestoreExtended1Block(UNK_PARAMS);
8+
/* 32ABD8 */ int TRKTargetCPUMinorType(void);
9+
10+
#endif

‎src/MetroTRK/msgbuf.c

+43
Original file line numberDiff line numberDiff line change
@@ -1 +1,44 @@
1+
#include "msgbuf.h"
12

3+
void TRKSetBufferUsed(UNK_T arg0, int arg1)
4+
{
5+
M2C_FIELD(arg0, int*, 4) = arg1;
6+
}
7+
8+
/// #TRKInitializeMessageBuffers
9+
10+
/// #TRKGetFreeBuffer
11+
12+
/// #TRKGetBuffer
13+
14+
/// #TRKReleaseBuffer
15+
16+
/// #TRKResetBuffer
17+
18+
/// #TRKSetBufferPosition
19+
20+
/// #TRKAppendBuffer
21+
22+
/// #TRKReadBuffer
23+
24+
/// #TRKAppendBuffer1_ui16
25+
26+
/// #TRKAppendBuffer1_ui32
27+
28+
/// #TRKAppendBuffer1_ui64
29+
30+
/// #TRKAppendBuffer_ui8
31+
32+
/// #TRKAppendBuffer_ui32
33+
34+
/// #TRKReadBuffer1_ui8
35+
36+
/// #TRKReadBuffer1_ui16
37+
38+
/// #TRKReadBuffer1_ui32
39+
40+
/// #TRKReadBuffer1_ui64
41+
42+
/// #TRKReadBuffer_ui8
43+
44+
/// #TRKReadBuffer_ui32

‎src/MetroTRK/msgbuf.h

+26
Original file line numberDiff line numberDiff line change
@@ -1 +1,27 @@
1+
#ifndef GALE01_326C94
2+
#define GALE01_326C94
13

4+
#include <placeholder.h>
5+
6+
/* 326C94 */ void TRKSetBufferUsed(UNK_T arg0, int arg1);
7+
/* 326C9C */ UNK_RET TRKInitializeMessageBuffers(UNK_PARAMS);
8+
/* 326D14 */ UNK_RET TRKGetFreeBuffer(UNK_PARAMS);
9+
/* 326DB0 */ UNK_RET TRKGetBuffer(UNK_PARAMS);
10+
/* 326DDC */ UNK_RET TRKReleaseBuffer(UNK_PARAMS);
11+
/* 326E44 */ UNK_RET TRKResetBuffer(UNK_PARAMS);
12+
/* 326E84 */ UNK_RET TRKSetBufferPosition(UNK_PARAMS);
13+
/* 326EB4 */ UNK_RET TRKAppendBuffer(UNK_PARAMS);
14+
/* 326F58 */ UNK_RET TRKReadBuffer(UNK_PARAMS);
15+
/* 326FE4 */ UNK_RET TRKAppendBuffer1_ui16(UNK_PARAMS);
16+
/* 327038 */ UNK_RET TRKAppendBuffer1_ui32(UNK_PARAMS);
17+
/* 32709C */ UNK_RET TRKAppendBuffer1_ui64(UNK_PARAMS);
18+
/* 327124 */ UNK_RET TRKAppendBuffer_ui8(UNK_PARAMS);
19+
/* 32718C */ UNK_RET TRKAppendBuffer_ui32(UNK_PARAMS);
20+
/* 327208 */ UNK_RET TRKReadBuffer1_ui8(UNK_PARAMS);
21+
/* 32722C */ UNK_RET TRKReadBuffer1_ui16(UNK_PARAMS);
22+
/* 3272AC */ UNK_RET TRKReadBuffer1_ui32(UNK_PARAMS);
23+
/* 32733C */ UNK_RET TRKReadBuffer1_ui64(UNK_PARAMS);
24+
/* 3273EC */ UNK_RET TRKReadBuffer_ui8(UNK_PARAMS);
25+
/* 327460 */ UNK_RET TRKReadBuffer_ui32(UNK_PARAMS);
26+
27+
#endif

‎src/MetroTRK/msghndlr.c

+57
Original file line numberDiff line numberDiff line change
@@ -1 +1,58 @@
1+
#include "msghndlr.h"
12

3+
/// #TRKMessageIntoReply
4+
5+
/// #TRKSendACK
6+
7+
/// #TRKStandardACK
8+
9+
/// #MTRK_MsgHndlr_8032785C
10+
11+
/// #MTRK_MsgHndlr_80327884
12+
13+
/// #MTRK_MsgHndlr_803278AC
14+
15+
/// #TRKDoReset
16+
17+
/// #TRKDoVersions
18+
19+
/// #TRKDoSupportMask
20+
21+
/// #TRKDoCPUType
22+
23+
/// #TRKDoReadMemory
24+
25+
/// #TRKDoWriteMemory
26+
27+
/// #TRKDoReadRegisters
28+
29+
/// #TRKDoWriteRegisters
30+
31+
/// #TRKDoFlushCache
32+
33+
/// #TRKDoContinue
34+
35+
/// #TRKDoStep
36+
37+
/// #TRKDoStop
38+
39+
/// #TRKSuppAccessFile
40+
41+
/// #TRKRequestSend
42+
43+
bool TRKInitializeMutex(void)
44+
{
45+
return false;
46+
}
47+
48+
bool TRKAcquireMutex(void)
49+
{
50+
return false;
51+
}
52+
53+
bool TRKReleaseMutex(void)
54+
{
55+
return false;
56+
}
57+
58+
/// #TRKDoNotifyStopped

‎src/MetroTRK/msghndlr.h

+30
Original file line numberDiff line numberDiff line change
@@ -1 +1,31 @@
1+
#ifndef GALE01_327740
2+
#define GALE01_327740
13

4+
#include <placeholder.h>
5+
6+
/* 327740 */ UNK_RET TRKMessageIntoReply(UNK_PARAMS);
7+
/* 3277D8 */ UNK_RET TRKSendACK(UNK_PARAMS);
8+
/* 327828 */ UNK_RET TRKStandardACK(UNK_PARAMS);
9+
/* 32785C */ UNK_RET MTRK_MsgHndlr_8032785C(UNK_PARAMS);
10+
/* 327884 */ UNK_RET MTRK_MsgHndlr_80327884(UNK_PARAMS);
11+
/* 3278AC */ UNK_RET MTRK_MsgHndlr_803278AC(UNK_PARAMS);
12+
/* 3278FC */ UNK_RET TRKDoReset(UNK_PARAMS);
13+
/* 32792C */ UNK_RET TRKDoVersions(UNK_PARAMS);
14+
/* 327AB0 */ UNK_RET TRKDoSupportMask(UNK_PARAMS);
15+
/* 327B8C */ UNK_RET TRKDoCPUType(UNK_PARAMS);
16+
/* 327DD0 */ UNK_RET TRKDoReadMemory(UNK_PARAMS);
17+
/* 327FB8 */ UNK_RET TRKDoWriteMemory(UNK_PARAMS);
18+
/* 3281B4 */ UNK_RET TRKDoReadRegisters(UNK_PARAMS);
19+
/* 3283B8 */ UNK_RET TRKDoWriteRegisters(UNK_PARAMS);
20+
/* 3285C0 */ UNK_RET TRKDoFlushCache(UNK_PARAMS);
21+
/* 3286F8 */ UNK_RET TRKDoContinue(UNK_PARAMS);
22+
/* 32875C */ UNK_RET TRKDoStep(UNK_PARAMS);
23+
/* 328960 */ UNK_RET TRKDoStop(UNK_PARAMS);
24+
/* 3289E4 */ UNK_RET TRKSuppAccessFile(UNK_PARAMS);
25+
/* 328CBC */ UNK_RET TRKRequestSend(UNK_PARAMS);
26+
/* 328E60 */ bool TRKInitializeMutex(void);
27+
/* 328E68 */ bool TRKAcquireMutex(void);
28+
/* 328E70 */ bool TRKReleaseMutex(void);
29+
/* 328E78 */ UNK_RET TRKDoNotifyStopped(UNK_PARAMS);
30+
31+
#endif

‎src/MetroTRK/serpoll.c

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#include "serpoll.h"
2+
13
/// #TRKTestForPacket
24

35
/// #TRKGetInput
@@ -6,6 +8,9 @@
68

79
/// #TRKInitializeSerialHandler
810

9-
/// #TRKTerminateSerialHandler
11+
bool TRKTerminateSerialHandler(void)
12+
{
13+
return false;
14+
}
1015

1116
void usr_put_initialize(void) {}

‎src/MetroTRK/serpoll.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/* 3275AC */ UNK_RET TRKGetInput(UNK_PARAMS);
88
/* 327628 */ UNK_RET TRKProcessInput(UNK_PARAMS);
99
/* 327678 */ UNK_RET TRKInitializeSerialHandler(UNK_PARAMS);
10-
/* 32769C */ UNK_RET TRKTerminateSerialHandler(UNK_PARAMS);
10+
/* 32769C */ bool TRKTerminateSerialHandler(void);
1111
/* 3276A4 */ UNK_RET usr_put_initialize(UNK_PARAMS);
1212

1313
#endif

0 commit comments

Comments
 (0)