Update error and debug logging methods

assets/scene/minesweeper.lua

@@ -187,7 +187,6 @@ function sceneUpdate()
   end
 
   if inputIsDown(INPUT_ACTION_DOWN) then
-    print("down")
     y = y + 1
   end
 

src/dusk/CMakeLists.txt

@@ -46,7 +46,7 @@ dusk_env_to_h(duskdefs.env duskdefs.h)
 # Subdirs
 add_subdirectory(assert)
 add_subdirectory(asset)
-add_subdirectory(debug)
+add_subdirectory(log)
 add_subdirectory(display)
 add_subdirectory(engine)
 add_subdirectory(error)

src/dusk/assert/assert.c

@@ -6,7 +6,7 @@
  */
 
 #include "assert.h"
-#include "debug/debug.h"
+#include "log/log.h"
 
 #ifndef DUSK_ASSERTIONS_FAKED
   #ifdef DUSK_TEST_ASSERT
@@ -31,14 +31,12 @@
       const char *message
     ) {
       if(x != true) {
-        debugPrint(
+        logError(
           "Assertion Failed in %s:%i\n\n%s\n",
           file,
           line,
           message
         );
-        debugFlush();
-
         abort();
       }
     }

src/dusk/asset/asset.c

@@ -11,7 +11,6 @@
 #include "assert/assert.h"
 #include "asset/assettype.h"
 #include "engine/engine.h"
-#include "debug/debug.h"
 #include "util/string.h"
 
 asset_t ASSET;

src/dusk/display/display.c

@@ -12,7 +12,6 @@
 #include "display/mesh/quad.h"
 #include "display/screen/screen.h"
 #include "ui/ui.h"
-#include "debug/debug.h"
 #include "display/text/text.h"
 #include "assert/assert.h"
 #include "util/memory.h"

src/dusk/display/mesh/mesh.c

@@ -8,7 +8,6 @@
 #include "mesh.h"
 #include "util/memory.h"
 #include "assert/assert.h"
-#include "debug/debug.h"
 
 errorret_t meshInit(
   mesh_t *mesh,

src/dusk/display/mesh/quad.c

@@ -7,7 +7,6 @@
 
 #include "quad.h"
 #include "assert/assert.h"
-#include "debug/debug.h"
 
 mesh_t QUAD_MESH_SIMPLE;
 meshvertex_t QUAD_MESH_SIMPLE_VERTICES[QUAD_VERTEX_COUNT] = {

src/dusk/error/error.c

@@ -9,7 +9,7 @@
 #include "error.h"
 #include "util/memory.h"
 #include "util/string.h"
-#include "debug/debug.h"
+#include "log/log.h"
 
 errorstate_t ERROR_STATE = { 0 };
 
@@ -125,12 +125,11 @@ errorret_t errorPrint(const errorret_t retval) {
   assertNotNull(retval.state, "Error state cannot be NULL");
   assertNotNull(retval.state->message, "Message cannot be NULL");
 
-  debugPrint(
+  logError(
     ERROR_PRINT_FORMAT,
     retval.state->code,
     retval.state->message,
     retval.state->lines
   );
-  debugFlush();
   return retval;
 }

src/dusk/input/input.c

@@ -11,7 +11,6 @@
 #include "util/string.h"
 #include "util/math.h"
 #include "time/time.h"
-#include "debug/debug.h"
 
 input_t INPUT;
 

src/dusk/log/log.h

@@ -14,9 +14,13 @@
  * @param message The message format string.
  * @param ... Additional arguments for the format string.
  */
-void debugPrint(const char_t *message, ...);
+void logDebug(const char_t *message, ...);
 
 /**
- * Flushes the debug output buffer.
+ * Prints a message to the error console. For some platforms this will pause
+ * the program.
+ * 
+ * @param message The message format string.
+ * @param ... Additional arguments for the format string.
  */
-void debugFlush();
+void logError(const char_t *message, ...);

src/dusk/scene/scene.c

@@ -6,7 +6,7 @@
 #include "scene.h"
 #include "assert/assert.h"
 #include "util/memory.h"
-#include "debug/debug.h"
+#include "log/log.h"
 #include "time/time.h"
 #include "display/camera/camera.h"
 #include "display/screen/screen.h"
@@ -84,8 +84,7 @@ void sceneDispose(void) {
     if(lua_pcall(SCENE.scriptContext.luaState, 0, 0, 0) != LUA_OK) {
       const char_t *strErr = lua_tostring(SCENE.scriptContext.luaState, -1);
       lua_pop(SCENE.scriptContext.luaState, 1);
-      debugPrint("Failed to call function '%s': %s\n", "sceneDispose", strErr);
-      debugFlush();
+      logDebug("Failed to call function '%s': %s\n", "sceneDispose", strErr);
     }
   } else {
     lua_pop(SCENE.scriptContext.luaState, 1);

src/dusk/script/module/display/moduletileset.c

@@ -10,7 +10,6 @@
 #include "display/texture/tileset.h"
 #include "util/memory.h"
 #include "util/string.h"
-#include "debug/debug.h"
 
 void moduleTileset(scriptcontext_t *ctx) {
   assertNotNull(ctx, "Script context cannot be NULL");

src/dusk/script/module/system/modulesystem.c

@@ -6,7 +6,7 @@
  */
 
 #include "modulesystem.h"
-#include "debug/debug.h"
+#include "log/log.h"
 #include "assert/assert.h"
 #include "util/string.h"
 #include "script/scriptmodule.h"
@@ -36,8 +36,7 @@ int moduleSysPrint(lua_State *L) {
 
   luaL_pushresult(&b);
   const char *msg = lua_tostring(L, -1);
-  debugPrint("%s\n", msg);
-  debugFlush();
+  logDebug("%s\n", msg);
   return 0; // no values returned to Lua
 }
 

src/dusk/script/scriptcontext.c

@@ -9,7 +9,6 @@
 #include "assert/assert.h"
 #include "asset/asset.h"
 #include "util/memory.h"
-#include "debug/debug.h"
 #include "script/scriptmodule.h"
 #include "event/event.h"
 

src/dusk/script/scriptmanager.c

@@ -8,7 +8,6 @@
 #include "scriptmanager.h"
 #include "util/memory.h"
 #include "assert/assert.h"
-#include "debug/debug.h"
 #include "asset/asset.h"
 
 scriptmanager_t SCRIPT_MANAGER;

src/dusk/ui/ui.c

@@ -10,7 +10,6 @@
 #include "assert/assert.h"
 #include "display/spritebatch/spritebatch.h"
 #include "display/screen/screen.h"
-#include "debug/debug.h"
 
 ui_t UI;
 

src/duskdolphin/CMakeLists.txt

@@ -16,6 +16,6 @@ target_sources(${DUSK_BINARY_TARGET_NAME}
 
 # Subdirs
 add_subdirectory(asset)
-add_subdirectory(debug)
+add_subdirectory(log)
 add_subdirectory(display)
 add_subdirectory(input)

src/duskdolphin/debug/debug.c

@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "debug/debug.h"
-#include "display/display.h"
-#include <debug.h>
-
-static char_t DEBUG_ERROR_BUFFER[16*1024] = {0};
-
-void debugPrint(const char_t *message, ...) {
-  size_t start = strlen(DEBUG_ERROR_BUFFER);
-
-  va_list args;
-  va_start(args, message);
-
-  // Print to stdout
-  va_list copy;
-  va_copy(copy, args);
-  vfprintf(stdout, message, copy);
-  va_end(copy);
-  fflush(stdout);
-
-  // Append to buffer
-  // vsnprintf(
-  //   DEBUG_ERROR_BUFFER + start,
-  //   sizeof(DEBUG_ERROR_BUFFER) - start,
-  //   message,
-  //   args
-  // );
-}
-
-void debugFlush() {
-  fflush(stdout);
-  
-  // Either create graphics, or hijack the displays' graphics.
-  // void *xfb = NULL;
-  // GXRModeObj *rmode = NULL;
-  // void *framebuffer;
-
-  // if(DISPLAY.frameBuffer[0]) {
-  //   console_init(
-  //     DISPLAY.frameBuffer[0],
-  //     20,
-  //     20,
-  //     DISPLAY.screenMode->fbWidth,
-  //     DISPLAY.screenMode->xfbHeight,
-  //     DISPLAY.screenMode->fbWidth * VI_DISPLAY_PIX_SZ
-  //   );
-  // } else {
-  //   VIDEO_Init();
-  //   rmode = VIDEO_GetPreferredMode(NULL);
-  //   framebuffer = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
-  //   console_init(
-  //     framebuffer,
-  //     20,
-  //     20,
-  //     rmode->fbWidth,
-  //     rmode->xfbHeight,
-  //     rmode->fbWidth*VI_DISPLAY_PIX_SZ
-  //   );
-  //   VIDEO_Configure(rmode);
-  //   VIDEO_SetNextFramebuffer(framebuffer);
-  //   VIDEO_SetBlack(FALSE);
-  //   VIDEO_Flush();
-  //   VIDEO_WaitVSync();
-  //   if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
-  // }
-
-  // // Printf
-  // printf("SOB\n");
-  // printf(DEBUG_ERROR_BUFFER);
-  // printf("\nEOB.");
-  
-  while(SYS_MainLoop()) {
-    VIDEO_WaitVSync();
-  }
-}

src/duskdolphin/display/mesh/meshdolphin.c

@@ -8,7 +8,6 @@
 #include "display/mesh/mesh.h"
 #include "display/texture/texture.h"
 #include "assert/assert.h"
-#include "debug/debug.h"
 
 errorret_t meshInitDolphin(
   meshdolphin_t *mesh,

src/duskdolphin/input/inputdolphin.c

@@ -7,7 +7,6 @@
 
 #include "input/input.h"
 #include "assert/assert.h"
-#include "debug/debug.h"
 
 inputbuttondata_t INPUT_BUTTON_DATA[] = {
   #ifdef DUSK_INPUT_GAMEPAD

src/duskdolphin/log/CMakeLists.txt

@@ -7,5 +7,5 @@
 
 target_sources(${DUSK_LIBRARY_TARGET_NAME}
   PUBLIC
-    debug.c
+    log.c
 )

src/duskdolphin/log/log.c

@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "log/log.h"
+#include "display/display.h"
+#include <debug.h>
+
+void logDebug(const char_t *message, ...) {
+  // Print to stdout
+  va_list args;
+  va_start(args, message);
+  vfprintf(stdout, message, args);
+  va_end(args);
+  fflush(stdout);
+}
+
+void logError(const char_t *message, ...) {
+  // Either create graphics, or hijack the displays' graphics.
+  void *xfb = NULL;
+  GXRModeObj *rmode = NULL;
+  void *framebuffer;
+
+  if(DISPLAY.frameBuffer[0]) {
+    console_init(
+      DISPLAY.frameBuffer[0],
+      20,
+      20,
+      DISPLAY.screenMode->fbWidth,
+      DISPLAY.screenMode->xfbHeight,
+      DISPLAY.screenMode->fbWidth * VI_DISPLAY_PIX_SZ
+    );
+  } else {
+    VIDEO_Init();
+    rmode = VIDEO_GetPreferredMode(NULL);
+    framebuffer = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
+    console_init(
+      framebuffer,
+      20,
+      20,
+      rmode->fbWidth,
+      rmode->xfbHeight,
+      rmode->fbWidth*VI_DISPLAY_PIX_SZ
+    );
+    VIDEO_Configure(rmode);
+    VIDEO_SetNextFramebuffer(framebuffer);
+    VIDEO_SetBlack(FALSE);
+    VIDEO_Flush();
+    VIDEO_WaitVSync();
+    if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
+  }
+
+  // Printf
+  va_list args;
+  va_start(args, message);
+  vprintf(message, args);
+  va_end(args);
+  
+  while(SYS_MainLoop()) {
+    VIDEO_WaitVSync();
+  }
+}

src/dusklinux/CMakeLists.txt

@@ -11,5 +11,5 @@ target_include_directories(${DUSK_LIBRARY_TARGET_NAME}
 
 # Subdirs
 add_subdirectory(asset)
-add_subdirectory(debug)
+add_subdirectory(log)
 add_subdirectory(input)

src/dusklinux/log/CMakeLists.txt

@@ -6,5 +6,5 @@
 # Sources
 target_sources(${DUSK_LIBRARY_TARGET_NAME}
   PUBLIC
-    debug.c
+    log.c
 )

src/dusklinux/log/log.c

@@ -5,15 +5,18 @@
  * https://opensource.org/licenses/MIT
  */
 
-#include "debug/debug.h"
+#include "log/log.h"
 
-void debugPrint(const char_t *message, ...) {
+void logDebug(const char_t *message, ...) {
   va_list args;
   va_start(args, message);
   vprintf(message, args);
   va_end(args);
 }
 
-void debugFlush() {
-  fflush(stdout);
+void logError(const char_t *message, ...) {
+  va_list args;
+  va_start(args, message);
+  vprintf(message, args);
+  va_end(args);
 }

src/duskpsp/CMakeLists.txt

@@ -15,6 +15,6 @@ target_sources(${DUSK_BINARY_TARGET_NAME}
 )
 
 # Subdirs
-add_subdirectory(debug)
 add_subdirectory(asset)
-add_subdirectory(input)
+add_subdirectory(input)
+add_subdirectory(log)

src/duskpsp/debug/debug.c

@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2026 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "debug/debug.h"
-
-void debugPrint(const char_t *message, ...) {
-  FILE *file = fopen("ms0:/PSP/GAME/Dusk/debug.log", "a");
-  if(!file) return;
-  
-  va_list args;
-  va_start(args, message);
-  vfprintf(file, message, args);
-  va_end(args);
-  fclose(file);
-}
-
-void debugFlush() {
-  fflush(stdout);
-}

src/duskpsp/log/CMakeLists.txt

@@ -7,5 +7,5 @@
 
 target_sources(${DUSK_LIBRARY_TARGET_NAME}
   PUBLIC
-    debug.c
+    log.c
 )

src/duskpsp/log/log.c

@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 2026 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "log/log.h"
+
+void logDebug(const char_t *message, ...) {
+  va_list args;
+  va_start(args, message);
+
+  // print to stdout
+  va_list copy;
+  va_copy(copy, args);
+  vprintf(message, copy);
+  va_end(copy);
+
+  // print to file
+  FILE *file = fopen("ms0:/PSP/GAME/Dusk/debug.log", "a");
+  if (file) {
+      va_copy(copy, args);
+      vfprintf(file, message, copy);
+      va_end(copy);
+      fclose(file);
+  }
+
+  va_end(args);
+}
+
+void logError(const char_t *message, ...) {
+  va_list args;
+  va_start(args, message);
+
+  // print to stderr
+  va_list copy;
+  va_copy(copy, args);
+  vfprintf(stderr, message, copy);
+  va_end(copy);
+
+  // print to file
+  FILE *file = fopen("ms0:/PSP/GAME/Dusk/error.log", "a");
+  if (file) {
+      va_copy(copy, args);
+      vfprintf(file, message, copy);
+      va_end(copy);
+      fclose(file);
+  }
+
+  va_end(args);
+}