summaryrefslogtreecommitdiff
path: root/src/m_Do/m_Do_machine_exception.cpp
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2021-09-27 15:27:58 -0700
committerTakaRikka <38417346+TakaRikka@users.noreply.github.com>2021-09-27 15:27:58 -0700
commita08acfa69b3ea48ff37a57b649a93164ecee8584 (patch)
tree42c85d8a212f3967721f061f994b2deeadce5ba2 /src/m_Do/m_Do_machine_exception.cpp
parenta7ccd8816727059f6bd4f0047a58a9a69e73692c (diff)
m_Do_printf / JUTConsole
Diffstat (limited to 'src/m_Do/m_Do_machine_exception.cpp')
-rw-r--r--src/m_Do/m_Do_machine_exception.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp
index 39d2d97291..c6589cd039 100644
--- a/src/m_Do/m_Do_machine_exception.cpp
+++ b/src/m_Do/m_Do_machine_exception.cpp
@@ -12,6 +12,7 @@
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_main.h"
+#include "Runtime.PPCEABI.H/__va_arg.h"
//
// Types:
@@ -26,7 +27,6 @@ struct DynamicModuleControlBase {
//
extern "C" void dump__24DynamicModuleControlBaseFv();
-extern "C" void JUTConsole_print_f_va_();
//
// Declarations:
@@ -39,15 +39,12 @@ static JUTConsole* sConsole;
u8 struct_80450C94[4];
#pragma pop
-/* 80017D7C-80017E08 0126BC 008C+00 3/3 0/0 0/0 .text print_f__FPCce */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void print_f(char const* param_0, ...) {
- nofralloc
-#include "asm/m_Do/m_Do_machine_exception/print_f__FPCce.s"
+void print_f(char const* fmt, ...) {
+ va_list args;
+ va_start(args, fmt);
+ JUTConsole_print_f_va_(sConsole, fmt, args);
+ va_end(args);
}
-#pragma pop
void print(char const* string) {
sConsole->print(string);