EVT backtraces

include/common_structs.h

@@ -473,6 +473,7 @@ typedef struct Evt {
     /* 0x164 */ Bytecode* ptrCurLine;
     /* 0x168 */ b8 debugPaused;
     /* 0x169 */ s8 debugStep;
+    /* 0x16A */ u16 curLine;
 } Evt; // size = 0x16C
 
 typedef Evt* ScriptList[MAX_SCRIPTS];

include/evt.h

@@ -6,6 +6,11 @@
 // Should be at least the width of a pointer i.e. intptr_t
 typedef s32 Bytecode;
 
+// The argc word in EVT bytecode encodes both the argument count (low 16 bits)
+// and the source line number (high 16 bits) for crash diagnostics.
+#define EVT_CMD_ARGC(raw) ((raw) & 0xFFFF)
+#define EVT_CMD_LINE(raw) ((u32)(raw) >> 16)
+
 enum {
     EVT_OP_INTERNAL_FETCH,
     EVT_OP_END,
@@ -105,6 +110,9 @@ enum {
     EVT_OP_DEBUG_BREAKPOINT,
 };
 
+/// The script currently being executed by evt_execute_next_command, or nullptr.
+extern struct Evt* EvtCurrentScript;
+
 #define MAKE_ENTITY_END      0x80000000
 
 /* Return type of evt_execute_next_command */

include/script_api/macros.h

@@ -204,10 +204,10 @@ extern "C" {
 ///         Bytecode argv[argc];
 ///     }
 /// This macro expands to the given opcode and argv, with argc calculated automatically.
-
+/// The line number is also encoded into the upper nibble of argc for debugging purposes.
 #define EVT_CMD(opcode, argv...) \
     opcode, \
-    (sizeof((Bytecode[]){argv})/sizeof(Bytecode)), \
+    (sizeof((Bytecode[]){argv})/sizeof(Bytecode)) | (__LINE__ << 16), \
     ##argv
 
 /// Signals the end of EVT script data. A script missing this will likely crash on load.