[feat] Add XEX loading logging

Author: smokku

src/systems/x65.c

@@ -1,5 +1,6 @@
 #include "./x65.h"
 #include "../args.h"
+#include "../log.h"
 
 #include "chips/clk.h"
 
@@ -407,6 +408,7 @@ void x65_joystick(x65_t* sys, uint8_t joy1_mask, uint8_t joy2_mask) {
 bool x65_quickload_xex(x65_t* sys, chips_range_t data) {
     CHIPS_ASSERT(sys && sys->valid && data.ptr);
     if (data.size < 2) {
+        LOG_ERROR("File too small");
         return false;
     }
     const uint8_t* ptr = (uint8_t*)data.ptr;
@@ -418,19 +420,22 @@ bool x65_quickload_xex(x65_t* sys, chips_range_t data) {
 
     // $FFFF is required in first block
     if (ptr[0] != 0xff || ptr[1] != 0xff) {
+        LOG_ERROR("Missing $FFFF header");
         return false;
     }
 
     while (ptr < ((uint8_t*)data.ptr + data.size)) {
         size_t data_left = (uint8_t*)data.ptr + data.size - ptr;
         if (data_left < 4) {
+            LOG_ERROR("File truncated");
             return false;
         }
         if (ptr[0] == 0xff && ptr[1] == 0xff) {
             // skip header
             ptr += 2;
             data_left -= 2;
             if (data_left < 4) {
+                LOG_ERROR("File truncated");
                 return false;
             }
         }
@@ -439,13 +444,16 @@ bool x65_quickload_xex(x65_t* sys, chips_range_t data) {
         ptr += 2;
         const uint16_t end_addr = ptr[1] << 8 | ptr[0];
         ptr += 2;
+        LOG_INFO("Loading block: %04X-%04X", start_addr, end_addr);
 
         data_left = (uint8_t*)data.ptr + data.size - ptr;
         if (data_left < (end_addr - start_addr + 1) || start_addr > end_addr) {
+            LOG_ERROR("Block truncated");
             return false;
         }
         if (start_addr == end_addr && start_addr == 0xFFFE) {
             load_bank = *ptr++;
+            LOG_INFO("Loading to bank: %d", load_bank);
         }
         else {
             uint16_t addr = start_addr;
@@ -458,6 +466,7 @@ bool x65_quickload_xex(x65_t* sys, chips_range_t data) {
     }
 
     if (reset_lo_loaded && reset_hi_loaded) {
+        LOG_INFO("Reset vector set - running")
         x65_set_running(sys, true);
     }
 

src/ui/ui_app_log.cc

@@ -140,7 +140,7 @@ void ui_app_log_add(uint32_t log_level, uint32_t log_item, const char* log_id, c
         default: log_level_str = "info"; break;
     }
 
-    app_log.AddLog("[%s][%u] %s() %s\n", log_level_str, log_item, log_id, message);
+    app_log.AddLog("[%s][%u] %s: %s\n", log_level_str, log_item, log_id, message);
 }
 
 void ui_app_log_init(ui_app_log_t* win, const ui_app_log_desc_t* desc) {

src/x65.c

@@ -736,14 +736,16 @@ void log_func(uint32_t log_level, const char* log_id, const char* filename, uint
         short_filename += 4;
     }
 
-    uint32_t log_item = djb2(log_id);
+    unsigned long log_id_hash = djb2(log_id);
+    uint32_t log_item = (log_id_hash >> 32) ^ (log_id_hash & 0xFFFFFFFF);
 
     va_list args;
     va_start(args, fmt);
     vsnprintf(message, sizeof(message), fmt, args);
+    message[sizeof(message) - 1] = '\0';
     va_end(args);
 
-    slog_func("Emu", log_level, log_item, message, line_nr, short_filename, NULL);
+    slog_func(log_id, log_level, log_item, message, line_nr, short_filename, NULL);
     ui_app_log_add(log_level, log_item, log_id, message);
 }