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

j2d / map_path work, d_drawlist / d_attention cleanup (#208)

Browse Source 
* work on fop actor / actor mng, daalink, d_a_obj_item

* d_a_title mostly decompiled

* daalink / d_event / JMessage / dmsg_out_font work

* msg_scrn_base / msg_scrn_boss

* some work on mDo machine, d_menu_save, d_tresure, and various

* remove asm

* progress

* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data

* rename more data

* remove asm / progress

* match all of d_pane_class

* fixes / some dKankyo doc

* bunch of j2d work. d_drawlist / d_attention cleanup

* progress / asm

* cleanup wip

* decompile JStage

* setup some more JStudio structs

* set up d_demo classes

* some d_demo work

* cleanup dolphin os stuff

* some initial dEvent documentation

* some At collision documentation

* match JUTConsole::doDraw

* dbgs work / split up some of d_a_alink into .inc files

* d_a_alink_spinner work
This commit is contained in:
TakaRikka
2022-08-30 14:22:17 -07:00
committed by GitHub
parent bc30d007e1
commit f8979749e3
613 changed files with 30182 additions and 40087 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/JUtility/JUTException.cpp
+9 -10
View File
@@ -47,7 +47,6 @@ extern "C" void _restgpr_25();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" void OSYieldThread();
extern "C" void OSProtectRange(int, void*, int, int);
extern "C" void OSFillFPUContext(OSContext*);
extern "C" void print_f__10JUTConsoleFPCce();
extern "C" OSContext* OSGetCurrentContext();
@@ -111,11 +110,11 @@ OSErrorHandler JUTException::sPostUserCallback;
/* 802E1D5C-802E1E40 2DC69C 00E4+00 1/1 0/0 0/0 .text __ct__12JUTExceptionFP14JUTDirectPrint */
JUTException::JUTException(JUTDirectPrint* directPrint)
: JKRThread(0x1C00 /* 0x4000 in DEBUG */, 0x10, 0), mDirectPrint(directPrint) {
OSSetErrorHandler(OS_ERROR_DSI, errorHandler);
OSSetErrorHandler(OS_ERROR_ISI, errorHandler);
OSSetErrorHandler(OS_ERROR_PROGRAM, errorHandler);
OSSetErrorHandler(OS_ERROR_ALIGNMENT, errorHandler);
OSSetErrorHandler(OS_ERROR_MEMORY_PROTECTION, errorHandler);
OSSetErrorHandler(EXCEPTION_DSI, errorHandler);
OSSetErrorHandler(EXCEPTION_ISI, errorHandler);
OSSetErrorHandler(EXCEPTION_PROGRAM, errorHandler);
OSSetErrorHandler(EXCEPTION_ALIGNMENT, errorHandler);
OSSetErrorHandler(EXCEPTION_MEMORY_PROTECTION, errorHandler);
setFPException(0);
sPreUserCallback = NULL;
@@ -199,7 +198,7 @@ u32 JUTException::fpscr;
/* 802E1FCC-802E20C0 2DC90C 00F4+00 2/2 0/0 0/0 .text
* errorHandler__12JUTExceptionFUsP9OSContextUlUl */
void JUTException::errorHandler(u16 error, OSContext* context, u32 param_3, u32 param_4) {
void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3, u32 param_4) {
msr = PPCMfmsr();
fpscr = context->fpscr;
OSFillFPUContext(context);
@@ -234,7 +233,7 @@ void JUTException::panic_f_va(char const* file, int line, char const* format, va
char buffer[256];
vsnprintf(buffer, sizeof(buffer) - 1, format, args);
if (!sErrorManager) {
OSPanic(file, line, buffer);
OSPanic((char*)file, line, buffer);
}
OSContext* current_context = OSGetCurrentContext();
@@ -274,9 +273,9 @@ void JUTException::panic_f(char const* file, int line, char const* format, ...)
void JUTException::setFPException(u32 fpscr_enable_bits) {
__OSFpscrEnableBits = fpscr_enable_bits;
if (fpscr_enable_bits) {
OSSetErrorHandler(OS_ERROR_FLOATING_POINT_EXCEPTION, errorHandler);
OSSetErrorHandler(EXCEPTION_FLOATING_POINT_EXCEPTION, errorHandler);
} else {
OSSetErrorHandler(OS_ERROR_FLOATING_POINT_EXCEPTION, NULL);
OSSetErrorHandler(EXCEPTION_FLOATING_POINT_EXCEPTION, NULL);
}
}