wip

Author: Ziemas

game/CMakeLists.txt

@@ -254,6 +254,7 @@ set(RUNTIME_SOURCE
         overlord/jak3/start.cpp
         overlord/jak3/iso_api.cpp
         overlord/jak3/iso_fake.cpp
+        overlord/jak3/iso_queue.cpp
         overlord/jak3/iso.cpp
         overlord/jak3/overlord.cpp
         overlord/jak3/pagemanager.cpp

game/overlord/jak3/iso.cpp

@@ -5,9 +5,11 @@
 #include "common/log/log.h"
 
 #include "game/common/dgo_rpc_types.h"
+#include "game/overlord/common/isocommon.h"
 #include "game/overlord/jak3/basefilesystem.h"
 #include "game/overlord/jak3/iso_api.h"
 #include "game/overlord/jak3/iso_fake.h"
+#include "game/overlord/jak3/iso_queue.h"
 #include "game/overlord/jak3/stream.h"
 
 namespace jak3 {
@@ -20,6 +22,8 @@ int g_nSTRThreadID;
 int g_nPlayThreadID;
 int g_nISOMbx;
 VagDirJak3 g_VagDir;
+char g_szCurrentMusicName[16];
+char g_szTargetMusicName[16];
 
 static int s_nISOInitFlag;
 static ISO_LoadDGO s_LoadDGO;
@@ -30,6 +34,7 @@ static int s_nDGOMbx;
 
 static u32 DGOThread();
 u32 ISOThread();
+int NullCallback(ISO_Msg* msg);
 
 /* COMPLETE */
 void InitDriver() {
@@ -135,9 +140,35 @@ const ISOFileDef* FindIsoFile(const char* name) {
 }
 
 u32 ISOThread() {
+  ISO_Msg* msg;
+
+  g_szCurrentMusicName[0] = '\0';
+  g_szTargetMusicName[0] = '\0';
+  InitBuffers();
+  // InitVagCmds();
+
   InitDriver();
 
   while (true) {
+    int res = PollMbx((MsgPacket**)&msg, g_nISOMbx);
+    if (res == KE_OK) {
+      msg->SetActive(false);
+      msg->SetUnk1(false);
+      msg->SetUnk2(false);
+      msg->file = nullptr;
+      msg->callback = NullCallback;
+
+      switch (msg->msg_kind) {
+        case LOAD_TO_EE_CMD_ID:
+        case LOAD_TO_IOP_CMD_ID:
+        case LOAD_TO_EE_OFFSET_CMD_ID:
+          break;
+        default:
+          lg::error("unhandled iso msg type {:x}", msg->msg_kind);
+          break;
+      }
+    }
+
     DelayThread(4000);
   }
 
@@ -208,4 +239,37 @@ s32 GetISOFileLength(const ISOFileDef* fd) {
   return g_pFileSystem->GetLength(fd);
 }
 
+int NullCallback(ISO_Msg* msg) {
+  return 7;
+}
+
+void ISO_Hdr::SetActive(bool b) {
+  m_bActive = b;
+}
+
+void ISO_Hdr::SetUnk1(bool b) {
+  unk1 = b;
+}
+
+void ISO_Hdr::SetUnk2(bool b) {
+  unk2 = b;
+}
+
+void ISOBuffer::AdjustDataLength(int size) {
+  int state;
+
+  CpuSuspendIntr(&state);
+  decompressed_size -= size;
+  CpuResumeIntr(state);
+}
+
+void ISOBuffer::AdvanceCurrentData(int size) {
+  int state;
+
+  CpuSuspendIntr(&state);
+  decomp_buffer += size;
+  decompressed_size -= size;
+  CpuResumeIntr(state);
+}
+
 }  // namespace jak3

game/overlord/jak3/iso.h

@@ -13,16 +13,16 @@ struct ISO_Hdr {
   bool unk1;
   bool unk2;
 
-  void SetActive();
-  void SetUnk1();
-  void SetUnk2();
+  void SetActive(bool b);
+  void SetUnk1(bool b);
+  void SetUnk2(bool b);
 };
 
 struct ISO_Msg : ISO_Hdr {
-  u32 cmd_kind;
+  u32 msg_kind;
   int mbx_to_reply;
   int thread_id;
-  void* callback;
+  int (*callback)(ISO_Msg*);
   CBaseFile* file;
 };
 

game/overlord/jak3/iso_api.cpp

@@ -11,7 +11,7 @@ using namespace iop;
 u32 LoadISOFileToIOP(const ISOFileDef* file, void* addr, u32 length) {
   ISO_LoadSingle msg;
 
-  msg.cmd_kind = 0x101;
+  msg.msg_kind = 0x101;
   msg.mbx_to_reply = 0;
   msg.thread_id = GetThreadId();
   msg.fd = file;

game/overlord/jak3/iso_queue.cpp

@@ -0,0 +1,35 @@
+#include "iso_queue.h"
+
+#include "game/overlord/jak3/pagemanager.h"
+#include "game/sce/iop.h"
+
+namespace jak3 {
+using namespace iop;
+
+constexpr int N_VAG_CMDS = 6;
+
+u32 g_auStreamSRAM[N_VAG_CMDS];
+u32 g_auTrapSRAM[N_VAG_CMDS];
+int g_nPriQueueSema;
+int g_nISOSema;
+
+CPageManager g_PageManager;
+
+void InitBuffers() {
+  SemaParam semap;
+
+  semap.init_count = 1;
+  semap.max_count = 1;
+  semap.attr = 0;
+  semap.option = 0;
+  g_nPriQueueSema = CreateSema(&semap);
+
+  g_PageManager.Initialize();
+
+  semap.init_count = 1;
+  semap.max_count = 1;
+  semap.attr = SA_THPRI;
+  semap.option = 0;
+  g_nISOSema = CreateSema(&semap);
+}
+}  // namespace jak3

game/overlord/jak3/iso_queue.h

@@ -0,0 +1,8 @@
+#ifndef ISO_QUEUE_H_
+#define ISO_QUEUE_H_
+
+namespace jak3 {
+void InitBuffers();
+}
+
+#endif  // ISO_QUEUE_H_

game/overlord/jak3/iso_structs.h

@@ -10,7 +10,7 @@ enum class EFileComp { MODE0, MODE1, KNOWN_NOT_BLZO };
 
 struct ISOBuffer {
   CPageManager::CPageList* m_pActivePages;
-  void* decomp_buffer;
+  u8* decomp_buffer;
   int decompressed_size;
 
   void AdjustDataLength(int);

game/overlord/jak3/pagemanager.cpp

@@ -1,6 +1,12 @@
 #include "pagemanager.h"
 
+#include "game/sce/iop.h"
+
 namespace jak3 {
+using namespace iop;
+
+static constexpr u32 PAGE_SIZE = 0x8010;
+static constexpr u32 NUM_PAGES = 29;
 
 static inline int ctz(u32 x) {
   // Isolate lowest bit and subtract 1
@@ -17,4 +23,51 @@ static inline int ctz(u32 x) {
   return static_cast<int>(x);
 }
 
+CPageManager::CPage::CPage(u8* start, u8* end, int page_id) {
+  m_pNextPage = nullptr;
+  m_uPageBit = 1 << (page_id & 0x1f);
+  m_nUnk = 0;
+  m_pData = start;
+  m_pEnd = end;
+  m_nRefCount = 0;
+  m_nPageID = page_id;
+  m_nDmaRefCount = 0;
+  m_nAllocState = 0;
+  m_nUnk2 = 0;
+}
+
+void CPageManager::Initialize() {
+  m_Cache.Initialize();
+}
+
+CPageManager::CCache::CCache() {
+  m_paCache = nullptr;
+  m_uAllocatedPageMap = 0;
+  m_uFreePageMap = (1 << NUM_PAGES) - 1;
+}
+
+int CPageManager::CCache::Initialize() {
+  m_paCache = AllocSysMemory(0, PAGE_SIZE * NUM_PAGES, nullptr);
+  if (!m_paCache) {
+    return 1;
+  }
+
+  m_nNumFree = 29;
+
+  /* TODO FIXME */
+  for (auto& pl : m_aPageLists) {
+  }
+
+  int page_idx = 0;
+  u8* page_start = (u8*)m_paCache;
+  for (auto& page : m_aPages) {
+    page = CPage(page_start, page_start + 0x7fff, page_idx);
+
+    page_start += PAGE_SIZE;
+    page_idx++;
+  }
+
+  return 0;
+}
+
 }  // namespace jak3

game/overlord/jak3/pagemanager.h

@@ -5,14 +5,30 @@
 namespace jak3 {
 class CPageManager {
  public:
+  class CPageList;
+
   class CPage {
    public:
+    CPage() = default;
     CPage(u8*, u8*, int);
     int AddRef();
     int ReleaseRef();
     int AddDmaRef();
     int ReleaseDmaRef();
     void FromPagesCopy(u8* pInPageData, u8* pDest, int nNumBytes);
+
+   private:
+    CPage* m_pNextPage;
+    u32 m_uPageBit;
+    u32 m_nUnk;
+    CPageList* m_pPageList;
+    u8* m_pData;
+    u8* m_pEnd;  // maybe
+    u32 m_nRefCount;
+    u32 m_nDmaRefCount;
+    int m_nPageID;
+    int m_nAllocState;
+    int m_nUnk2;
   };
 
   class CPageList {
@@ -33,7 +49,17 @@ class CPageManager {
  private:
   class CCache {
    public:
+    CCache();
     int Initialize();
+
+   private:
+    int m_nEventFlag;
+    void* m_paCache;
+    CPageList m_aPageLists[29];
+    CPage m_aPages[29];
+    u32 m_uAllocatedPageMap;
+    u32 m_uFreePageMap;
+    int m_nNumFree;
   };
   CCache m_Cache;
 };