mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

JASHeapCtrl OK (#2893)

Browse Source
This commit is contained in:
LagoLunatic
2025-11-30 00:30:50 -05:00
committed by GitHub
parent 1be301393b
commit 7abe8d4a40
5 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JAudio2/JASHeapCtrl.h
+12 -7
View File
@@ -26,7 +26,6 @@ public:
/* 802906F0 */ JASHeap* getTailHeap();
/* 8029077C */ u32 getTailOffset();
/* 802907E0 */ u32 getCurOffset();
/* 80290B54 */ ~JASHeap() {}
void* getBase() { return mBase; }
bool isAllocated() { return mBase; }
@@ -70,7 +69,11 @@ namespace JASThreadingModel {
};
template <typename A0>
struct ObjectLevelLockable {
struct ObjectLevelLockable : public OSMutex {
ObjectLevelLockable() {
OSInitMutex(this);
}
struct Lock {
Lock(A0 const& mutex) {
mMutex = (A0*)&mutex;
@@ -84,7 +87,7 @@ namespace JASThreadingModel {
A0* mMutex;
};
};
};
}; // namespace JASThreadingModel
/**
* @ingroup jsystem-jaudio
@@ -113,7 +116,7 @@ namespace JASKernel { JKRHeap* getSystemHeap(); };
*
*/
template<u32 ChunkSize, template<typename> class T>
class JASMemChunkPool : public OSMutex {
class JASMemChunkPool : public T<JASMemChunkPool<ChunkSize, T> >::ObjectLevelLockable {
struct MemoryChunk {
MemoryChunk(MemoryChunk* nextChunk) {
mNextChunk = nextChunk;
@@ -163,9 +166,9 @@ class JASMemChunkPool : public OSMutex {
};
public:
JASMemChunkPool() {
OSInitMutex(this);
field_0x18 = NULL;
createNewChunk();
bool ret = createNewChunk();
JUT_ASSERT(320, ret);
}
bool createNewChunk() {
@@ -179,6 +182,7 @@ public:
if (field_0x18 != NULL) {
uVar2 = 1;
} else {
JUT_WARN(428, "%s", "Not enough JASSystemHeap");
field_0x18 = new (JKRHeap::getSystemHeap(), 0) MemoryChunk(pMVar4);
if (field_0x18 != NULL) {
uVar2 = 1;
@@ -193,7 +197,8 @@ public:
void* alloc(u32 size) {
typename T<JASMemChunkPool<ChunkSize, T> >::Lock lock(*this);
if (field_0x18->getFreeSize() < size) {
u32 freeSize = field_0x18->getFreeSize();
if (freeSize < size) {
if (ChunkSize < size) {
return NULL;
}
include/JSystem/JAudio2/JASMutex.h
+1 -1
View File
@@ -10,7 +10,7 @@
struct JASMutexLock {
JASMutexLock(OSMutex* mutex) {
mMutex = mutex;
OSLockMutex(mMutex);
OSLockMutex(mutex);
}
~JASMutexLock() { OSUnlockMutex(mMutex); }
include/JSystem/JSupport/JSUList.h
+6 -6
View File
@@ -196,19 +196,19 @@ public:
JSUTree<T>* getEndChild() const { return NULL; }
JSUTree<T>* getFirstChild() const { return (JSUTree<T>*)this->getFirst(); }
JSUTree<T>* getFirstChild() const { return (JSUTree<T>*)this->getFirstLink(); }
JSUTree<T>* getLastChild() const { return (JSUTree<T>*)this->getLast(); }
JSUTree<T>* getLastChild() const { return (JSUTree<T>*)this->getLastLink(); }
JSUTree<T>* getNextChild() const { return (JSUTree<T>*)this->getNext(); }
JSUTree<T>* getNextChild() const { return (JSUTree<T>*)JSUPtrLink::mNext; }
JSUTree<T>* getPrevChild() const { return (JSUTree<T>*)this->getPrev(); }
JSUTree<T>* getPrevChild() const { return (JSUTree<T>*)JSUPtrLink::mPrev; }
u32 getNumChildren() const { return this->getNumLinks(); }
T* getObject() const { return (T*)this->getObjectPtr(); }
T* getObject() const { return (T*)JSUPtrLink::mObject; }
JSUTree<T>* getParent() const { return (JSUTree<T>*)this->getList(); }
JSUTree<T>* getParent() const { return (JSUTree<T>*)JSUPtrLink::mList; }
};
/**