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

Match all 16-byte functions #1473

Merged
merged 2 commits into from
Sep 28, 2024
Merged

Match all 16-byte functions #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1142e19
Match all 16-byte functions
ribbanya Sep 28, 2024
605e13d
Fix `gmMainLib_8015DB2C`
ribbanya Sep 28, 2024
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
3 changes: 3 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ WhitespaceSensitiveMacros:
- 'CHECK'
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^".*?__static\.h"$'
Priority: -2
SortPriority: 0
- Regex: '^<platform\.h>$'
Priority: -1
SortPriority: -6
Expand Down
1,214 changes: 636 additions & 578 deletions asm/dolphin/gx/GXPerf.s
View file
Open in desktop

Large diffs are not rendered by default.

71,641 changes: 38,296 additions & 33,345 deletions asm/melee/gm/gm_1601.s
View file
Open in desktop

Large diffs are not rendered by default.

1,220 changes: 698 additions & 522 deletions asm/melee/lb/lbmthp.s
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 6 additions & 12 deletions config/GALE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8494,7 +8494,7 @@ fn_801661E0 = .text:0x801661E0; // type:function size:0x198
gm_80166378 = .text:0x80166378; // type:function size:0x714 scope:global
fn_80166A8C = .text:0x80166A8C; // type:function size:0xC
gm_80166A98 = .text:0x80166A98; // type:function size:0x224 scope:global
fn_80166CBC = .text:0x80166CBC; // type:function size:0x10
fn_80166CBC = .text:0x80166CBC; // type:function size:0x10 scope:local
gm_80166CCC = .text:0x80166CCC; // type:function size:0x474 scope:global
gm_80167140 = .text:0x80167140; // type:function size:0x54 scope:global
fn_80167194 = .text:0x80167194; // type:function size:0x8
Expand Down Expand Up @@ -18439,12 +18439,6 @@ GXPerf_8034204C = .text:0x8034204C; // type:label scope:global
GXPerf_80342084 = .text:0x80342084; // type:label scope:global
GXPerf_803420BC = .text:0x803420BC; // type:label scope:global
GXPerf_803420F4 = .text:0x803420F4; // type:label scope:global
GXPerf_8034212C = .text:0x8034212C; // type:label scope:global
GXPerf_8034213C = .text:0x8034213C; // type:label scope:global
GXPerf_8034214C = .text:0x8034214C; // type:label scope:global
GXPerf_8034215C = .text:0x8034215C; // type:label scope:global
GXPerf_8034216C = .text:0x8034216C; // type:label scope:global
GXPerf_80342184 = .text:0x80342184; // type:label scope:global
GXClearGPMetric = .text:0x80342194; // type:function size:0x10 scope:global
PSMTXIdentity = .text:0x803421A4; // type:function size:0x2C scope:global
PSMTXCopy = .text:0x803421D0; // type:function size:0x34 scope:global
Expand Down Expand Up @@ -20531,7 +20525,7 @@ cm_803BCB9C = .data:0x803BCB9C; // type:object size:0x14 scope:global
cm_803BCBB0 = .data:0x803BCBB0; // type:object size:0x20 scope:global data:string
cm_803BCBD0 = .data:0x803BCBD0; // type:object size:0x7C scope:global
jumptable_803BCC4C = .data:0x803BCC4C; // type:object size:0x24 scope:local
cm_803BCCA0 = .data:0x803BCCA0; // type:object size:0xF0 scope:global
cm_803BCCA0 = .data:0x803BCCA0; // type:object size:0xF0 scope:local data:float
@82 = .data:0x803BCD90; // type:object size:0x9 scope:local data:string
@83 = .data:0x803BCD9C; // type:object size:0x21 scope:local data:string
str_PdPmdat_start_of_data = .data:0x803BCDC0; // type:object size:0x9 scope:global data:string
Expand Down Expand Up @@ -20877,8 +20871,8 @@ ftData_assert_msg_4 = .data:0x803C27C0; // type:object size:0x1D scope:global da
ftData_assert_msg_5 = .data:0x803C27E0; // type:object size:0x1C scope:global data:string
ftData_MotionStateList = .data:0x803C2800; // type:object size:0x2AA0 scope:global
ftData_803C52A0 = .data:0x803C52A0; // type:object size:0x1C0 scope:global
@597 = .data:0x803C5460; // type:object size:0x27 scope:local data:string
@729 = .data:0x803C5488; // type:object size:0x1F scope:local data:string
@598 = .data:0x803C5460; // type:object size:0x27 scope:local data:string
@730 = .data:0x803C5488; // type:object size:0x1F scope:local data:string
@275 = .data:0x803C54A8; // type:object size:0x1A scope:local data:string
@276 = .data:0x803C54C4; // type:object size:0xD scope:local data:string
@307 = .data:0x803C54D8; // type:object size:0x44 scope:local
Expand Down Expand Up @@ -25340,7 +25334,7 @@ lbl_804D3AA8 = .sdata:0x804D3AA8; // type:object size:0x8
lbl_804D3AB0 = .sdata:0x804D3AB0; // type:object size:0x8
ftData_804D3AB8 = .sdata:0x804D3AB8; // type:object size:0x4 scope:global
ftData_804D3ABC = .sdata:0x804D3ABC; // type:object size:0xC scope:global
@596 = .sdata:0x804D3AC8; // type:object size:0x8 scope:local data:string
@597 = .sdata:0x804D3AC8; // type:object size:0x8 scope:local data:string
lbl_804D3AD0 = .sdata:0x804D3AD0; // type:object size:0x8
lbl_804D3AD8 = .sdata:0x804D3AD8; // type:object size:0x8
@277 = .sdata:0x804D3AE0; // type:object size:0x2 scope:local data:string
Expand Down Expand Up @@ -28529,7 +28523,7 @@ ft_804D83B8 = .sdata2:0x804D83B8; // type:object size:0x4 scope:local data:float
@302 = .sdata2:0x804D83D0; // type:object size:0x4 scope:local data:float
@335 = .sdata2:0x804D83D4; // type:object size:0x4 scope:local data:float
@430 = .sdata2:0x804D83D8; // type:object size:0x4 scope:local data:float
@465 = .sdata2:0x804D83DC; // type:object size:0x4 scope:local data:float
@466 = .sdata2:0x804D83DC; // type:object size:0x4 scope:local data:float
ft_804D83E0 = .sdata2:0x804D83E0; // type:object size:0x4 scope:global data:float
lbl_804D83E8 = .sdata2:0x804D83E8; // type:object size:0x4 data:float
lbl_804D83F0 = .sdata2:0x804D83F0; // type:object size:0x4 data:float
Expand Down
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
config.binutils_tag = "2.42-1"
config.compilers_tag = "20240706"
config.dtk_tag = "v0.9.6"
config.objdiff_tag = "v2.0.0"
config.objdiff_tag = "v2.1.0"
config.sjiswrap_tag = "v1.1.1"
config.wibo_tag = "0.6.11"

