mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-11 05:04:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

JKRAram and JKRAramStream (#80)

Browse Source 
* before __register_global_object

* JKRThread::sThreadList, JKRHeap::sSystemHeap, etc.

* cleanup and started on JKRDvdArchive

* before changing JKRCompression

* more JKRDvdArchive, abs, and memset

* fixed JKRArchive::setExpandSize split

* JKRArchive::sCurrentDirID, JKRDvdFile::sDvdList, and matching JKRDvdFile constructors

* problems

* merge fixes and formatting

* updated clang version in clang-format-all to version 10

* Added OSPhysicalToCached and struct for global memory

* remove useless __attribute__

* changed from defines and macros to const variable and function

* changed FLAG_HAS to FLAG_ON

* JKRAram, linking problems

* fix JKRAram

* remove nonmatching stuff

* renamed static data

* more static class members

* JKRAramStream OK

* formatting

Co-authored-by: Julgodis <>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
Jonathan Wase
2021-01-10 02:15:52 +01:00
committed by GitHub
parent 3e498a531d
commit 04354aadb9
255 changed files with 2048 additions and 3354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JKernel/JKRFileCache/asm/func_802D49B4.s
+2 -2
View File
@@ -25,8 +25,8 @@ lbl_802D49EC:
/* 802D4A08 002D1948 38 60 00 00 */ li r3, 0
/* 802D4A0C 002D194C 48 00 00 90 */ b lbl_802D4A9C
lbl_802D4A10:
/* 802D4A10 002D1950 3C 60 80 43 */ lis r3, lbl_80434354@ha
/* 802D4A14 002D1954 83 A3 43 54 */ lwz r29, lbl_80434354@l(r3)
/* 802D4A10 002D1950 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha
/* 802D4A14 002D1954 83 A3 43 54 */ lwz r29, sVolumeList__13JKRFileLoader@l(r3)
/* 802D4A18 002D1958 48 00 00 50 */ b lbl_802D4A68
lbl_802D4A1C:
/* 802D4A1C 002D195C 80 9D 00 00 */ lwz r4, 0(r29)
include/JSystem/JKernel/JKRFileCache/asm/func_802D4AB4.s
+5 -5
View File
@@ -30,7 +30,7 @@
/* 802D4B20 002D1A60 80 BF 00 38 */ lwz r5, 0x38(r31)
/* 802D4B24 002D1A64 4B FF 99 51 */ bl alloc__7JKRHeapFUliP7JKRHeap
/* 802D4B28 002D1A68 90 7F 00 48 */ stw r3, 0x48(r31)
/* 802D4B2C 002D1A6C 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D4B2C 002D1A6C 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D4B30 002D1A70 38 9E 00 02 */ addi r4, r30, 2
/* 802D4B34 002D1A74 38 A0 00 01 */ li r5, 1
/* 802D4B38 002D1A78 4B FF 99 9D */ bl alloc__7JKRHeapFUli
@@ -65,7 +65,7 @@ lbl_802D4BA8:
/* 802D4BA8 002D1AE8 7F C3 F3 78 */ mr r3, r30
/* 802D4BAC 002D1AEC 48 09 40 39 */ bl strlen
/* 802D4BB0 002D1AF0 38 83 00 01 */ addi r4, r3, 1
/* 802D4BB4 002D1AF4 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D4BB4 002D1AF4 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D4BB8 002D1AF8 38 A0 00 00 */ li r5, 0
/* 802D4BBC 002D1AFC 4B FF 99 19 */ bl alloc__7JKRHeapFUli
/* 802D4BC0 002D1B00 90 7F 00 50 */ stw r3, 0x50(r31)
@@ -89,7 +89,7 @@ lbl_802D4C00:
/* 802D4C00 002D1B40 7F C3 F3 78 */ mr r3, r30
/* 802D4C04 002D1B44 48 09 3F E1 */ bl strlen
/* 802D4C08 002D1B48 38 83 00 01 */ addi r4, r3, 1
/* 802D4C0C 002D1B4C 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D4C0C 002D1B4C 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D4C10 002D1B50 38 A0 00 00 */ li r5, 0
/* 802D4C14 002D1B54 4B FF 98 C1 */ bl alloc__7JKRHeapFUli
/* 802D4C18 002D1B58 90 7F 00 50 */ stw r3, 0x50(r31)
@@ -102,8 +102,8 @@ lbl_802D4C00:
/* 802D4C34 002D1B74 80 1F 00 50 */ lwz r0, 0x50(r31)
/* 802D4C38 002D1B78 90 1F 00 28 */ stw r0, 0x28(r31)
lbl_802D4C3C:
/* 802D4C3C 002D1B7C 3C 60 80 43 */ lis r3, lbl_80434354@ha
/* 802D4C40 002D1B80 38 63 43 54 */ addi r3, r3, lbl_80434354@l
/* 802D4C3C 002D1B7C 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha
/* 802D4C40 002D1B80 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l
/* 802D4C44 002D1B84 38 9F 00 18 */ addi r4, r31, 0x18
/* 802D4C48 002D1B88 48 00 73 A9 */ bl prepend__10JSUPtrListFP10JSUPtrLink
/* 802D4C4C 002D1B8C 38 00 00 01 */ li r0, 1
include/JSystem/JKernel/JKRFileCache/asm/func_802D4C70.s
+4 -4
View File
@@ -24,17 +24,17 @@ lbl_802D4CC0:
/* 802D4CC0 002D1C00 80 9E 00 4C */ lwz r4, 0x4c(r30)
/* 802D4CC4 002D1C04 28 04 00 00 */ cmplwi r4, 0
/* 802D4CC8 002D1C08 41 82 00 0C */ beq lbl_802D4CD4
/* 802D4CCC 002D1C0C 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D4CCC 002D1C0C 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D4CD0 002D1C10 4B FF 98 79 */ bl free__7JKRHeapFPv
lbl_802D4CD4:
/* 802D4CD4 002D1C14 80 9E 00 50 */ lwz r4, 0x50(r30)
/* 802D4CD8 002D1C18 28 04 00 00 */ cmplwi r4, 0
/* 802D4CDC 002D1C1C 41 82 00 0C */ beq lbl_802D4CE8
/* 802D4CE0 002D1C20 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D4CE0 002D1C20 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D4CE4 002D1C24 4B FF 98 65 */ bl free__7JKRHeapFPv
lbl_802D4CE8:
/* 802D4CE8 002D1C28 3C 60 80 43 */ lis r3, lbl_80434354@ha
/* 802D4CEC 002D1C2C 38 63 43 54 */ addi r3, r3, lbl_80434354@l
/* 802D4CE8 002D1C28 3C 60 80 43 */ lis r3, sVolumeList__13JKRFileLoader@ha
/* 802D4CEC 002D1C2C 38 63 43 54 */ addi r3, r3, sVolumeList__13JKRFileLoader@l
/* 802D4CF0 002D1C30 38 9E 00 18 */ addi r4, r30, 0x18
/* 802D4CF4 002D1C34 48 00 74 69 */ bl remove__10JSUPtrListFP10JSUPtrLink
/* 802D4CF8 002D1C38 34 1E 00 3C */ addic. r0, r30, 0x3c
include/JSystem/JKernel/JKRFileCache/asm/func_802D4D44.s
+3 -3
View File
@@ -14,8 +14,8 @@
/* 802D4D70 002D1CB0 54 00 06 3F */ clrlwi. r0, r0, 0x18
/* 802D4D74 002D1CB4 7C 1E 03 78 */ mr r30, r0
/* 802D4D78 002D1CB8 41 82 00 38 */ beq lbl_802D4DB0
/* 802D4D7C 002D1CBC 93 AD 8E 98 */ stw r29, lbl_80451418-_SDA_BASE_(r13)
/* 802D4D80 002D1CC0 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D4D7C 002D1CBC 93 AD 8E 98 */ stw r29, sCurrentVolume__13JKRFileLoader-_SDA_BASE_(r13)
/* 802D4D80 002D1CC0 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D4D84 002D1CC4 80 9D 00 4C */ lwz r4, 0x4c(r29)
/* 802D4D88 002D1CC8 4B FF 97 C1 */ bl free__7JKRHeapFPv
/* 802D4D8C 002D1CCC 93 FD 00 4C */ stw r31, 0x4c(r29)
@@ -28,7 +28,7 @@
/* 802D4DA8 002D1CE8 48 09 3D 15 */ bl strcat
/* 802D4DAC 002D1CEC 48 00 00 10 */ b lbl_802D4DBC
lbl_802D4DB0:
/* 802D4DB0 002D1CF0 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D4DB0 002D1CF0 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D4DB4 002D1CF4 7F E4 FB 78 */ mr r4, r31
/* 802D4DB8 002D1CF8 4B FF 97 91 */ bl free__7JKRHeapFPv
lbl_802D4DBC:
include/JSystem/JKernel/JKRFileCache/asm/func_802D4DD8.s
+2 -2
View File
@@ -35,7 +35,7 @@
/* 802D4E58 002D1D98 38 C0 00 00 */ li r6, 0
/* 802D4E5C 002D1D9C 48 00 46 BD */ bl read__7JKRFileFPvll
/* 802D4E60 002D1DA0 38 60 00 20 */ li r3, 0x20
/* 802D4E64 002D1DA4 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13)
/* 802D4E64 002D1DA4 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D4E68 002D1DA8 38 A0 00 00 */ li r5, 0
/* 802D4E6C 002D1DAC 4B FF 9E 2D */ bl __nw__FUlP7JKRHeapi
/* 802D4E70 002D1DB0 7C 64 1B 79 */ or. r4, r3, r3
@@ -55,7 +55,7 @@ lbl_802D4E98:
/* 802D4EA0 002D1DE0 90 03 00 10 */ stw r0, 0x10(r3)
/* 802D4EA4 002D1DE4 83 E3 00 1C */ lwz r31, 0x1c(r3)
lbl_802D4EA8:
/* 802D4EA8 002D1DE8 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D4EA8 002D1DE8 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D4EAC 002D1DEC 7F C4 F3 78 */ mr r4, r30
/* 802D4EB0 002D1DF0 4B FF 96 99 */ bl free__7JKRHeapFPv
/* 802D4EB4 002D1DF4 38 61 00 08 */ addi r3, r1, 8
include/JSystem/JKernel/JKRFileCache/asm/func_802D4F64.s
+1 -1
View File
@@ -45,7 +45,7 @@ lbl_802D4FF4:
/* 802D5000 002D1F40 4B D2 E5 41 */ bl memcpy
/* 802D5004 002D1F44 4B FF FF 9C */ b lbl_802D4FA0
lbl_802D5008:
/* 802D5008 002D1F48 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D5008 002D1F48 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D500C 002D1F4C 7F E4 FB 78 */ mr r4, r31
/* 802D5010 002D1F50 4B FF 95 39 */ bl free__7JKRHeapFPv
/* 802D5014 002D1F54 38 61 00 08 */ addi r3, r1, 8
include/JSystem/JKernel/JKRFileCache/asm/func_802D52A0.s
+1 -1
View File
@@ -24,7 +24,7 @@ lbl_802D52D8:
/* 802D52EC 002D222C 38 61 00 14 */ addi r3, r1, 0x14
/* 802D52F0 002D2230 48 07 3D F5 */ bl DVDCloseDir
lbl_802D52F4:
/* 802D52F4 002D2234 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D52F4 002D2234 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D52F8 002D2238 7F C4 F3 78 */ mr r4, r30
/* 802D52FC 002D223C 4B FF 92 4D */ bl free__7JKRHeapFPv
/* 802D5300 002D2240 7F E3 FB 78 */ mr r3, r31
include/JSystem/JKernel/JKRFileCache/asm/func_802D531C.s
+2 -2
View File
@@ -8,7 +8,7 @@
/* 802D5330 002D2270 48 00 01 ED */ bl getDvdPathName__12JKRFileCacheCFPCc
/* 802D5334 002D2274 7C 7E 1B 78 */ mr r30, r3
/* 802D5338 002D2278 38 60 00 24 */ li r3, 0x24
/* 802D533C 002D227C 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13)
/* 802D533C 002D227C 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D5340 002D2280 38 A0 00 00 */ li r5, 0
/* 802D5344 002D2284 4B FF 99 55 */ bl __nw__FUlP7JKRHeapi
/* 802D5348 002D2288 7C 7F 1B 79 */ or. r31, r3, r3
@@ -17,7 +17,7 @@
/* 802D5354 002D2294 4B FF F4 1D */ bl __ct__12JKRDvdFinderFPCc
/* 802D5358 002D2298 7C 7F 1B 78 */ mr r31, r3
lbl_802D535C:
/* 802D535C 002D229C 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D535C 002D229C 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D5360 002D22A0 7F C4 F3 78 */ mr r4, r30
/* 802D5364 002D22A4 4B FF 91 E5 */ bl free__7JKRHeapFPv
/* 802D5368 002D22A8 88 1F 00 10 */ lbz r0, 0x10(r31)
include/JSystem/JKernel/JKRFileCache/asm/func_802D551C.s
+2 -2
View File
@@ -17,7 +17,7 @@
/* 802D5554 002D2494 48 09 36 91 */ bl strlen
/* 802D5558 002D2498 38 9F 00 02 */ addi r4, r31, 2
/* 802D555C 002D249C 7C 83 22 14 */ add r4, r3, r4
/* 802D5560 002D24A0 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D5560 002D24A0 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D5564 002D24A4 38 A0 00 01 */ li r5, 1
/* 802D5568 002D24A8 4B FF 8F 6D */ bl alloc__7JKRHeapFUli
/* 802D556C 002D24AC 7C 60 1B 78 */ mr r0, r3
@@ -48,7 +48,7 @@ lbl_802D55B8:
/* 802D55C8 002D2508 48 09 36 1D */ bl strlen
/* 802D55CC 002D250C 38 9F 00 02 */ addi r4, r31, 2
/* 802D55D0 002D2510 7C 83 22 14 */ add r4, r3, r4
/* 802D55D4 002D2514 80 6D 8D F0 */ lwz r3, lbl_80451370-_SDA_BASE_(r13)
/* 802D55D4 002D2514 80 6D 8D F0 */ lwz r3, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D55D8 002D2518 38 A0 00 01 */ li r5, 1
/* 802D55DC 002D251C 4B FF 8E F9 */ bl alloc__7JKRHeapFUli
/* 802D55E0 002D2520 7C 60 1B 78 */ mr r0, r3