falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Format and clean up from merge.

This commit is contained in:
Julgodis 2021-09-27 18:49:30 +02:00
parent 444cad0d10
commit 77ad390d8e
7 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/JSystem/JUtility/JUTDirectPrint.h
View File

@ -22,6 +22,8 @@ public:
/* 802E4240 */ static JUTDirectPrint* start();
static JUTDirectPrint* getManager() { return sDirectPrint; }
private:
static u8 sAsciiTable[128];
static u32 sFontData[64];

3
include/JSystem/JUtility/JUTException.h
View File

@ -3,6 +3,7 @@
#include "JSystem/JKernel/JKRThread.h"
#include "JSystem/JUtility/JUTGamePad.h"
#include "Runtime.PPCEABI.H/__va_arg.h"
#include "dolphin/gx/GX.h"
#include "dolphin/os/OS.h"
#include "dolphin/types.h"
@ -26,7 +27,7 @@ public:
/* 802E1D5C */ JUTException(JUTDirectPrint*);
/* 802E1E40 */ void create(JUTDirectPrint*);
/* 802E1FCC */ void errorHandler(u16, OSContext*, u32, u32);
/* 802E20C0 */ void panic_f_va(char const*, int, char const*, __va_list_struct*);
/* 802E20C0 */ void panic_f_va(char const*, int, char const*, va_list);
/* 802E21FC */ static void panic_f(char const*, int, char const*, ...);
/* 802E227C */ void setFPException(u32);
/* 802E22C4 */ void showFloatSub(int, f32);

7
include/dolphin/os/OS.h
View File

@ -4,6 +4,7 @@
#ifndef OS_H_
#define OS_H_
#include "Runtime.PPCEABI.H/__va_arg.h"
#include "dolphin/types.h"
/* TODO: more structs, and get rid of the ones that are faked! */
@ -122,8 +123,6 @@ struct OSThread {
void* data[2];
};
struct __va_list_struct {};
extern "C" {
s32 OSEnableScheduler(void);
s32 OSDisableScheduler(void);
@ -165,7 +164,7 @@ void OSReportDisable(void);
void OSReportEnable(void);
void OSReportForceEnableOff(void);
void OSReportForceEnableOn(void);
void OSVReport(const char* format, __va_list_struct* list);
void OSVReport(const char* format, va_list list);
void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime* out_time);
OSTime OSGetTime(void);
@ -202,7 +201,7 @@ u8* OSGetStackPointer(void);
void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32);
void OSVAttention(const char* fmt, __va_list_struct* va_list);
void OSVAttention(const char* fmt, va_list args);
void OSReportInit(void);

5
include/msl_c/string.h
View File

@ -1,6 +1,7 @@
#ifndef MSL_STRING_H_
#define MSL_STRING_H_
#include "Runtime.PPCEABI.H/__va_arg.h"
#include "dolphin/types.h"
// TODO: move to MSL_C.PPCEABI.bare.H/
@ -20,9 +21,7 @@ int tolower(int);
int sprintf(char*, const char*, ...);
int printf(const char*, ...);
int snprintf(char*, u32, const char*, ...);
struct __va_list_struct;
size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, __va_list_struct* args);
size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_list args);
}
#endif

3
libs/JSystem/JUtility/JUTException.cpp
View File

@ -4,6 +4,7 @@
//
#include "JSystem/JUtility/JUTException.h"
#include "Runtime.PPCEABI.H/__va_arg.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@ -336,7 +337,7 @@ static u8 context[712];
#pragma optimization_level 0
#pragma optimizewithasm off
asm void JUTException::panic_f_va(char const* param_0, int param_1, char const* param_2,
__va_list_struct* param_3) {
va_list param_3) {
nofralloc
#include "asm/JSystem/JUtility/JUTException/panic_f_va__12JUTExceptionFPCciPCcP16__va_list_struct.s"
}

17
libs/JSystem/JUtility/JUTVideo.cpp
View File

@ -4,21 +4,12 @@
//
#include "JSystem/JUtility/JUTVideo.h"
#include "JSystem/JUtility/JUTDirectPrint.h"
#include "JSystem/JUtility/JUTXfb.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "dolphin/vi/vi.h"
//
// Types:
//
struct JUTDirectPrint {
/* 802E456C */ void changeFrameBuffer(void*, u16, u16);
static JUTDirectPrint* sDirectPrint;
};
//
// External References:
//
@ -37,8 +28,8 @@ JUTVideo* JUTVideo::sManager;
OSTick JUTVideo::sVideoLastTick;
/* 80451540-80451544 000A40 0004+00 2/2 1/1 0/0 .sbss sVideoInterval__8JUTVideo */
OSTick JUTVideo::sVideoInterval;
/* 80451544-80451548 000A44 0004+00 4/4 0/0 0/0 .sbss None */
static bool data_80451544;
@ -123,8 +114,8 @@ void JUTVideo::preRetraceProc(u32 retrace_count) {
if (frameBuffer) {
JUTVideo* videoManager = JUTGetVideoManager();
const GXRenderModeObj* renderMode = videoManager->getRenderMode();
JUTDirectPrint::sDirectPrint->changeFrameBuffer(frameBuffer, renderMode->fb_width,
renderMode->efb_height);
JUTDirectPrint* directPrint = JUTDirectPrint::getManager();
directPrint->changeFrameBuffer(frameBuffer, renderMode->fb_width, renderMode->efb_height);
}
if (sManager->mSetBlack == 1) {

10
libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp
View File

@ -4,6 +4,7 @@
//
#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h"
#include "Runtime.PPCEABI.H/__va_arg.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@ -11,12 +12,9 @@
// Forward References:
//
struct __va_list_struct;
extern "C" void sprintf();
extern "C" void snprintf();
extern "C" size_t vsnprintf(char* buffer, size_t buffer_size, const char* format,
__va_list_struct* args);
extern "C" size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_list args);
extern "C" void vprintf();
extern "C" void fprintf();
extern "C" void printf();
@ -36,7 +34,6 @@ extern "C" extern char const* const MSL_Common_Src_printf__stringBase0;
//
SECTION_INIT void memcpy();
extern "C" void __va_arg();
extern "C" void __div2u();
extern "C" void __mod2u();
extern "C" void __num2dec();
@ -80,7 +77,7 @@ asm void snprintf() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, __va_list_struct* args) {
asm size_t vsnprintf(char* buffer, size_t buffer_size, const char* format, va_list args) {
nofralloc
#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/vsnprintf.s"
}
@ -162,6 +159,7 @@ SECTION_SDATA static u8 data_80450AD8[2 + 6 /* padding */] = {
#pragma optimizewithasm off
asm void __pformatter() {
nofralloc
#undef __va_arg
#include "asm/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf/__pformatter.s"
}
#pragma pop