From ca71275bbecc7db9a4eeca3a6ac4215b66de4318 Mon Sep 17 00:00:00 2001
From: TakaRikka <38417346+TakaRikka@users.noreply.github.com>
Date: Mon, 19 Dec 2022 11:06:32 -0800
Subject: big d_a_alink pass (#214)

* d_a_alink pass1 wip

* more d_a_alink work

* remove asm

* more daalink work

* 20% dol code decompiled

* fixed some nonmatchings for building

* a few daalink functions and labeling some HIO data
---
 include/JSystem/JKernel/JKRArchive.h   | 7 +++----
 include/JSystem/JKernel/JKRDvdFile.h   | 2 +-
 include/JSystem/JKernel/JKRSolidHeap.h | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'include/JSystem/JKernel')

diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h
index c9767d3a7e..b339fb71ef 100644
--- a/include/JSystem/JKernel/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive.h
@@ -62,7 +62,7 @@ public:
         u32 name_offset;
         u16 field_0x8;
         u16 num_entries;
-        s32 first_file_index;
+        u32 first_file_index;
     };
 
     struct SDIFileEntry {
@@ -163,8 +163,9 @@ public:
     /* vt[19] */ virtual u32 getExpandSize(SDIFileEntry*) const;
 
     u32 countFile() const { return mArcInfoBlock->num_file_entries; }
+    s32 countDirectory() const { return mArcInfoBlock->num_nodes; }
 
-protected:
+public:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRFileLoader
     /* 0x38 */ JKRHeap* mHeap;
@@ -173,8 +174,6 @@ protected:
     /* 0x40 */ s32 mEntryNum;
     /* 0x44 */ SArcDataInfo* mArcInfoBlock;
     /* 0x48 */ SDIDirEntry* mNodes;
-
-public:
     /* 0x4C */ SDIFileEntry* mFiles;
 
 protected:
diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile.h
index 4a9daa94e7..ecb722531a 100644
--- a/include/JSystem/JKernel/JKRDvdFile.h
+++ b/include/JSystem/JKernel/JKRDvdFile.h
@@ -31,7 +31,7 @@ public:
     /* vt[07] */ virtual s32 getFileSize(void) const;          /* override */
     /* vt[08] */ virtual bool open(s32);
 
-private:
+// private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRFile
     /* 0x1C */ OSMutex mMutex1;
diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h
index a61e8cc78b..f3058bb029 100644
--- a/include/JSystem/JKernel/JKRSolidHeap.h
+++ b/include/JSystem/JKernel/JKRSolidHeap.h
@@ -21,7 +21,7 @@ protected:
     void* allocFromHead(u32, int);
     void* allocFromTail(u32, int);
 
-    s32 getUsedSize() { return mSize - getTotalFreeSize(); }
+    static s32 getUsedSize(JKRSolidHeap* heap) { return heap->mSize - heap->getTotalFreeSize(); }
 
 public:
     /* vt[04] */ virtual u32 getHeapType(void); /* override */
-- 
cgit v1.2.3