added sprintf

Author: sherman5

src/native_functions.h

@@ -72,19 +72,21 @@
 /** uint32_t strtoul(const char* str, char** endptr, int base) */
 #define STR_TO_UL_FPTR  VOID_PTR(0x80325b24)
 
-/** char* itoa(int32_t value, char* str, int base) */
-#define ITOA_FPTR       VOID_PTR(0x803250c0)
+/************************** print.h ***************************/
+
+/** int sprintf(char* str, const char* format, ...) */
+#define SPRINTF_FPTR    VOID_PTR(0x80323cf4)
 
 /************************** math.h ****************************/
 
 /** float sin(float x) */
-#define SIN_FPTR       VOID_PTR(0x80326220)
+#define SIN_FPTR        VOID_PTR(0x80326220)
 
 /** float cos(float x) */
-#define COS_FPTR     VOID_PTR(0x80326200)
+#define COS_FPTR        VOID_PTR(0x80326200)
 
 /** float tan(float x) */
-#define TAN_FPTR    VOID_PTR(0x803261bc)
+#define TAN_FPTR        VOID_PTR(0x803261bc)
 
 /** float acos(float x) */
 #define ACOS_FPTR       VOID_PTR(0x80022d1c)
@@ -110,5 +112,19 @@
 /** float recipSqrt(float x) */
 #define RECIP_SQRT_FPTR VOID_PTR(0x80022df8);
 
+/************************** profile.h *************************/
+
+/** u32 OSGetTime() */
+#define OS_GET_TIME_FPTR            VOID_PTR(0x8034c3f0)
+
+/** u32 OSGetTick() */
+#define OS_GET_TICK_FPTR            VOID_PTR(0x8034c408)
+
+/** u32 OSGetSystemTime() */
+#define OS_GET_SYSTEM_TIME_FPTR     VOID_PTR(0x8034c410)
+
+/** u32 OSGetTick() */
+#define OS_TIME_TO_SYSTEM_TIME_FPTR VOID_PTR(0x8034c474)
+
 #endif // #ifdef PAL
 #endif // #ifndef MML_NATIVE_FUNCTIONS_H

src/print.c

@@ -4,6 +4,11 @@
 #include "math.h"
 #include "gctypes.h"
 #include "error.h"
+#include "native_functions.h"
+
+//#include <stdarg.h>
+
+int (*sprintf)(char* str, const char* format, ...) = SPRINTF_FPTR;
 
 #define LINE_SIZE 60
 #define MAX_LINES 27
@@ -105,19 +110,20 @@ void print(const char* str)
     memcpy(menu + numLines, &tempSlot, sizeof(DebugMenuSlot));
 }
 
