Configure everything

include/common.h

@@ -109,10 +109,6 @@ typedef int BOOL;
 
 typedef unsigned char byte_t;
 
-#ifdef __CWCC__
-typedef unsigned long size_t;
-#endif
-
 typedef u8 undefined1;
 typedef u16 undefined2;
 typedef u32 undefined4;

include/nw4r/ut/ut_TextWriterBase.h

@@ -1,11 +1,11 @@
 #ifndef NW4R_UT_TEXT_WRITER_BASE_H
 #define NW4R_UT_TEXT_WRITER_BASE_H
-#include "nw4r/math.h"
+
 #include "nw4r/types_nw4r.h"
 #include "nw4r/ut/ut_CharWriter.h"
 #include "nw4r/ut/ut_TagProcessorBase.h"
 #include "stdio.h"
-#include "wchar.h"
+#include "wprintf.h"
 
 namespace nw4r {
 namespace ut {

include/rvl/OS/OS.h

@@ -65,6 +65,9 @@ typedef struct OSIOSRev {
 
 typedef void (*OSExceptionHandler)(u8 type, OSContext *ctx);
 
+#define OSRoundUp32B(x)   (((u32)(x) + 32 - 1) & ~(32 - 1))
+#define OSRoundDown32B(x) (((u32)(x)) & ~(32 - 1))
+
 extern BOOL __OSInIPL;
 extern BOOL __OSInNandBoot;
 extern BOOL __OSIsGcam;

include/rvl/OS/OSError.h

@@ -4,14 +4,13 @@
 #include "__va_arg.h"
 #include "common.h"
 
+#include "RVL/OS/OSContext.h"
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-// Forward declarations
-typedef struct OSContext OSContext;
-
 #define OSError(...) OSPanic(__FILE__, __LINE__, __VA_ARGS__)
 #define OSAssert(exp, ...)                                                                                             \
     if (!(exp))                                                                                                        \

include/rvl/OS/OSHardware.h

@@ -4,15 +4,14 @@
 // #include "rvl/OS/OSAddress.h"
 #include "common.h"
 #include "rvl/OS/OSThread.h"
+#include "rvl/OS/OSContext.h"
+#include "rvl/OS/OSExec.h"
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct OSContext OSContext;
-typedef struct OSExecParams OSExecParams;
-
 /**
  * For more details, see:
  * https://www.gc-forever.com/yagcd/chap4.html#sec4

include/rvl/OS/OSUtf.h

@@ -1,6 +1,9 @@
 #ifndef RVL_SDK_OS_UTF_H
 #define RVL_SDK_OS_UTF_H
+
 #include "common.h"
+#include "wchar.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

include/sized_string.h

@@ -4,6 +4,7 @@
 #include "__va_arg.h"
 #include "common.h"
 #include "string.h"
+#include "wstring.h"
 
 extern "C" bool strequals(const char *a, const char *b);