diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 1b6259ed..765a1871 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -40264,11 +40264,11 @@ somePtr__4mDvd = .sbss:0x80575C10; // type:object size:0x4 data:4byte someNumber__4mDvd = .sbss:0x80575C14; // type:object size:0x4 data:4byte compressors_ptr__4mDvd = .sbss:0x80575C18; // type:object size:0x4 data:4byte compressors_last__4mDvd = .sbss:0x80575C1C; // type:object size:0x4 data:4byte -sOsThread__4mDvd = .sbss:0x80575C20; // type:object size:0x4 data:4byte -sThread__4mDvd = .sbss:0x80575C24; // type:object size:0x4 data:4byte -sCommandHeap__4mDvd = .sbss:0x80575C28; // type:object size:0x4 data:4byte -sArchiveHeap__4mDvd = .sbss:0x80575C2C; // type:object size:0x4 data:4byte -isAutoStreamDecomp__4mDvd = .sbss:0x80575C30; // type:object size:0x1 data:byte +l_OSThread__4mDvd = .sbss:0x80575C20; // type:object size:0x4 data:4byte +l_MyThread__4mDvd = .sbss:0x80575C24; // type:object size:0x4 data:4byte +l_CommandHeap__4mDvd = .sbss:0x80575C28; // type:object size:0x4 data:4byte +l_ArchiveHeap__4mDvd = .sbss:0x80575C2C; // type:object size:0x4 data:4byte +l_IsAutoStreamDecomp__4mDvd = .sbss:0x80575C30; // type:object size:0x1 data:byte @GUARD@loadToMainRAM__4mDvdFiPcPQ23EGG4HeapQ33EGG9DvdRipper15EAllocDirectionlPUlPUlUl@DvdFile = .sbss:0x80575C31; // type:object size:0x1 data:byte mInstance__12mDvd_param_c = .sbss:0x80575C34; // type:object size:0x4 data:4byte s_SavedCurrentHeap__5mHeap = .sbss:0x80575C38; // type:object size:0x4 data:4byte @@ -49068,11 +49068,11 @@ m_searchManage__10fManager_c = .bss:0x805B8548; // type:object size:0x40 lbl_805B8588 = .bss:0x805B8588; // type:object size:0xC lbl_805B8594 = .bss:0x805B8594; // type:object size:0xC lbl_805B85A0 = .bss:0x805B85A0; // type:object size:0x20 data:4byte -DECOMP_SZS__4mDvd = .bss:0x805B85C0; // type:object size:0xC data:4byte -DECOMP_LZ__4mDvd = .bss:0x805B85CC; // type:object size:0xC data:4byte -DECOMP_LH__4mDvd = .bss:0x805B85D8; // type:object size:0xC data:4byte -DECOMP_LRC__4mDvd = .bss:0x805B85E4; // type:object size:0xC data:4byte -DECOMP_RL__4mDvd = .bss:0x805B85F0; // type:object size:0xC data:4byte +s_UncompressInfoSZS__4mDvd = .bss:0x805B85C0; // type:object size:0xC data:4byte +s_UncompressInfoLZ__4mDvd = .bss:0x805B85CC; // type:object size:0xC data:4byte +s_UncompressInfoLH__4mDvd = .bss:0x805B85D8; // type:object size:0xC data:4byte +s_UncompressInfoLRC__4mDvd = .bss:0x805B85E4; // type:object size:0xC data:4byte +s_UncompressInfoRL__4mDvd = .bss:0x805B85F0; // type:object size:0xC data:4byte likely_align__4mDvd = .bss:0x805B85FC; // type:object size:0x7A04 more_empty_space__4mDvd = .bss:0x805C0000; // type:object size:0x1638 decompressor_alloc_space__4mDvd = .bss:0x805C1638; // type:object size:0x9930 diff --git a/configure.py b/configure.py index 30824191..571a23f9 100644 --- a/configure.py +++ b/configure.py @@ -301,7 +301,7 @@ config.libs = [ Object(Matching, "f/f_list.cpp"), Object(Matching, "f/f_manager.cpp"), Object(Matching, "m/m_angle.cpp"), - Object(NonMatching, "m/m_dvd.cpp"), + Object(Matching, "m/m_dvd.cpp"), Object(Matching, "m/m_heap.cpp"), Object(NonMatching, "m/m_mtx.cpp"), # framework (f_name) diff --git a/src/m/m_dvd.cpp b/src/m/m_dvd.cpp index 7aff42d9..1e6e9a64 100644 --- a/src/m/m_dvd.cpp +++ b/src/m/m_dvd.cpp @@ -13,11 +13,11 @@ namespace mDvd { -TUncompressInfo_c DECOMP_SZS(3, ".szs"); -TUncompressInfo_c DECOMP_LZ(5, ".LZ"); -TUncompressInfo_c DECOMP_LH(7, ".LH"); -TUncompressInfo_c DECOMP_LRC(8, ".LRC"); -TUncompressInfo_c DECOMP_RL(4, ".RL"); +TUncompressInfo_c s_UncompressInfoSZS(3, ".szs"); +TUncompressInfo_c s_UncompressInfoLZ(5, ".LZ"); +TUncompressInfo_c s_UncompressInfoLH(7, ".LH"); +TUncompressInfo_c s_UncompressInfoLRC(8, ".LRC"); +TUncompressInfo_c s_UncompressInfoRL(4, ".RL"); // TODO This the space within which the actual decompressors // are allocated. @@ -28,7 +28,7 @@ char decompressor_alloc_space[0x9930]; mDvd_param_c DVD_MANAGER; TUncompressInfo_Base_c *decompressorPtrs[1] = { - &DECOMP_LZ, + &s_UncompressInfoLZ, }; u8 g_mountDirection = 1; @@ -38,11 +38,11 @@ void *somePtr; u32 someNumber; TUncompressInfo_Base_c **compressors_ptr; TUncompressInfo_Base_c **compressors_last; -OSThread *sOsThread; -mDvd::MyThread_c *sThread; -EGG::Heap *sCommandHeap; -EGG::Heap *sArchiveHeap; -bool isAutoStreamDecomp; +OSThread *l_OSThread; +mDvd::MyThread_c *l_MyThread; +EGG::Heap *l_CommandHeap; +EGG::Heap *l_ArchiveHeap; +bool l_IsAutoStreamDecomp; /** 802eece0 */ extern "C" void fn_802EECE0(TUncompressInfo_Base_c **ptr, TUncompressInfo_Base_c **last) { @@ -88,11 +88,11 @@ void deleteUncompressObj(u8 type) { } OSThread *getOSThread() { - return sOsThread; + return l_OSThread; } EGG::Heap *getArchiveHeap() { - return sArchiveHeap; + return l_ArchiveHeap; } /** 802eee10 */ @@ -111,15 +111,15 @@ void *MyThread_c::run() { /** 802eeea0 */ void create(int priority, EGG::Heap *commandHeap, EGG::Heap *archiveHeap, EGG::Heap *threadHeap) { - sCommandHeap = commandHeap; - sArchiveHeap = archiveHeap; + l_CommandHeap = commandHeap; + l_ArchiveHeap = archiveHeap; mDvd::MyThread_c *thread = new (threadHeap, 0x04) mDvd::MyThread_c(priority, threadHeap); - sThread = thread; - sOsThread = thread->getMyOsThread(); + l_MyThread = thread; + l_OSThread = thread->getMyOsThread(); if (mHeap::g_assertHeap != nullptr) { thread->setThreadHeap((EGG::Heap *)mHeap::g_assertHeap); } - OSResumeThread(sThread->getMyOsThread()); + OSResumeThread(l_MyThread->getMyOsThread()); } /** 802eef30 */ @@ -180,11 +180,11 @@ mDvd_command_c::~mDvd_command_c() { /** 802ef130 */ void *mDvd_command_c::operator new(size_t size) { - return EGG::Heap::alloc(size, -4, mDvd::sCommandHeap); + return EGG::Heap::alloc(size, -4, mDvd::l_CommandHeap); } void mDvd_command_c::operator delete(void *ptr) { - EGG::Heap::free(ptr, mDvd::sCommandHeap); + EGG::Heap::free(ptr, mDvd::l_CommandHeap); } /** 802ef150 */ @@ -394,8 +394,8 @@ int findPathWithCompressedExtension(const char *name, u8 *outType) { goto end; } } - // No compressed version found *end = '\0'; + // No compressed version found end = strrchr(buf, '/'); if (end == nullptr) { end = buf; @@ -424,12 +424,12 @@ end: /** 802ef930 */ void setAutoStreamDecomp(bool arg) { - mDvd::isAutoStreamDecomp = arg; + mDvd::l_IsAutoStreamDecomp = arg; } /** 802ef940 */ bool getAutoStreamDecomp() { - return mDvd::isAutoStreamDecomp; + return mDvd::l_IsAutoStreamDecomp; } /** 802ef950 */ @@ -476,7 +476,7 @@ u32 mDvd_mountMemArchive_c::execute() { void *data; EGG::Heap *heap; - heap = mHeap != nullptr ? mHeap : mDvd::sArchiveHeap; + heap = mHeap != nullptr ? mHeap : mDvd::l_ArchiveHeap; archive = nullptr; allocDirection = mMountDirection == 1 ? EGG::DvdRipper::ALLOC_DIR_TOP : EGG::DvdRipper::ALLOC_DIR_BOTTOM; @@ -573,7 +573,7 @@ extern "C" mDvd_toMainRam_arc_c *fn_802EFE90(EGG::Archive *arc, const char *path /** 802efec0 */ u32 mDvd_toMainRam_arc_c::execute() { - EGG::Heap *heap = mHeap != nullptr ? mHeap : mDvd::sArchiveHeap; + EGG::Heap *heap = mHeap != nullptr ? mHeap : mDvd::l_ArchiveHeap; mDataPtr = mArcPtr->getFileFast(mEntryNum, heap, mMountDirection == 1 ? 0x20 : -0x20); waitDone(); return (bool)mDataPtr; @@ -627,7 +627,7 @@ u32 mDvd_toMainRam_normal_c::execute() { // TODO u32 p6; u32 p7; - EGG::Heap *heap = mHeap != nullptr ? mHeap : mDvd::sArchiveHeap; + EGG::Heap *heap = mHeap != nullptr ? mHeap : mDvd::l_ArchiveHeap; EGG::DvdRipper::EAllocDirection allocDirection = mMountDirection == 1 ? EGG::DvdRipper::ALLOC_DIR_TOP : EGG::DvdRipper::ALLOC_DIR_BOTTOM; mDataPtr = mDvd::loadToMainRAM(mEntryNum, 0, heap, allocDirection, 0, &p6, &p7, mCompressionType2);