falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match PADControlMotors

This commit is contained in:
Tal Hayon 2023-01-16 21:10:26 +02:00
parent ba79ab4789
commit e1419fe719
3 changed files with 8 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Progress.md
View File

@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes)
.init | 97.972973% | 9280 | 9472
.extab | 100.000000% | 96 | 96
.extabindex | 100.000000% | 96 | 96
.text | 22.072634% | 793852 | 3596544
.text | 22.077750% | 794036 | 3596544
.ctors | 100.000000% | 448 | 448
.dtors | 100.000000% | 32 | 32
.rodata | 100.000000% | 193856 | 193856
.data | 100.000000% | 197632 | 197632
.sdata | 100.000000% | 1408 | 1408
.sdata2 | 100.000000% | 20832 | 20832
Total | 30.288171% | 1217788 | 4020672
Total | 30.292747% | 1217972 | 4020672
## Total
Section | Percentage | Decompiled (bytes) | Total (bytes)
---|---|---|---
main.dol | 30.288171% | 1217788 | 4020672
main.dol | 30.292747% | 1217972 | 4020672
RELs | 33.041295% | 3799856 | 11500324
Total | 32.328106% | 5017644 | 15520996
Total | 32.329291% | 5017828 | 15520996
## RELs

50
asm/dolphin/pad/Pad/PADControlMotor.s
View File

@ -1,50 +0,0 @@
lbl_8034F1A0:
/* 8034F1A0 7C 08 02 A6 */ mflr r0
/* 8034F1A4 90 01 00 04 */ stw r0, 4(r1)
/* 8034F1A8 94 21 FF D8 */ stwu r1, -0x28(r1)
/* 8034F1AC 93 E1 00 24 */ stw r31, 0x24(r1)
/* 8034F1B0 93 C1 00 20 */ stw r30, 0x20(r1)
/* 8034F1B4 3B C4 00 00 */ addi r30, r4, 0
/* 8034F1B8 93 A1 00 1C */ stw r29, 0x1c(r1)
/* 8034F1BC 3B A3 00 00 */ addi r29, r3, 0
/* 8034F1C0 4B FE E5 35 */ bl OSDisableInterrupts
/* 8034F1C4 3C 00 80 00 */ lis r0, 0x8000
/* 8034F1C8 80 8D 92 CC */ lwz r4, EnabledBits(r13)
/* 8034F1CC 7C 00 EC 30 */ srw r0, r0, r29
/* 8034F1D0 7C 80 00 39 */ and. r0, r4, r0
/* 8034F1D4 3B E3 00 00 */ addi r31, r3, 0
/* 8034F1D8 41 82 00 5C */ beq lbl_8034F234
/* 8034F1DC 7F A3 EB 78 */ mr r3, r29
/* 8034F1E0 4B FF 6D B1 */ bl SIGetType
/* 8034F1E4 54 60 00 85 */ rlwinm. r0, r3, 0, 2, 2
/* 8034F1E8 40 82 00 4C */ bne lbl_8034F234
/* 8034F1EC 80 0D 84 B0 */ lwz r0, Spec(r13)
/* 8034F1F0 28 00 00 02 */ cmplwi r0, 2
/* 8034F1F4 40 80 00 10 */ bge lbl_8034F204
/* 8034F1F8 28 1E 00 02 */ cmplwi r30, 2
/* 8034F1FC 40 82 00 08 */ bne lbl_8034F204
/* 8034F200 3B C0 00 00 */ li r30, 0
lbl_8034F204:
/* 8034F204 3C 60 80 00 */ lis r3, 0x8000 /* 0x800030E3@ha */
/* 8034F208 88 03 30 E3 */ lbz r0, 0x30E3(r3) /* 0x800030E3@l */
/* 8034F20C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a
/* 8034F210 41 82 00 08 */ beq lbl_8034F218
/* 8034F214 3B C0 00 00 */ li r30, 0
lbl_8034F218:
/* 8034F218 80 8D 84 AC */ lwz r4, AnalogMode(r13)
/* 8034F21C 57 C0 07 BE */ clrlwi r0, r30, 0x1e
/* 8034F220 38 7D 00 00 */ addi r3, r29, 0
/* 8034F224 64 84 00 40 */ oris r4, r4, 0x40
/* 8034F228 7C 84 03 78 */ or r4, r4, r0
/* 8034F22C 4B FF 65 A5 */ bl SISetCommand
/* 8034F230 4B FF 65 B5 */ bl SITransferCommands
lbl_8034F234:
/* 8034F234 7F E3 FB 78 */ mr r3, r31
/* 8034F238 4B FE E4 E5 */ bl OSRestoreInterrupts
/* 8034F23C 80 01 00 2C */ lwz r0, 0x2c(r1)
/* 8034F240 83 E1 00 24 */ lwz r31, 0x24(r1)
/* 8034F244 83 C1 00 20 */ lwz r30, 0x20(r1)
/* 8034F248 83 A1 00 1C */ lwz r29, 0x1c(r1)
/* 8034F24C 38 21 00 28 */ addi r1, r1, 0x28
/* 8034F250 7C 08 03 A6 */ mtlr r0
/* 8034F254 4E 80 00 20 */ blr

15
libs/dolphin/pad/Pad.c
View File

@ -510,7 +510,6 @@ u32 PADRead(PADStatus* status) {
}
/* 8034F1A0-8034F258 349AE0 00B8+00 0/0 2/2 0/0 .text PADControlMotor */
#ifdef NONMATCHING
void PADControlMotor(s32 chan, u32 command) {
BOOL enabled;
u32 chanBit;
@ -522,21 +521,15 @@ void PADControlMotor(s32 chan, u32 command) {
command = PAD_MOTOR_STOP;
}
if (UnkVal & 0x20) {
command = PAD_MOTOR_STOP;
}
SISetCommand(chan, (0x40 << 16) | AnalogMode | (command & (0x00000001 | 0x00000002)));
SITransferCommands();
}
OSRestoreInterrupts(enabled);
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void PADControlMotor(s32 channel, u32 command) {
nofralloc
#include "asm/dolphin/pad/Pad/PADControlMotor.s"
}
#pragma pop
#endif
/* 8034F258-8034F2B8 349B98 0060+00 1/1 1/1 0/0 .text PADSetSpec */
void PADSetSpec(u32 spec) {