JKRAramBlock OK (#52)

Co-authored-by: Julgodis <>
This commit is contained in:
Jonathan Wase
2021-01-02 16:32:34 +01:00
committed by GitHub
parent 052119c7a7
commit 54cef5c777
7 changed files with 58 additions and 185 deletions
+50 -12
View File
@@ -1,22 +1,60 @@
#include "JSystem/JKernel/JKRAramBlock/JKRAramBlock.h"
#include "global.h"
asm JKRAramBlock::JKRAramBlock(u32, u32, u32, u8, bool) {
nofralloc
#include "JSystem/JKernel/JKRAramBlock/asm/func_802D3304.s"
#include "JSystem/JKernel/JKRAramHeap/JKRAramHeap.h"
JKRAramBlock::JKRAramBlock(u32 address, u32 size, u32 freeSize, u8 groupId, bool isTempMemory)
: mBlockLink(this) {
this->mAddress = address;
this->mSize = size;
this->mFreeSize = freeSize;
this->mGroupId = groupId;
this->mIsTempMemory = isTempMemory;
}
asm JKRAramBlock::~JKRAramBlock(void) {
nofralloc
#include "JSystem/JKernel/JKRAramBlock/asm/func_802D3378.s"
JKRAramBlock::~JKRAramBlock() {
JSUList<JKRAramBlock>* list = this->mBlockLink.getSupervisor();
JSULink<JKRAramBlock>* prev = this->mBlockLink.getPrev();
if (prev) {
JKRAramBlock* block = prev->getObject();
block->mFreeSize = this->mSize + this->mFreeSize + block->mFreeSize;
list->remove(&this->mBlockLink);
} else {
this->mFreeSize = this->mFreeSize + this->mSize;
this->mSize = 0;
}
}
asm void JKRAramBlock::allocHead(u32, u8, JKRAramHeap*) {
nofralloc
#include "JSystem/JKernel/JKRAramBlock/asm/func_802D3434.s"
JKRAramBlock* JKRAramBlock::allocHead(u32 size, u8 groupId, JKRAramHeap* aramHeap) {
u32 address = this->mAddress;
u32 usedSize = this->mSize;
u32 nextAddress = address + usedSize;
u32 freeSize = this->mFreeSize;
u32 nextFreeSize = freeSize - size;
JKRAramBlock* block = new (aramHeap->getMgrHeap(), 0)
JKRAramBlock(nextAddress, size, nextFreeSize, groupId, false);
this->mFreeSize = 0;
JSULink<JKRAramBlock>* next = this->mBlockLink.getNext();
JSUList<JKRAramBlock>* list = this->mBlockLink.getSupervisor();
list->insert(next, &block->mBlockLink);
return block;
}
asm void JKRAramBlock::allocTail(u32, u8, JKRAramHeap*) {
nofralloc
#include "JSystem/JKernel/JKRAramBlock/asm/func_802D34D0.s"
JKRAramBlock* JKRAramBlock::allocTail(u32 size, u8 groupId, JKRAramHeap* aramHeap) {
u32 freeSize = this->mFreeSize;
u32 address = this->mAddress;
u32 usedSize = this->mSize;
u32 endAddress = address + usedSize + freeSize;
u32 tailAddress = endAddress - size;
JKRAramBlock* block =
new (aramHeap->getMgrHeap(), 0) JKRAramBlock(tailAddress, size, 0, groupId, true);
this->mFreeSize -= size;
JSULink<JKRAramBlock>* next = this->mBlockLink.getNext();
JSUList<JKRAramBlock>* list = this->mBlockLink.getSupervisor();
list->insert(next, &block->mBlockLink);
return block;
}