diff --git a/bootloader/hos/secmon_exo.c b/bootloader/hos/secmon_exo.c index bff5bf6..dcf44df 100644 --- a/bootloader/hos/secmon_exo.c +++ b/bootloader/hos/secmon_exo.c @@ -331,19 +331,21 @@ static const char *get_error_desc(u32 error_desc) switch (error_desc) { case 0x100: - return "IABRT"; + return "IABRT"; // Instruction Abort. case 0x101: - return "DABRT"; + return "DABRT"; // Data Abort. case 0x102: - return "PC-UA"; + return "IUA"; // Instruction Unaligned Access. case 0x103: - return "SP-UA"; + return "DUA"; // Data Unaligned Access. case 0x104: - return "TRAP"; + return "UDF"; // Undefined Instruction. case 0x106: - return "SE"; + return "SYS"; // System Error. case 0x301: - return "SVC"; + return "SVC"; // Bad arguments or unimplemented SVC. + case 0xFFD: + return "SO"; // Stack Overflow. case 0xFFE: return "std::abort"; default: diff --git a/bootloader/main.c b/bootloader/main.c index dcf491d..a806462 100644 --- a/bootloader/main.c +++ b/bootloader/main.c @@ -1127,10 +1127,10 @@ static void _patched_rcm_protection() } #define EXCP_EN_ADDR 0x4003FFFC -#define EXCP_MAGIC 0x30505645 // EVP0 +#define EXCP_MAGIC 0x30505645 // EVP0 #define EXCP_TYPE_ADDR 0x4003FFF8 -#define EXCP_TYPE_RESET 0x545352 // RST -#define EXCP_TYPE_UNDEF 0x464455 // UDF +#define EXCP_TYPE_RESET 0x545352 // RST +#define EXCP_TYPE_UNDEF 0x464455 // UDF #define EXCP_TYPE_PABRT 0x54424150 // PABT #define EXCP_TYPE_DABRT 0x54424144 // DABT #define EXCP_LR_ADDR 0x4003FFF4 diff --git a/nyx/nyx_gui/nyx.c b/nyx/nyx_gui/nyx.c index 77942ec..459294a 100644 --- a/nyx/nyx_gui/nyx.c +++ b/nyx/nyx_gui/nyx.c @@ -281,10 +281,10 @@ void load_saved_configuration() } #define EXCP_EN_ADDR 0x4003FFFC -#define EXCP_MAGIC 0x30505645 // EVP0 +#define EXCP_MAGIC 0x30505645 // EVP0 #define EXCP_TYPE_ADDR 0x4003FFF8 -#define EXCP_TYPE_RESET 0x545352 // RST -#define EXCP_TYPE_UNDEF 0x464455 // UDF +#define EXCP_TYPE_RESET 0x545352 // RST +#define EXCP_TYPE_UNDEF 0x464455 // UDF #define EXCP_TYPE_PABRT 0x54424150 // PABT #define EXCP_TYPE_DABRT 0x54424144 // DABT #define EXCP_LR_ADDR 0x4003FFF4