mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-06 18:01:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Format and clean up from merge.

Browse Source
This commit is contained in:
Julgodis
2021-09-27 18:49:30 +02:00
parent 7ad8d8df76
commit e4ec8da75b
7 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/JUtility/JUTException.cpp
+2 -1
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"
}
libs/JSystem/JUtility/JUTVideo.cpp
+4 -13
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) {
libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp
+4 -6
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