encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Shift Fixes

Browse Source
This commit is contained in:
jdflyer
2022-01-16 15:16:08 -07:00
parent 8a9f18c45f
commit db9079ede2
10 changed files with 450 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -140,7 +140,7 @@ $(ELF): $(LIBS) $(O_FILES)
@$(PYTHON) tools/lcf.py dol --output $(LDSCRIPT)
$(LD) -application $(LDFLAGS) -o $@ -lcf $(LDSCRIPT) @build/o_files $(LIBS)
$(ELF_SHIFT): $(LIBS) $(O_FILES)
$(ELF_SHIFT): $(DOL)
@echo $(O_FILES) > build/o_files
@$(PYTHON) tools/lcf.py dol_shift --output $(LDSCRIPT)
$(LD) -application $(LDFLAGS) -o $@ -lcf $(LDSCRIPT) @build/o_files $(LIBS)
asm/dolphin/os/OS/OSInit.s
+6 -6
View File
@@ -71,8 +71,8 @@ lbl_8033A060:
/* 8033A06C 80 63 00 30 */ lwz r3, 0x30(r3)
/* 8033A070 28 03 00 00 */ cmplwi r3, 0
/* 8033A074 40 82 00 10 */ bne lbl_8033A084
/* 8033A078 3C 60 80 46 */ lis r3, 0x8046 /* 0x80459BE0@ha */
/* 8033A07C 38 63 9B E0 */ addi r3, r3, 0x9BE0 /* 0x80459BE0@l */
/* 8033A078 3C 60 80 46 */ lis r3, _stack_end+0x3018@ha /* 0x80459BE0@ha */
/* 8033A07C 38 63 9B E0 */ addi r3, r3, _stack_end+0x3018@l /* 0x80459BE0@l */
/* 8033A080 48 00 00 04 */ b lbl_8033A084
lbl_8033A084:
/* 8033A084 48 00 12 21 */ bl OSSetArenaLo
@@ -86,8 +86,8 @@ lbl_8033A084:
/* 8033A0A4 80 03 00 00 */ lwz r0, 0(r3)
/* 8033A0A8 28 00 00 02 */ cmplwi r0, 2
/* 8033A0AC 40 80 00 18 */ bge lbl_8033A0C4
/* 8033A0B0 3C 60 80 45 */ lis r3, 0x8045 /* 0x80457BC8@ha */
/* 8033A0B4 38 63 7B C8 */ addi r3, r3, 0x7BC8 /* 0x80457BC8@l */
/* 8033A0B0 3C 60 80 45 */ lis r3, _stack_end+0x1000@ha /* 0x80457BC8@ha */
/* 8033A0B4 38 63 7B C8 */ addi r3, r3, _stack_end+0x1000@l /* 0x80457BC8@l */
/* 8033A0B8 38 03 00 1F */ addi r0, r3, 0x1f
/* 8033A0BC 54 03 00 34 */ rlwinm r3, r0, 0, 0, 0x1a
/* 8033A0C0 48 00 11 E5 */ bl OSSetArenaLo
@@ -96,8 +96,8 @@ lbl_8033A0C4:
/* 8033A0C8 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8033A0CC 28 03 00 00 */ cmplwi r3, 0
/* 8033A0D0 40 82 00 10 */ bne lbl_8033A0E0
/* 8033A0D4 3C 60 81 70 */ lis r3, 0x8170 /* 0x81700000@ha */
/* 8033A0D8 38 63 00 00 */ addi r3, r3, 0x0000 /* 0x81700000@l */
/* 8033A0D4 3C 60 81 70 */ lis r3, __ArenaHi@ha /* 0x81700000@ha */
/* 8033A0D8 38 63 00 00 */ addi r3, r3, __ArenaHi@l /* 0x81700000@l */
/* 8033A0DC 48 00 00 04 */ b lbl_8033A0E0
lbl_8033A0E0:
/* 8033A0E0 48 00 11 BD */ bl OSSetArenaHi
asm/dolphin/os/OSThread/__OSThreadInit.s
+4 -4
View File
@@ -31,11 +31,11 @@ lbl_80340B1C:
/* 80340B90 4B FF B4 71 */ bl OSClearContext
/* 80340B94 7F E3 FB 78 */ mr r3, r31
/* 80340B98 4B FF B2 A1 */ bl OSSetCurrentContext
/* 80340B9C 3C 60 80 45 */ lis r3, 0x8045 /* 0x80457BC8@ha */
/* 80340BA0 38 03 7B C8 */ addi r0, r3, 0x7BC8 /* 0x80457BC8@l */
/* 80340BA4 3C 60 80 45 */ lis r3, 0x8045 /* 0x80456BC8@ha */
/* 80340B9C 3C 60 80 45 */ lis r3, _stack_end+0x1000@ha /* 0x80457BC8@ha */
/* 80340BA0 38 03 7B C8 */ addi r0, r3, _stack_end+0x1000@l /* 0x80457BC8@l */
/* 80340BA4 3C 60 80 45 */ lis r3, _stack_end@ha /* 0x80456BC8@ha */
/* 80340BA8 90 1C 07 1C */ stw r0, 0x71c(r28)
/* 80340BAC 38 03 6B C8 */ addi r0, r3, 0x6BC8 /* 0x80456BC8@l */
/* 80340BAC 38 03 6B C8 */ addi r0, r3, _stack_end@l /* 0x80456BC8@l */
/* 80340BB0 90 1C 07 20 */ stw r0, 0x720(r28)
/* 80340BB4 3C 60 DE AE */ lis r3, 0xDEAE /* 0xDEADBABE@ha */
/* 80340BB8 38 03 BA BE */ addi r0, r3, 0xBABE /* 0xDEADBABE@l */
asm/init/__init_registers.s
+6 -6
View File
@@ -28,10 +28,10 @@ lbl_800032B0:
/* 80003318 3B A0 00 00 */ li r29, 0
/* 8000331C 3B C0 00 00 */ li r30, 0
/* 80003320 3B E0 00 00 */ li r31, 0
/* 80003324 3C 20 80 45 */ lis r1, 0x8045 /* 0x80457BC8@h */
/* 80003328 60 21 7B C8 */ ori r1, r1, 0x7BC8 /* 0x80457BC8@l */
/* 8000332C 3C 40 80 45 */ lis r2, 0x8045 /* 0x80459A00@h */
/* 80003330 60 42 9A 00 */ ori r2, r2, 0x9A00 /* 0x80459A00@l */
/* 80003334 3D A0 80 45 */ lis r13, 0x8045 /* 0x80458580@h */
/* 80003338 61 AD 85 80 */ ori r13, r13, 0x8580 /* 0x80458580@l */
/* 80003324 3C 20 80 45 */ lis r1, _stack_end+0x1000@h /* 0x80457BC8@h */
/* 80003328 60 21 7B C8 */ ori r1, r1, _stack_end+0x1000@l /* 0x80457BC8@l */
/* 8000332C 3C 40 80 45 */ lis r2, _SDA2_BASE_@h /* 0x80459A00@h */
/* 80003330 60 42 9A 00 */ ori r2, r2, _SDA2_BASE_@l /* 0x80459A00@l */
/* 80003334 3D A0 80 45 */ lis r13, _SDA_BASE_@h /* 0x80458580@h */
/* 80003338 61 AD 85 80 */ ori r13, r13, _SDA_BASE_@l /* 0x80458580@l */
/* 8000333C 4E 80 00 20 */ blr
libs/dolphin/os/OS.cpp
+3
View File
@@ -497,6 +497,9 @@ u8 __OSStartTime[4];
extern u8 data_80451634[4];
u8 data_80451634[4];
extern void* __ArenaHi;
extern void* _stack_end;
/* 80339F60-8033A440 3348A0 04E0+00 0/0 2/2 0/0 .text OSInit */
#pragma push
#pragma optimization_level 0
libs/dolphin/os/OSThread.cpp
+3
View File
@@ -119,6 +119,9 @@ static u8 RunQueueHint[4];
static u8 Reschedule[4 + 4 /* padding */];
/* 80340B1C-80340C74 33B45C 0158+00 0/0 1/1 0/0 .text __OSThreadInit */
extern void* _stack_end;
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
src/DynamicLink.cpp
+3 -3
View File
@@ -342,19 +342,19 @@ bool DynamicModuleControl::do_load() {
snprintf(buffer,64,"%s.rel",mName);
if(mModule==NULL&&sArchive!=NULL) {
if(mModule==NULL) {
mModule = (OSModuleInfo*)JKRArchive::getGlbResource(0x4D4D454D,buffer,sArchive);
mModule = (OSModuleInfo*)JKRArchive::getGlbResource(0x4D4D454D/*MMEM*/,buffer,sArchive);
if(mModule!=NULL) {
mResourceType = 1;
}
}
if(mModule==NULL) {
mModule = (OSModuleInfo*)JKRArchive::getGlbResource(0x414D454D,buffer,sArchive);
mModule = (OSModuleInfo*)JKRArchive::getGlbResource(0x414D454D/*AMEM*/,buffer,sArchive);
if(mModule!=NULL) {
mResourceType = 2;
}
}
if(mModule==NULL) {
mModule = (OSModuleInfo*)JKRArchive::getGlbResource(0x444D454D,buffer,sArchive);
mModule = (OSModuleInfo*)JKRArchive::getGlbResource(0x444D454D/*DMEM*/,buffer,sArchive);
if(mModule!=NULL) {
mResourceType = 3;
}
src/init.cpp
+4
View File
@@ -102,6 +102,10 @@ SECTION_INIT asm void __start() {
}
#pragma pop
extern void* _stack_end;
extern void* _SDA2_BASE_;
extern void* _SDA_BASE_;
/* 800032B0-80003340 0001B0 0090+00 1/1 0/0 0/0 .init __init_registers */
#pragma push
#pragma optimization_level 0
tools/elf2dol/elf2dol.c
+418 -460
View File
File diff suppressed because it is too large Load Diff
tools/requirements.txt
+2 -1
View File
@@ -7,4 +7,5 @@ colorama
ansiwrap
watchdog
python-Levenshtein
cxxfilt
cxxfilt
oead