Addition of sio debug text & fix of jump misdecode in orbmortem

Author: mubes

Inc/etmDecoder.h

@@ -11,6 +11,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include "generics.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -169,7 +170,7 @@ struct ETMDecoderStats *ETMDecoderGetStats( struct ETMDecoder *i );
 
 void ETMDecodeUsingAltAddrEncode( struct ETMDecoder *i, bool usingAltAddrEncodeSet );
 
-void ETMDecoderPump( struct ETMDecoder *i, uint8_t *buf, int len, etmDecodeCB cb, void *d );
+void ETMDecoderPump( struct ETMDecoder *i, uint8_t *buf, int len, etmDecodeCB cb, genericsReportCB report, void *d );
 
 void ETMDecoderInit( struct ETMDecoder *i, bool usingAltAddrEncodeSet );
 // ====================================================================================================

Inc/generics.h

@@ -62,6 +62,7 @@ extern "C" {
 // ====================================================================================================
 enum verbLevel {V_ERROR, V_WARN, V_INFO, V_DEBUG, V_MAX_VERBLEVEL};
 
+typedef void ( *genericsReportCB )( enum verbLevel l, const char *fmt, ... );
 
 char *genericsEscape( char *str );
 char *genericsUnescape( char *str );

Inc/sio.h

@@ -27,7 +27,7 @@ struct SIOInstance;
 enum SIOEvent { SIO_EV_NONE, SIO_EV_HOLD, SIO_EV_QUIT, SIO_EV_SAVE, SIO_EV_CONSUMED, SIO_EV_SURFACE, SIO_EV_DIVE, SIO_EV_FOPEN };
 
 /* Types of line (each with their own display mechanism & colours */
-enum LineType { LT_SOURCE, LT_ASSEMBLY, LT_NASSEMBLY, LT_MU_SOURCE, LT_EVENT, LT_LABEL, LT_FILE  };
+enum LineType { LT_SOURCE, LT_ASSEMBLY, LT_NASSEMBLY, LT_MU_SOURCE, LT_EVENT, LT_LABEL, LT_FILE, LT_DEBUG  };
 
 /* Definition for a single line...collections of these are what get displayed */
 struct line
@@ -49,7 +49,7 @@ void SIOheld( struct SIOInstance *sio, bool isHeld );
 enum SIOEvent SIOHandler( struct SIOInstance *sio, bool isTick, uint64_t oldintervalBytes );
 
 void SIOterminate( struct SIOInstance *sio );
-struct SIOInstance *SIOsetup( const char *progname, const char *elffile );
+struct SIOInstance *SIOsetup( const char *progname, const char *elffile, bool isFile );
 // ====================================================================================================
 
 #ifdef __cplusplus

Makefile

@@ -2,7 +2,7 @@
 VERBOSE?=0
 #DEBUG=1
 SCREEN_HANDLING=1
-#MAKE_EXPERIMENTAL=1
+MAKE_EXPERIMENTAL=1
 
 # Set your preferred screen colours here, or create a new palette by copying the file to a new one
 SCREEN_PALETTE="uicolours_default.h"