Expand Down
20 changes: 16 additions & 4 deletions src/MetroTRK/targimpl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,24 @@ void __TRK_set_MSR(int value)

/// #TRKTargetStepOutOfRange

/// #TRKTargetGetPC
s32 TRKTargetGetPC(void)
{
return gTRKCPUState.unk_80;
}

/// #TRKTargetSupportRequest

/// #TRKTargetFlushCache

/// #TRKTargetStopped
s32 TRKTargetStopped(void)
{
return gTRKState.unk_98;
}

/// #TRKTargetSetStopped
void TRKTargetSetStopped(s32 arg0)
{
gTRKState.unk_98 = arg0;
}

/// #TRKTargetStop

Expand All @@ -91,4 +100,7 @@ void __TRK_set_MSR(int value)

/// #TRKPPCAccessSpecialReg

/// #TRKTargetSetInputPendingPtr
void TRKTargetSetInputPendingPtr(s32 arg0)
{
gTRKState.unk_A0 = arg0;
}
26 changes: 22 additions & 4 deletions src/MetroTRK/targimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@

#include <placeholder.h>

struct gTRKCPUState_t {
/* 0x000 */ char pad_0[0x80];
/* 0x080 */ s32 unk_80; /* inferred */
/* 0x084 */ char pad_84[0x3AC]; /* maybe part of unk_80[0xEC]? */
}; /* size = 0x430 */
STATIC_ASSERT(sizeof(struct gTRKCPUState_t) == 0x430);

struct gTRKState_t {
/* 0x00 */ char pad_0[0x98];
/* 0x98 */ s32 unk_98;
/* 0x9C */ char pad_9C[4];
/* 0xA0 */ s32 unk_A0; /* inferred */
}; /* size = 0xA4 */
STATIC_ASSERT(sizeof(struct gTRKState_t) == 0xA4);

/* 4A4BF0 */ extern struct gTRKState_t gTRKState;

/* 32904C */ int __TRK_get_MSR(void);
/* 329054 */ void __TRK_set_MSR(int);
/* 32905C */ UNK_RET TRKValidMemory32(UNK_PARAMS);
Expand All @@ -29,16 +46,17 @@
/* 32A090 */ UNK_RET TRKTargetCheckStep(UNK_PARAMS);
/* 32A0F8 */ UNK_RET TRKTargetSingleStep(UNK_PARAMS);
/* 32A13C */ UNK_RET TRKTargetStepOutOfRange(UNK_PARAMS);
/* 32A184 */ UNK_RET TRKTargetGetPC(UNK_PARAMS);
/* 32A184 */ s32 TRKTargetGetPC(void);
/* 32A194 */ UNK_RET TRKTargetSupportRequest(UNK_PARAMS);
/* 32A284 */ UNK_RET TRKTargetFlushCache(UNK_PARAMS);
/* 32A2C0 */ UNK_RET TRKTargetStopped(UNK_PARAMS);
/* 32A2D0 */ UNK_RET TRKTargetSetStopped(UNK_PARAMS);
/* 32A2C0 */ s32 TRKTargetStopped(void);
/* 32A2D0 */ void TRKTargetSetStopped(s32 arg0);
/* 32A2E0 */ UNK_RET TRKTargetStop(UNK_PARAMS);
/* 32A308 */ UNK_RET TRKPPCAccessSPR(UNK_PARAMS);
/* 32A3B8 */ UNK_RET TRKPPCAccessPairedSingleRegister(UNK_PARAMS);
/* 32A430 */ UNK_RET TRKPPCAccessFPRegister(UNK_PARAMS);
/* 32A5B0 */ UNK_RET TRKPPCAccessSpecialReg(UNK_PARAMS);
/* 32A618 */ UNK_RET TRKTargetSetInputPendingPtr(UNK_PARAMS);
/* 32A618 */ void TRKTargetSetInputPendingPtr(s32 arg0);
/* 4A4C98 */ extern struct gTRKCPUState_t gTRKCPUState;

#endif
Loading
Loading