mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-04 09:11:42 -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/JKRThread/JKRThread.h
+4 -1
View File
@@ -26,6 +26,7 @@ public:
JKRHeap* getCurrentHeap() const { return mCurrentHeap; }
JKRHeap* getCurrentHeapError() const { return mCurrentHeapError; }
protected:
void resume() { OSResumeThread(mThreadRecord); }
void sendMessage(OSMessage message) {
OSSendMessage(&mMessageQueue, message, OS_MESSAGE_NON_BLOCKING);
@@ -70,7 +71,9 @@ private:
public:
static void* start(void* param_1);
static JKRThread* searchThread(OSThread* thread);
static JSUList<JKRThread>* getList() { return &lbl_8043428C; }
static JSUList<JKRThread>& getList() { return sThreadList; }
static JSUList<JKRThread> sThreadList;
};
class JKRThreadSwitch {
include/JSystem/JKernel/JKRThread/asm/func_802D1568.s
+1 -1
View File
@@ -24,7 +24,7 @@
/* 802D15C4 002CE504 4B FF D2 79 */ bl findFromRoot__7JKRHeapFPv
/* 802D15C8 002CE508 7C 64 1B 79 */ or. r4, r3, r3
/* 802D15CC 002CE50C 40 82 00 08 */ bne lbl_802D15D4
/* 802D15D0 002CE510 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13)
/* 802D15D0 002CE510 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
lbl_802D15D4:
/* 802D15D4 002CE514 7F 83 E3 78 */ mr r3, r28
/* 802D15D8 002CE518 7F A5 EB 78 */ mr r5, r29
include/JSystem/JKernel/JKRThread/asm/func_802D1610.s
+1 -1
View File
@@ -23,7 +23,7 @@
/* 802D1668 002CE5A8 90 1B 00 70 */ stw r0, 0x70(r27)
/* 802D166C 002CE5AC 28 1C 00 00 */ cmplwi r28, 0
/* 802D1670 002CE5B0 40 82 00 08 */ bne lbl_802D1678
/* 802D1674 002CE5B4 83 8D 8D F4 */ lwz r28, lbl_80451374-_SDA_BASE_(r13)
/* 802D1674 002CE5B4 83 8D 8D F4 */ lwz r28, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13)
lbl_802D1678:
/* 802D1678 002CE5B8 7F 63 DB 78 */ mr r3, r27
/* 802D167C 002CE5BC 7F 84 E3 78 */ mr r4, r28
include/JSystem/JKernel/JKRThread/asm/func_802D16B8.s
+1 -1
View File
@@ -28,7 +28,7 @@
/* 802D1724 002CE664 80 1E 03 04 */ lwz r0, 0x304(r30)
/* 802D1728 002CE668 90 1D 00 58 */ stw r0, 0x58(r29)
/* 802D172C 002CE66C 7F A3 EB 78 */ mr r3, r29
/* 802D1730 002CE670 80 8D 8D F0 */ lwz r4, lbl_80451370-_SDA_BASE_(r13)
/* 802D1730 002CE670 80 8D 8D F0 */ lwz r4, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D1734 002CE674 7F E5 FB 78 */ mr r5, r31
/* 802D1738 002CE678 48 00 00 F9 */ bl setCommon_mesgQueue__9JKRThreadFP7JKRHeapi
/* 802D173C 002CE67C 7F A3 EB 78 */ mr r3, r29
include/JSystem/JKernel/JKRThread/asm/func_802D1758.s
+2 -2
View File
@@ -9,8 +9,8 @@
/* 802D1778 002CE6B8 3C 60 80 3D */ lis r3, lbl_803CC114@ha
/* 802D177C 002CE6BC 38 03 C1 14 */ addi r0, r3, lbl_803CC114@l
/* 802D1780 002CE6C0 90 1E 00 00 */ stw r0, 0(r30)
/* 802D1784 002CE6C4 3C 60 80 43 */ lis r3, lbl_8043428C@ha
/* 802D1788 002CE6C8 38 63 42 8C */ addi r3, r3, lbl_8043428C@l
/* 802D1784 002CE6C4 3C 60 80 43 */ lis r3, sThreadList__9JKRThread@ha
/* 802D1788 002CE6C8 38 63 42 8C */ addi r3, r3, sThreadList__9JKRThread@l
/* 802D178C 002CE6CC 38 9E 00 18 */ addi r4, r30, 0x18
/* 802D1790 002CE6D0 48 00 A9 CD */ bl remove__10JSUPtrListFP10JSUPtrLink
/* 802D1794 002CE6D4 80 1E 00 28 */ lwz r0, 0x28(r30)
include/JSystem/JKernel/JKRThread/asm/func_802D1830.s
+2 -2
View File
@@ -15,8 +15,8 @@
/* 802D1868 002CE7A8 80 9F 00 50 */ lwz r4, 0x50(r31)
/* 802D186C 002CE7AC 80 BF 00 54 */ lwz r5, 0x54(r31)
/* 802D1870 002CE7B0 48 06 D1 25 */ bl OSInitMessageQueue
/* 802D1874 002CE7B4 3C 60 80 43 */ lis r3, lbl_8043428C@ha
/* 802D1878 002CE7B8 38 63 42 8C */ addi r3, r3, lbl_8043428C@l
/* 802D1874 002CE7B4 3C 60 80 43 */ lis r3, sThreadList__9JKRThread@ha
/* 802D1878 002CE7B8 38 63 42 8C */ addi r3, r3, sThreadList__9JKRThread@l
/* 802D187C 002CE7BC 38 9F 00 18 */ addi r4, r31, 0x18
/* 802D1880 002CE7C0 48 00 A6 CD */ bl append__10JSUPtrListFP10JSUPtrLink
/* 802D1884 002CE7C4 38 00 00 00 */ li r0, 0
include/JSystem/JKernel/JKRThread/asm/func_802D1960.s
+2 -2
View File
@@ -1,5 +1,5 @@
/* 802D1960 002CE8A0 3C 80 80 43 */ lis r4, lbl_8043428C@ha
/* 802D1964 002CE8A4 38 84 42 8C */ addi r4, r4, lbl_8043428C@l
/* 802D1960 002CE8A0 3C 80 80 43 */ lis r4, sThreadList__9JKRThread@ha
/* 802D1964 002CE8A4 38 84 42 8C */ addi r4, r4, sThreadList__9JKRThread@l
/* 802D1968 002CE8A8 80 84 00 00 */ lwz r4, 0(r4)
/* 802D196C 002CE8AC 48 00 00 20 */ b lbl_802D198C
lbl_802D1970:
include/JSystem/JKernel/JKRThread/asm/func_802D1A14.s
+1 -1
View File
@@ -4,7 +4,7 @@
/* 802D1A20 002CE960 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802D1A24 002CE964 7C 7F 1B 79 */ or. r31, r3, r3
/* 802D1A28 002CE968 40 82 00 08 */ bne lbl_802D1A30
/* 802D1A2C 002CE96C 83 ED 8D F4 */ lwz r31, lbl_80451374-_SDA_BASE_(r13)
/* 802D1A2C 002CE96C 83 ED 8D F4 */ lwz r31, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13)
lbl_802D1A30:
/* 802D1A30 002CE970 38 60 00 28 */ li r3, 0x28
/* 802D1A34 002CE974 7F E4 FB 78 */ mr r4, r31
include/JSystem/JKernel/JKRThread/asm/func_802D1AE4.s
+8 -8
View File
@@ -15,15 +15,15 @@ lbl_802D1B14:
/* 802D1B18 002CEA58 38 03 00 01 */ addi r0, r3, 1
/* 802D1B1C 002CEA5C 90 0D 8E 34 */ stw r0, lbl_804513B4-_SDA_BASE_(r13)
/* 802D1B20 002CEA60 3B A0 00 00 */ li r29, 0
/* 802D1B24 002CEA64 3C 60 80 43 */ lis r3, lbl_8043428C@ha
/* 802D1B28 002CEA68 83 C3 42 8C */ lwz r30, lbl_8043428C@l(r3)
/* 802D1B24 002CEA64 3C 60 80 43 */ lis r3, sThreadList__9JKRThread@ha
/* 802D1B28 002CEA68 83 C3 42 8C */ lwz r30, sThreadList__9JKRThread@l(r3)
/* 802D1B2C 002CEA6C 48 00 00 FC */ b lbl_802D1C28
lbl_802D1B30:
/* 802D1B30 002CEA70 83 FE 00 00 */ lwz r31, 0(r30)
/* 802D1B34 002CEA74 80 1F 00 2C */ lwz r0, 0x2c(r31)
/* 802D1B38 002CEA78 7C 00 D8 40 */ cmplw r0, r27
/* 802D1B3C 002CEA7C 40 82 00 34 */ bne lbl_802D1B70
/* 802D1B40 002CEA80 80 0D 8D F4 */ lwz r0, lbl_80451374-_SDA_BASE_(r13)
/* 802D1B40 002CEA80 80 0D 8D F4 */ lwz r0, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D1B44 002CEA84 28 00 00 00 */ cmplwi r0, 0
/* 802D1B48 002CEA88 90 1F 00 74 */ stw r0, 0x74(r31)
/* 802D1B4C 002CEA8C 88 1F 00 60 */ lbz r0, 0x60(r31)
@@ -56,10 +56,10 @@ lbl_802D1B9C:
/* 802D1BB0 002CEAF0 7C 9D 23 78 */ mr r29, r4
/* 802D1BB4 002CEAF4 28 04 00 00 */ cmplwi r4, 0
/* 802D1BB8 002CEAF8 40 82 00 0C */ bne lbl_802D1BC4
/* 802D1BBC 002CEAFC 83 AD 8D F4 */ lwz r29, lbl_80451374-_SDA_BASE_(r13)
/* 802D1BBC 002CEAFC 83 AD 8D F4 */ lwz r29, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D1BC0 002CEB00 48 00 00 64 */ b lbl_802D1C24
lbl_802D1BC4:
/* 802D1BC4 002CEB04 80 6D 8D F8 */ lwz r3, lbl_80451378-_SDA_BASE_(r13)
/* 802D1BC4 002CEB04 80 6D 8D F8 */ lwz r3, sRootHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D1BC8 002CEB08 4B FF CF E1 */ bl isSubHeap__7JKRHeapCFP7JKRHeap
/* 802D1BCC 002CEB0C 54 60 06 3F */ clrlwi. r0, r3, 0x18
/* 802D1BD0 002CEB10 40 82 00 54 */ bne lbl_802D1C24
@@ -80,13 +80,13 @@ lbl_802D1C00:
/* 802D1C04 002CEB44 38 63 CF A8 */ addi r3, r3, lbl_8039CFA8@l
/* 802D1C08 002CEB48 38 63 00 34 */ addi r3, r3, 0x34
/* 802D1C0C 002CEB4C 48 01 6A F1 */ bl JUTWarningConsole
/* 802D1C10 002CEB50 83 AD 8D F4 */ lwz r29, lbl_80451374-_SDA_BASE_(r13)
/* 802D1C10 002CEB50 83 AD 8D F4 */ lwz r29, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D1C14 002CEB54 48 00 00 10 */ b lbl_802D1C24
lbl_802D1C18:
/* 802D1C18 002CEB58 83 AD 8D F4 */ lwz r29, lbl_80451374-_SDA_BASE_(r13)
/* 802D1C18 002CEB58 83 AD 8D F4 */ lwz r29, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13)
/* 802D1C1C 002CEB5C 48 00 00 08 */ b lbl_802D1C24
lbl_802D1C20:
/* 802D1C20 002CEB60 83 AD 8D F0 */ lwz r29, lbl_80451370-_SDA_BASE_(r13)
/* 802D1C20 002CEB60 83 AD 8D F0 */ lwz r29, sSystemHeap__7JKRHeap-_SDA_BASE_(r13)
lbl_802D1C24:
/* 802D1C24 002CEB64 83 DE 00 0C */ lwz r30, 0xc(r30)
lbl_802D1C28:
include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s
+2 -2
View File
@@ -26,8 +26,8 @@
/* 802D1CD8 002CEC18 7F A4 EB 78 */ mr r4, r29
/* 802D1CDC 002CEC1C 48 01 5F 5D */ bl JUTConsole_NS_print
lbl_802D1CE0:
/* 802D1CE0 002CEC20 3C 60 80 43 */ lis r3, lbl_8043428C@ha
/* 802D1CE4 002CEC24 83 C3 42 8C */ lwz r30, lbl_8043428C@l(r3)
/* 802D1CE0 002CEC20 3C 60 80 43 */ lis r3, sThreadList__9JKRThread@ha
/* 802D1CE4 002CEC24 83 C3 42 8C */ lwz r30, sThreadList__9JKRThread@l(r3)
/* 802D1CE8 002CEC28 48 00 01 04 */ b lbl_802D1DEC
lbl_802D1CEC:
/* 802D1CEC 002CEC2C 83 3E 00 00 */ lwz r25, 0(r30)