-void printInt(const char* str, u32 n)
-{
-    char buffer[128];
-    char numString[16];
-
-    memset(buffer, 0, sizeof(buffer));
-    memset(numString, 0, sizeof(numString));
+/*
+int (*vsprintf)(char * s, const char * format, va_list arg)
+    = (void*) 0x80323dc8;
 
-    strcat(buffer, str);
-    itoa(n, numString);
-    strcat(buffer, numString);
+int printf(const char* format, ...)
+{
+    char buffer[512];
+    va_list argptr;
+    va_start(argptr, format);
+    int result = vsprintf(buffer, format, argptr);
+    va_end(argptr);
     print(buffer);
-}
+    return result;
+}*/
 
 //TODO: solve the array out of bounds error (happens with -O3)
 #pragma GCC push_options

src/print.h

@@ -9,6 +9,51 @@
 
 #include "gctypes.h"
 
+/** @cond */
+extern int (*sprintf)(char* str, const char* format, ...);
+
+/**
+ * @brief print to the output stream
+ * @ingroup CallsMalloc
+ * 
+ * Writes the C string pointed by @p format to the output stream. If
+ * @p format includes format specifiers (subsequences beginning with %),
+ * the additional arguments following @p format are formatted and inserted
+ * in the resulting string replacing their respective specifiers.
+ *
+ * @param format - C string
+ * @return On success, the total number of character written. On
+ *  failure, a negative number is returned
+ *
+ * @see http://www.cplusplus.com/reference/cstdio/printf/
+ */
+//int printf(const char* format, ...);
+
+#if 0
+/** @endcond */
+
+/**
+ * @brief write formatted data to string
+ * 
+ * Composes a string with the same text that would be printed if @p format
+ * was used on @c printf, but instead of being printed, the content is
+ * stored as a C string in the buffer pointed by @p str.
+ *
+ * The size of the buffer should be large enough to contain the entire
+ * resulting string
+ *
+ * @param str - Pointer to a buffer where the resulting C string is stored
+ * @param format - C string
+ *
+ * @return On success, the total number of character written. On
+ *  failure, a negative number is returned
+ *
+ * @see http://www.cplusplus.com/reference/cstdio/sprintf/
+ */
+int sprintf(char* str, const char* format, ...);
+
+#endif
+
 /**
  * @brief print a string to the output stream
  * @ingroup CallsMalloc
@@ -21,7 +66,6 @@
  * @return none
  */
 void print(const char* str);
-void printInt(const char* str, u32 n);
 
 /**
  * @brief clear the output stream
@@ -33,13 +77,16 @@ void printInt(const char* str, u32 n);
 void clear();
 
 /**
- * @brief "throw" an error
+ * @brief print error message
  * @ingroup CallsMalloc
  *
- * Print an error message and set _errorState to true
+ * Print an error message
  *
  * @param errMessage - error message to print
  * @return none
+ *
+ * @note this will still print the error if the print stream has failed
+ *  to allocate memory
  */
 void error(const char* errMessage);
 

tests/testString.c

@@ -0,0 +1,28 @@
+#include <math.h>
+#include <string.h>
+#include <system.h>
+#include <print.h>
+#include <gctypes.h>
+#include <error.h>
+
+static char heap[15000];
+static bool initRun = false, testRun = false;
+static char str[100] = {0};
+
+static void init()
+{
+    initHeap(heap, heap + sizeof(heap));
+}
+
+static void test()
+{
+    sprintf(str, "test of sprintf, int: %d and float: %f", 5, 4.506);
+    print(str);
+}
+
+void _main()
+{
+    if (!initRun) { init(); initRun = true; }
+    if (!testRun) { test(); testRun = true; }
+}
+

tests/testString.ini

@@ -0,0 +1,56 @@
+[Memory Regions]
+
+; regions in memory that are available to inject code into
+
+REGIONS =
+
+    8022887c-80228920 ; unused code
+    8032c848-8032c87c ; unused code
+    8032dcb0-8032ddb8 ; unused code
+    8032ed8c-8032ee8c ; unused code
+    80393a5c-80393c0c ; unused code
+    803fa3e8-803fc2e8 ; debug menu tables/strings
+    803fc420-803fdc18 ; debug menu tables/strings
+    803001dc-80301e40 ; debug menu functions
+    801910e0-8019af4c ; tournament mode
+    8040a950-8040bf4c ; unknown
+
+[Static Overwrites]
+
+; debug menu replaces tournament mode - needed for test output
+
+8022d638 = 38000006
+
+[AI]
+
+; all .c source files
+
+SOURCES = tests/testString.c
+
+; any libraries to link against
+
+LIBRARIES = libmml_O1.a
+
+; search directories for .h files (mostly used for libraries)
+
+INCLUDE_PATHS = src
+
+; flags for the compiler
+; -fmerge-constants useful when using string literals
+
+COMPILER_FLAGS = -std=c99 -fmerge-constants -fno-builtin -Werror -Wall -Wextra
+
+; flags for the linker
+
+LINKER_FLAGS = 
+
+; symbols (functions) that are injected to specific addresses
+; specified addresses can not overlap with available memory regions
+; format: symbol_name inject_address original_instruction
+
+FIXED_SYMBOLS =
+
+    _main 80377998 7ee3bb78
+    display 801a633c 7c7f1b78
+
+