Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2025-02-02 03:43:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

match MWTrace and dsp_debug

Browse Source 
these were the same asm lmao
This commit is contained in:
EpochFlame 2021-12-18 12:47:40 -05:00
parent 69e6e8e36e
commit 6d5a62fd71
9 changed files with 78 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
asm/Dolphin/MWTrace.s
View File

@ -1,26 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global MWTRACE
MWTRACE:
/* 800C1548 000BE488 94 21 FF 90 */ stwu r1, -0x70(r1)
/* 800C154C 000BE48C 40 86 00 24 */ bne cr1, lbl_800C1570
/* 800C1550 000BE490 D8 21 00 28 */ stfd f1, 0x28(r1)
/* 800C1554 000BE494 D8 41 00 30 */ stfd f2, 0x30(r1)
/* 800C1558 000BE498 D8 61 00 38 */ stfd f3, 0x38(r1)
/* 800C155C 000BE49C D8 81 00 40 */ stfd f4, 0x40(r1)
/* 800C1560 000BE4A0 D8 A1 00 48 */ stfd f5, 0x48(r1)
/* 800C1564 000BE4A4 D8 C1 00 50 */ stfd f6, 0x50(r1)
/* 800C1568 000BE4A8 D8 E1 00 58 */ stfd f7, 0x58(r1)
/* 800C156C 000BE4AC D9 01 00 60 */ stfd f8, 0x60(r1)
lbl_800C1570:
/* 800C1570 000BE4B0 90 61 00 08 */ stw r3, 8(r1)
/* 800C1574 000BE4B4 90 81 00 0C */ stw r4, 0xc(r1)
/* 800C1578 000BE4B8 90 A1 00 10 */ stw r5, 0x10(r1)
/* 800C157C 000BE4BC 90 C1 00 14 */ stw r6, 0x14(r1)
/* 800C1580 000BE4C0 90 E1 00 18 */ stw r7, 0x18(r1)
/* 800C1584 000BE4C4 91 01 00 1C */ stw r8, 0x1c(r1)
/* 800C1588 000BE4C8 91 21 00 20 */ stw r9, 0x20(r1)
/* 800C158C 000BE4CC 91 41 00 24 */ stw r10, 0x24(r1)
/* 800C1590 000BE4D0 38 21 00 70 */ addi r1, r1, 0x70
/* 800C1594 000BE4D4 4E 80 00 20 */ blr

26
asm/Dolphin/dsp_debug.s
View File

@ -1,26 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global __DSP_debug_printf
__DSP_debug_printf:
/* 800DAE00 000D7D40 94 21 FF 90 */ stwu r1, -0x70(r1)
/* 800DAE04 000D7D44 40 86 00 24 */ bne cr1, lbl_800DAE28
/* 800DAE08 000D7D48 D8 21 00 28 */ stfd f1, 0x28(r1)
/* 800DAE0C 000D7D4C D8 41 00 30 */ stfd f2, 0x30(r1)
/* 800DAE10 000D7D50 D8 61 00 38 */ stfd f3, 0x38(r1)
/* 800DAE14 000D7D54 D8 81 00 40 */ stfd f4, 0x40(r1)
/* 800DAE18 000D7D58 D8 A1 00 48 */ stfd f5, 0x48(r1)
/* 800DAE1C 000D7D5C D8 C1 00 50 */ stfd f6, 0x50(r1)
/* 800DAE20 000D7D60 D8 E1 00 58 */ stfd f7, 0x58(r1)
/* 800DAE24 000D7D64 D9 01 00 60 */ stfd f8, 0x60(r1)
lbl_800DAE28:
/* 800DAE28 000D7D68 90 61 00 08 */ stw r3, 8(r1)
/* 800DAE2C 000D7D6C 90 81 00 0C */ stw r4, 0xc(r1)
/* 800DAE30 000D7D70 90 A1 00 10 */ stw r5, 0x10(r1)
/* 800DAE34 000D7D74 90 C1 00 14 */ stw r6, 0x14(r1)
/* 800DAE38 000D7D78 90 E1 00 18 */ stw r7, 0x18(r1)
/* 800DAE3C 000D7D7C 91 01 00 1C */ stw r8, 0x1c(r1)
/* 800DAE40 000D7D80 91 21 00 20 */ stw r9, 0x20(r1)
/* 800DAE44 000D7D84 91 41 00 24 */ stw r10, 0x24(r1)
/* 800DAE48 000D7D88 38 21 00 70 */ addi r1, r1, 0x70
/* 800DAE4C 000D7D8C 4E 80 00 20 */ blr

8
include/Dolphin/MWTrace.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef _DOLPHIN_MWTRACE_H
#define _DOLPHIN_MWTRACE_H
#include "types.h"
void MWTRACE(u8, char*, ...);
#endif

4
include/Dolphin/dispatch.h
View File

