mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 14:13:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

JKRDecomp OK (#58)

Browse Source 
* JKRDecomp OK

* clang-format tool

* JKRThread cleanup and fixed suggestions

Co-authored-by: Julgodis <>
Co-authored-by: Pheenoh <pheenoh@gmail.com>
This commit is contained in:
Jonathan Wase
2021-01-03 22:19:54 +01:00
committed by GitHub
parent 4e085c9c84
commit 423fdadc32
8 changed files with 320 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JKernel/JKRDecomp/JKRDecomp.h
+37 -7
View File
@@ -4,30 +4,60 @@
#include "JSystem/JKernel/JKRThread/JKRThread.h"
#include "dolphin/types.h"
class JKRAMCommand;
class JKRDecompCommand {
public:
typedef void (*AsyncCallback)(u32);
JKRDecompCommand();
~JKRDecompCommand();
public:
/* 0x00 */ u32 field_0x0;
/* 0x04 */ u8* mSrcBuffer;
/* 0x08 */ u8* mDstBuffer;
/* 0x0C */ u32 mSrcLength;
/* 0x10 */ u32 mDstLength;
/* 0x14 */ AsyncCallback mCallback;
/* 0x18 */ JKRDecompCommand* mThis;
/* 0x1C */ OSMessageQueue* field_0x1c;
/* 0x20 */ s32 field_0x20;
/* 0x24 */ JKRAMCommand* mAMCommand;
/* 0x28 */ OSMessageQueue mMessageQueue;
/* 0x48 */ OSMessage mMessage;
};
#define JKRDECOMP_SYNC_BLOCKING 0
#define JKRDECOMP_SYNC_NON_BLOCKING 1
class JKRDecomp : public JKRThread {
private:
JKRDecomp(long);
virtual ~JKRDecomp(void);
virtual ~JKRDecomp();
/* vt[03] */ virtual void* run(); /* override */
public:
static void create(long);
static void prepareCommand(u8*, u8*, u32, u32, void (*)(u32));
enum Compression {
NONE = 0,
YAY0 = 1,
YAZ0 = 2,
ASR = 3,
__COMPRESSION_ENUM_FORCE_S32 = INT32_MAX,
__COMPRESSION_ENUM_FORCE_SIGNED = -1,
};
static JKRDecomp* create(long);
static JKRDecompCommand* prepareCommand(u8*, u8*, u32, u32, JKRDecompCommand::AsyncCallback);
static void sendCommand(JKRDecompCommand*);
static void sync(JKRDecompCommand*, int);
static void orderAsync(u8*, u8*, u32, u32, void (*)(u32));
static void orderSync(u8*, u8*, u32, u32);
static bool sync(JKRDecompCommand*, int);
static JKRDecompCommand* orderAsync(u8*, u8*, u32, u32, JKRDecompCommand::AsyncCallback);
static bool orderSync(u8*, u8*, u32, u32);
static void decode(u8*, u8*, u32, u32);
static void decodeSZP(u8*, u8*, u32, u32);
static void decodeSZS(u8*, u8*, u32, u32);
static void checkCompressed(u8*);
static Compression checkCompressed(u8*);
};
#endif
include/JSystem/JKernel/JKRHeap/JKRHeap.h
+4
View File
@@ -150,4 +150,8 @@ inline void* operator new(u32 size, void* ptr) {
return ptr;
}
inline void* JKRAllocFromHeap(JKRHeap* heap, u32 size, int alignment) {
return JKRHeap::alloc(size, alignment, heap);
}
#endif
include/JSystem/JKernel/JKRThread/JKRThread.h
+44 -17
View File
@@ -20,25 +20,52 @@ public:
void setCommon_mesgQueue(JKRHeap* heap, int message_count);
void setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3);
OSThread* getThreadRecord() { return this->mOSThread; }
OSThread* getThreadRecord() const { return mThreadRecord; }
void* getStack() const { return mStackMemory; }
u8 getLoadInfo() const { return field_0x60; }
JKRHeap* getCurrentHeap() const { return mCurrentHeap; }
JKRHeap* getCurrentHeapError() const { return mCurrentHeapError; }
void resume() { OSResumeThread(mThreadRecord); }
void sendMessage(OSMessage message) {
OSSendMessage(&mMessageQueue, message, OS_MESSAGE_NON_BLOCKING);
}
void sendMessageBlock(OSMessage message) {
OSSendMessage(&mMessageQueue, message, OS_MESSAGE_BLOCKING);
}
OSMessage waitMessage() {
OSMessage message;
OSReceiveMessage(&mMessageQueue, &message, OS_MESSAGE_NON_BLOCKING);
return message;
}
OSMessage waitMessageBlock() {
OSMessage message;
OSReceiveMessage(&mMessageQueue, &message, OS_MESSAGE_BLOCKING);
return message;
}
void jamMessageBlock(OSMessage message) {
OSJamMessage(&mMessageQueue, message, OS_MESSAGE_BLOCKING);
}
private:
JSULink<JKRThread> mThreadListLink;
JKRHeap* mHeap;
OSThread* mOSThread;
OSMessageQueue mQueue;
OSMessage* mMessages;
int mMessageCount;
void* mStackPtr;
u32 mStackSize;
u8 field_0x60;
u8 padding_0x61[3];
u32 mCost;
u32 mSwitchCount;
u32 field_0x6c;
u32 field_0x70;
JKRHeap* field_0x74;
JKRHeap* field_0x78;
/* 0x00 */ // vtable
/* 0x04 */ // JKRDisposer
/* 0x18 */ JSULink<JKRThread> mThreadListLink;
/* 0x28 */ JKRHeap* mHeap;
/* 0x2C */ OSThread* mThreadRecord;
/* 0x30 */ OSMessageQueue mMessageQueue;
/* 0x50 */ OSMessage* mMessages;
/* 0x54 */ s32 mMessageCount;
/* 0x58 */ void* mStackMemory;
/* 0x5C */ u32 mStackSize;
/* 0x60 */ u8 field_0x60;
/* 0x61 */ u8 padding_0x61[3];
/* 0x64 */ u32 mCost;
/* 0x68 */ u32 mSwitchCount;
/* 0x6C */ u32 field_0x6c;
/* 0x70 */ u32 field_0x70;
/* 0x74 */ JKRHeap* mCurrentHeap;
/* 0x78 */ JKRHeap* mCurrentHeapError;
public:
static void* start(void* param_1);