mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

libjsys/jsyswrapper: match all funcs, need unused for weak function emission?

Browse Source
This commit is contained in:
Cuyler36
2025-06-18 04:42:48 -04:00
parent baf6dc9485
commit f0712d468f
14 changed files with 575 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JFramework/JFWDisplay.h
+15 -2
View File
@@ -98,12 +98,16 @@ class JFWDisplay {
return sManager;
}
const GXRenderModeObj* getRenderMode() const {
return mRMode;
}
int getEfbHeight() const {
return JUTVideo::getManager()->getEfbHeight();
return getRenderMode() ->efbHeight;
}
int getEfbWidth() const {
return JUTVideo::getManager()->getFbWidth();
return getRenderMode() ->fbWidth;
}
JUTFader* getFader() const {
@@ -151,6 +155,15 @@ class JFWDisplay {
return mEnableAlpha;
}
void setGamma(u16 gamma) {
mGamma = gamma;
}
void setFrameRate(u16 framerate) {
mFrameRate = framerate;
mTickRate = 0;
}
static JFWDisplay* sManager; // 0x80415718
private:
include/JSystem/JFramework/JFWSystem.h
+12
View File
@@ -62,6 +62,18 @@ struct JFWSystem {
JUT_ASSERT(sInitCalled == 0);
CSetUpParam::renderMode = rmode;
}
static JKRHeap* getSystemHeap() {
JUT_ASSERT(sInitCalled == 0);
return systemHeap;
}
static JKRHeap* getRootHeap() {
JUT_ASSERT(sInitCalled == 0);
return rootHeap;
}
static JUTConsole* getSystemConsole() {
JUT_ASSERT(sInitCalled == 0);
return systemConsole;
}
};
#endif
include/JSystem/JKernel/JKRHeap.h
+1 -1
View File
@@ -120,7 +120,7 @@ class JKRHeap : public JKRDisposer {
void freeAll();
void freeTail();
void fillFreeArea();
void resize(void*, u32);
s32 resize(void*, u32);
static s32 getSize(void*, JKRHeap*);
// ... more functions
include/JSystem/JSystem.h
+19
View File
@@ -2,7 +2,26 @@
#define JSYSTEM_H
#include "JSystem/JKernel/JKRAram.h"
#include "JSystem/JKernel/JKRFileLoader.h"
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JMacro.h"
#include "JSystem/JUtility/JUTException.h"
// probably a better place to put these
static inline void* JKRGetResource(const char* resourceName) {
return JKRFileLoader::getGlbResource(resourceName);
}
static inline void JKRRemoveResource(void* resource) {
JKRFileLoader::removeResource(resource, nullptr);
}
static inline BOOL JKRDetachResource(void* resource) {
return JKRFileLoader::detachResource(resource, nullptr);
}
static inline void* JKRGetResourceEntry_byName(u32 root_name, const char* res_name, JKRArchive* archive) {
return archive->findTypeResource(root_name, res_name);
}
#endif
include/JSystem/JUtility/JUTAssertion.h
+3
View File
@@ -13,6 +13,9 @@ void flushMessage();
void flushMessage_dbPrint();
u32 getSDevice(void);
void changeDisplayTime(u32 time);
void changeDevice(u32 device);
void showAssert_f(u32 device, char const* file, int line, char const* errormsg, ...);
inline void showAssert(u32 device, char const* file, int line, char const* errormsg) {
showAssert_f(device, file, line, "%s", errormsg);
include/JSystem/JUtility/JUTException.h
+5
View File
@@ -105,11 +105,16 @@ struct JUTException : public JKRThread {
void setTraceSuppress(u32 supress) {
mTraceSuppress = supress;
}
void setGamePad(JUTGamePad* gamePad) {
mGamePad = gamePad;
mPadPort = JUTGamePad::Port_Invalid;
}
void enterAllPad() {
setGamePad((JUTGamePad*)-1);
}
static JUTException* getManager() {
return sErrorManager;
}
include/libjsys/jsyswrapper.h
+45 -38
View File
@@ -21,39 +21,19 @@ typedef struct {
void* mData; // _10
} CSDIFileEntry;
extern void* JC_JFWSystem_getSystemConsole();
extern void* JC_JFWSystem_getRootHeap();
extern void* JC_JFWSystem_getSystemHeap();
extern void* JC_JUTVideo_getManager();
extern u16 JC_JUTVideo_getFbWidth(void* manager);
extern u16 JC_JUTVideo_getEfbHeight(void* manager);
extern u32 JC_JUTVideo_getFbWidth(void* manager);
extern u32 JC_JUTVideo_getEfbHeight(void* manager);
extern void JC_JUTVideo_setRenderMode(void* manager, GXRenderModeObj* renderMode);
extern void* JC_JFWDisplay_getManager();
extern void JC_JFWDisplay_startFadeOut(void* manager, int len);
extern void JC_JFWDisplay_startFadeIn(void* manager, int len);
extern void JC_JFWDisplay_setFrameRate(void* manager, u16 framerate);
extern void JC_JFWDisplay_endFrame(void* manager);
extern void JC_JFWDisplay_beginRender(void* manager);
extern void JC_JFWDisplay_endRender(void* manager);
extern void JC_JFWDisplay_setClearColor(void* manager, GXColor color);
extern void JC_JKRAramHeap_dump(void* heap);
extern void* JC_JKRAram_getAramHeap();
extern u32 JC_JKRAramArchive_getAramAddress_byName(void* archive, u32 root_name, const char* res_name);
extern CSDIFileEntry* JC__JKRGetResourceEntry_byName(u32 root_name, const char* res_name, void* archive);
extern int JC_JKRHeap_dump(void* heap);
extern s32 JC_JKRHeap_getTotalFreeSize(void* heap);
extern void JC_JKRExpHeap_changeGroupID(void* expheap, u8 groupId);
extern void JC_JUTGamePad_getPadStatus(PADStatus* status, int padId);
extern void* JC__JKRDvdToMainRam_byName(const char* name, u8* buf, JKRExpandSwitch expandSwitch);
extern BOOL JC__JKRDetachResource(void* ptr);
extern void JC__JKRDetachResource(void* ptr);
extern int JC_JUTConsole_isVisible(void* console);
extern void JC_JUTConsole_setVisible(void* console, BOOL visible);
@@ -86,31 +66,48 @@ extern void JC_JUTProcBar_setVisibleHeapBar(void* procbar, BOOL visible);
extern void* JC_JUTException_getManager();
extern void* JC_JUTException_getConsole();
extern BOOL JC_JUTException_isEnablePad(void* manager);
extern void JC_JUTException_readPad(void* mgr, u32* trigger, u32* button);
extern int JC_JUTException_readPad(void* mgr, u32* trigger, u32* button);
extern void JC_JUTException_waitTime(u32 time);
extern void JC_JUTException_enterAllPad(void* manager);
extern void JC_JUTException_setMapFile(const char* path);
extern void JC_JUTException_setPreUserCallback(void* callback);
extern void JC_JUTException_setPostUserCallback(void* callback);
extern void JC_JUTAssertion_changeDevice(int device);
extern void JC_JUTAssertion_changeDisplayTime(int displayTime);
extern void JC_JUTGamePad_read();
extern void JC_JFWDisplay_startFadeOut(void* manager, int fadeout);
extern PADStatus JC_JUTGamePad_getPadStatus(u32 port);
extern u8 JC_JUTGamePad_recalibrate(u32 port);
extern void* JC_JFWDisplay_getManager();
extern int JC_JFWDisplay_startFadeIn(void* manager, int len);
extern void JC_JFWDisplay_setFrameRate(void* manager, u16 framerate);
extern void JC_JFWDisplay_endFrame(void* manager);
extern void JC_JFWDisplay_beginRender(void* manager);
extern void JC_JFWDisplay_endRender(void* manager);
extern void JC_JFWDisplay_setClearColor(void* manager, GXColor color);
extern int JC_JFWDisplay_startFadeOut(void* manager, int fadeout);
extern void JC_JFWDisplay_clearEfb(void* manager, GXColor* color);
extern GXRenderModeObj* JC_JFWDisplay_getRenderMode(void* manager);
extern void* JC_JFWDisplay_changeToSingleXfb(void* manager, int param);
extern u16 JC_JFWDisplay_getEfbWidth(void* manager);
extern u16 JC_JFWDisplay_getEfbHeight(void* manager);
extern const GXRenderModeObj* JC_JFWDisplay_getRenderMode(void* manager);
extern void* JC_JFWDisplay_changeToSingleXfb(void* manager, int index);
extern void* JC_JFWDisplay_changeToDoubleXfb(void* manager);
extern int JC_JFWDisplay_getEfbWidth(void* manager);
extern int JC_JFWDisplay_getEfbHeight(void* manager);
extern void* JC_JFWDisplay_createManager_0(GXRenderModeObj* renderMode, void* heap, int exfbNumber, int enableAlpha);
extern void JC_JFWDisplay_setFader(void* manager, void* fader);
extern void JC_JFWDisplay_setGamma(void* manager, int gamma);
extern void JC_JFWDisplay_destroyManager();
extern void JC_JFWSystem_setMaxStdHeap(int max);
extern void JC_JFWSystem_setSysHeapSize(u32 size);
extern void JC_JFWSystem_setFifoBufSize(u32 size);
extern void JC_JFWSystem_setAramAudioBufSize(u32 size);
extern void JC_JFWSystem_setAramGraphBufSize(u32 size);
extern void JC_JFWSystem_init();
extern void* JC_JFWDisplay_createManager_0(GXRenderModeObj* renderMode, void* heap, int param0, int param1);
extern void JC_JFWDisplay_setFader(void* manager, void* fader);
extern void JC_JFWDisplay_setGamma(void* manager, int gamma);
extern void JC_JFWDisplay_destroyManager();
extern void* JC_JFWSystem_getSystemConsole();
extern void* JC_JFWSystem_getRootHeap();
extern void* JC_JFWSystem_getSystemHeap();
extern void* JC_J2DOrthoGraph_new();
extern void JC_J2DOrthoGraph_delete(void* orthograph);
@@ -118,23 +115,28 @@ extern void JC_J2DOrthoGraph_delete(void* orthograph);
extern void* JC_JUTFader_new(int ul_x, int ul_y, int br_x, int br_y, u32* color);
extern void JC_JUTFader_delete(void* fader);
extern void JC_JFWDisplay_changeToDoubleXfb(void* manager);
extern void* JC__JKRGetResource(const char* resourceName);
extern u32 JC__JKRGetMemBlockSize(int, void*);
extern void JC__JKRRemoveResource(void* res);
extern void JC_J2DOrthoGraph_setOrtho(void* gport, u16 ul_x, u16 ul_y, u16 br_x, u16 br_y);
extern void JC_J2DOrthoGraph_setPort(void* gport);
extern void JC_J2DOrthoGraph_setOrtho(void* orthograph, int ul_x, int ul_y, int br_x, int br_y);
extern void JC_J2DOrthoGraph_setPort(void* orthograph);
extern void* JC_JKRAramArchive_new();
extern BOOL JC__JKRMountFixedAramArchive(void* aram_archive, const char* file);
extern BOOL JC__JKRUnmountFixedAramArchive(void* aram_archive);
extern void JC__JKRUnmountFixedAramArchive(void* aram_archive);
extern void JC_JKRAramArchive_delete(void* aram_archive);
extern u32 JC_JKRHeap_getFreeSize(void* heap);
extern void* JC_JKRHeap_alloc(void* heap, u32 size, int align);
extern void JC_JKRHeap_free(void* heap, void* mem);
extern size_t JC_JKRHeap_getSize(void* heap, void* mem);
extern s32 JC_JKRHeap_resize(void* heap, void* ptr, s32 new_size);
extern int JC_JKRHeap_dump(void* heap);
extern s32 JC_JKRHeap_getTotalFreeSize(void* heap);
extern u32 JC__JKRGetMemBlockSize(void* heap, void* ptr);
extern u8 JC_JKRExpHeap_changeGroupID(void* expheap, u8 groupId);
extern void* JC__JKRAllocFromAram(size_t size);
extern u8* JC__JKRAramToMainRam_block(void* aramBlock, u8* ramDst, size_t size);
@@ -154,6 +156,11 @@ extern void* JC__JKRMountArchive(const char* path, int mount_mode, void* heap, i
extern void* JC__JKRGetSystemHeap();
extern void* JC_JUTXfb_getManager();
extern void JC_JUTXfb_clearIndex(void* manager);
extern u32 JC_JKRAramBlock_getAddress(void* aramBlock);
#ifdef JSYSWRAPPER_DEBUG
#define JSYSWRAPPER_PRINTF(console, fmt, ...) JC_JUTConsole_print_f(console, fmt, ...)
#else