@ -1,6 +1,8 @@
#ifndef _DOLPHIN_DISPATCH_H
#define _DOLPHIN_DISPATCH_H
#include "types.h"
typedef struct MessageBuffer MessageBuffer, *PMessageBuffer;
struct MessageBuffer {
char filler[0x14];
@ -20,5 +22,5 @@ u32 TRKDoSetOption(MessageBuffer*);
u32 TRKDoContinue(MessageBuffer*);
u32 TRKDoStep(MessageBuffer*);
u32 TRKDoStop(MessageBuffer*);
void MWTRACE(u8, char*, ...);
#endif

8
include/Dolphin/dsp.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef _DOLPHIN_DSP_H
#define _DOLPHIN_DSP_H
#include "types.h"
void __DSP_debug_printf(u8, char*, ...);
#endif

4
obj_files.mk
View File

@ -267,7 +267,7 @@ DOLPHIN:=\
$(BUILD_DIR)/asm/Dolphin/ddh/main.o\
$(BUILD_DIR)/asm/Dolphin/CircleBuffer.o\
$(BUILD_DIR)/asm/Dolphin/main.o\
$(BUILD_DIR)/asm/Dolphin/MWTrace.o\
$(BUILD_DIR)/src/Dolphin/MWTrace.o\
$(BUILD_DIR)/src/Dolphin/MWCriticalSection_gc.o\
$(BUILD_DIR)/asm/Dolphin/__va_arg.o\
$(BUILD_DIR)/asm/Dolphin/global_destructor_chain.o\
@ -359,7 +359,7 @@ DOLPHIN:=\
$(BUILD_DIR)/asm/Dolphin/CARDNet.o\
$(BUILD_DIR)/asm/Dolphin/db.o\
$(BUILD_DIR)/asm/Dolphin/dsp.o\
$(BUILD_DIR)/asm/Dolphin/dsp_debug.o\
$(BUILD_DIR)/src/Dolphin/dsp_debug.o\
$(BUILD_DIR)/asm/Dolphin/dsp_task.o\
$(BUILD_DIR)/asm/Dolphin/dvdlow.o\
$(BUILD_DIR)/asm/Dolphin/dvdfs.o\

55
src/Dolphin/MWTrace.c
View File

@ -1,35 +1,36 @@
#include "Dolphin/MWTrace.h"
/*
* --INFO--
* Address: 800C1548
* Size: 000050
*/
void MWTRACE(void)
{
/*
.loc_0x0:
stwu r1, -0x70(r1)
bne- cr1, .loc_0x28
stfd f1, 0x28(r1)
stfd f2, 0x30(r1)
stfd f3, 0x38(r1)
stfd f4, 0x40(r1)
stfd f5, 0x48(r1)
stfd f6, 0x50(r1)
stfd f7, 0x58(r1)
stfd f8, 0x60(r1)
.loc_0x28:
stw r3, 0x8(r1)
stw r4, 0xC(r1)
stw r5, 0x10(r1)
stw r6, 0x14(r1)
stw r7, 0x18(r1)
stw r8, 0x1C(r1)
stw r9, 0x20(r1)
stw r10, 0x24(r1)
addi r1, r1, 0x70
blr
*/
// clang-format off
asm void MWTRACE(u8, char*, ...)
{
nofralloc
stwu r1, -0x70(r1)
bne- cr1, loc_0x28
stfd f1, 0x28(r1)
stfd f2, 0x30(r1)
stfd f3, 0x38(r1)
stfd f4, 0x40(r1)
stfd f5, 0x48(r1)
stfd f6, 0x50(r1)
stfd f7, 0x58(r1)
stfd f8, 0x60(r1)
loc_0x28:
stw r3, 0x8(r1)
stw r4, 0xC(r1)
stw r5, 0x10(r1)
stw r6, 0x14(r1)
stw r7, 0x18(r1)
stw r8, 0x1C(r1)
stw r9, 0x20(r1)
stw r10, 0x24(r1)
addi r1, r1, 0x70
blr
}
// clang-format on

1
src/Dolphin/dispatch.c
View File

@ -1,5 +1,6 @@
#include "Dolphin/trk.h"
#include "Dolphin/dispatch.h"
#include "Dolphin/MWTrace.h"
/*
* --INFO--

55
src/Dolphin/dsp_debug.c
View File

@ -1,38 +1,39 @@
#include "Dolphin/dsp.h"
/*
* --INFO--
* Address: 800DAE00
* Size: 000050
*/
void __DSP_debug_printf(void)
{
/*
.loc_0x0:
stwu r1, -0x70(r1)
bne- cr1, .loc_0x28
stfd f1, 0x28(r1)
stfd f2, 0x30(r1)
stfd f3, 0x38(r1)
stfd f4, 0x40(r1)
stfd f5, 0x48(r1)
stfd f6, 0x50(r1)
stfd f7, 0x58(r1)
stfd f8, 0x60(r1)
.loc_0x28:
stw r3, 0x8(r1)
stw r4, 0xC(r1)
stw r5, 0x10(r1)
stw r6, 0x14(r1)
stw r7, 0x18(r1)
stw r8, 0x1C(r1)
stw r9, 0x20(r1)
stw r10, 0x24(r1)
addi r1, r1, 0x70
blr
*/
// clang-format off
asm void __DSP_debug_printf(u8, char*, ...)
{
nofralloc
stwu r1, -0x70(r1)
bne- cr1, loc_0x28
stfd f1, 0x28(r1)
stfd f2, 0x30(r1)
stfd f3, 0x38(r1)
stfd f4, 0x40(r1)
stfd f5, 0x48(r1)
stfd f6, 0x50(r1)
stfd f7, 0x58(r1)
stfd f8, 0x60(r1)
loc_0x28:
stw r3, 0x8(r1)
stw r4, 0xC(r1)
stw r5, 0x10(r1)
stw r6, 0x14(r1)
stw r7, 0x18(r1)
stw r8, 0x1C(r1)
stw r9, 0x20(r1)
stw r10, 0x24(r1)
addi r1, r1, 0x70
blr
}
// clang-format on
/*
* --INFO--