JKRAramHeap and JKRAramPiece (#53)

* renamed func_XXX to _savegpr_XX * renamed func_XXX to _restgpr_XX * renamed func_XXX to _savefpr_XX * renamed func_XXX to _restfpr_XX * cleanup functions.h and moved intrisics to mwcc.h * formatting * cleanup functions.h * Added include/ar/ARQ.h * renamed func_XXX to _savegpr_25 * removed JKRAramPiece asm files * JKRAramHeap OK, JKRAramPiece OK * formatting * more formatting * Added const and removed explicit this-> * fixed merge problems * changed mMessages[1] to mMessage * foramatting Co-authored-by: Julgodis <> Co-authored-by: Pheenoh <pheenoh@gmail.com>
2026-09-09 02:50:06 -04:00 · 2021-01-03 11:29:50 +01:00
parent 0fdce6c042
commit 112e86f0e8
31 changed files with 32859 additions and 726 deletions
@@ -1,49 +1,142 @@
 #include "JSystem/JKernel/JKRAramPiece/JKRAramPiece.h"
 #include "global.h"

-asm void JKRAramPiece::prepareCommand(int, u32, u32, u32, JKRAramBlock*, void (*)(u32)) {
-    nofralloc
-#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3574.s"
+#include "JSystem/JKernel/JKRDecomp/JKRDecomp.h"
+
+JKRAMCommand* JKRAramPiece::prepareCommand(int direction, u32 src, u32 dst, u32 length,
+                                           JKRAramBlock* block,
+                                           JKRAMCommand::AsyncCallback callback) {
+    JKRAMCommand* command = new (JKRHeap::getSystemHeap(), -4) JKRAMCommand();
+    command->mTransferDirection = direction;
+    command->mSrc = src;
+    command->mDst = dst;
+    command->mAramBlock = block;
+    command->mDataLength = length;
+    command->mCallback = callback;
+    return command;
 }

-asm void JKRAramPiece::sendCommand(JKRAMCommand*) {
-    nofralloc
-#include "JSystem/JKernel/JKRAramPiece/asm/func_802D35F4.s"
+void JKRAramPiece::sendCommand(JKRAMCommand* command) {
+    startDMA(command);
 }

-asm void JKRAramPiece::orderAsync(int, u32, u32, u32, JKRAramBlock*, void (*)(u32)) {
-    nofralloc
-#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3614.s"
+JKRAMCommand* JKRAramPiece::orderAsync(int direction, u32 source, u32 destination, u32 length,
+                                       JKRAramBlock* block, JKRAMCommand::AsyncCallback callback) {
+    lock();
+    if (((source & 0x1f) != 0) || ((destination & 0x1f) != 0)) {
+        OSReport(lbl_8039D0B8, direction);           // "direction = %x\n"
+        OSReport(lbl_8039D0B8 + 0x10, source);       // "source = %x\n"
+        OSReport(lbl_8039D0B8 + 0x1D, destination);  // "destination = %x\n"
+        OSReport(lbl_8039D0B8 + 0x2F, length);       // "length = %x\n"
+
+        const char* filename = lbl_8039D0B8 + 0x3C;       // "JKRAramPiece.cpp"§
+        const char* format = lbl_8039D0B8 + 0x3C + 0x11;  // "%s"
+        const char* arg1 = lbl_8039D0B8 + 0x3C + 0x14;    // "illegal address. abort."
+        JUTException_NS_panic_f(filename, 0x6c, format, arg1);
+    }
+
+    Message* message = new (JKRHeap::getSystemHeap(), -4) Message();
+    JKRAMCommand* command =
+        JKRAramPiece::prepareCommand(direction, source, destination, length, block, callback);
+    message->field_0x00 = 1;
+    message->command = command;
+
+    OSSendMessage(&lbl_803CC138, message, OS_MESSAGE_BLOCKING);
+    if (command->mCallback != NULL) {
+        lbl_80434324.append(&command->mPieceLink);
+    }
+
+    unlock();
+    return command;
 }

-asm void JKRAramPiece::sync(JKRAMCommand*, int) {
-    nofralloc
-#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3770.s"
+BOOL JKRAramPiece::sync(JKRAMCommand* command, int is_non_blocking) {
+    OSMessage* message;
+
+    lock();
+    if (is_non_blocking == 0) {
+        OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_BLOCKING);
+        lbl_80434324.remove(&command->mPieceLink);
+        unlock();
+        return TRUE;
+    }
+
+    BOOL result = OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NON_BLOCKING);
+    if (!result) {
+        unlock();
+        return FALSE;
+    }
+
+    lbl_80434324.remove(&command->mPieceLink);
+    unlock();
+    return TRUE;
 }

-asm void JKRAramPiece::orderSync(int, u32, u32, u32, JKRAramBlock*) {
-    nofralloc
-#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3838.s"
+BOOL JKRAramPiece::orderSync(int direction, u32 source, u32 destination, u32 length,
+                             JKRAramBlock* block) {
+    lock();
+
+    JKRAMCommand* command =
+        JKRAramPiece::orderAsync(direction, source, destination, length, block, NULL);
+    BOOL result = JKRAramPiece::sync(command, 0);
+    delete command;
+
+    unlock();
+    return result;
 }

-asm void JKRAramPiece::startDMA(JKRAMCommand*) {
-    nofralloc
-#include "JSystem/JKernel/JKRAramPiece/asm/func_802D38CC.s"
+void JKRAramPiece::startDMA(JKRAMCommand* command) {
+    if (command->mTransferDirection == 1) {
+        DCInvalidateRange((void*)command->mDst, command->mDataLength);
+    } else {
+        DCStoreRange((void*)command->mSrc, command->mDataLength);
+    }
+
+    ARQPostRequest(&command->mRequest, 0, command->mTransferDirection, 0, command->mSrc,
+                   command->mDst, command->mDataLength, JKRAramPiece::doneDMA);
 }

-asm void JKRAramPiece::doneDMA(u32) {
-    nofralloc
-#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3944.s"
+void JKRAramPiece::doneDMA(u32 requestAddress) {
+    JKRAMCommand* command = (JKRAMCommand*)requestAddress;
+
+    if (command->mTransferDirection == 1) {
+        DCInvalidateRange((void*)command->mDst, command->mDataLength);
+    }
+
+    if (command->field_0x60 != 0) {
+        if (command->field_0x60 == 2) {
+            JKRDecomp::sendCommand(command->mDecompCommand);
+        }
+        return;
+    }
+
+    if (command->mCallback) {
+        (*command->mCallback)(requestAddress);
+    } else if (command->field_0x5C) {
+        OSSendMessage(command->field_0x5C, command, OS_MESSAGE_NON_BLOCKING);
+    } else {
+        OSSendMessage(&command->mMessageQueue, command, OS_MESSAGE_NON_BLOCKING);
+    }
 }

-asm JKRAMCommand::JKRAMCommand(void) {
-    nofralloc
-#include "JSystem/JKernel/JKRAramPiece/asm/func_802D39EC.s"
+JKRAMCommand::JKRAMCommand() : mPieceLink(this), field_0x30(this) {
+    OSInitMessageQueue(&mMessageQueue, &mMessage, 1);
+    mCallback = NULL;
+    field_0x5C = NULL;
+    field_0x60 = 0;
+    field_0x8C = NULL;
+    field_0x90 = NULL;
+    field_0x94 = NULL;
 }

-asm JKRAMCommand::~JKRAMCommand() {
-    nofralloc
-#include "JSystem/JKernel/JKRAramPiece/asm/func_802D3A5C.s"
+JKRAMCommand::~JKRAMCommand() {
+    if (field_0x8C)
+        delete field_0x8C;
+    if (field_0x90)
+        delete field_0x90;
+
+    if (field_0x94)
+        JKRHeap::free(field_0x94, NULL);
 }

 #if 0