--- hatari/src/debug/log.h	2019/04/09 08:56:46	1.1.1.8
+++ hatari/src/debug/log.h	2019/04/09 08:59:17	1.1.1.10
@@ -63,12 +63,16 @@ typedef enum
 	LOG_NONE	/* invalid LOG level */
 } LOGTYPE;
 
+#define LOG_NAMES {"FATAL", "ERROR", "WARN ", "INFO ", "TODO ", "DEBUG"}
+
+
 #ifndef __GNUC__
 /* assuming attributes work only for GCC */
 #define __attribute__(foo)
 #endif
 
 extern void Log_Default(void);
+extern void Log_SetLevels(void);
 extern int Log_Init(void);
 extern int Log_SetAlertLevel(int level);
 extern void Log_UnInit(void);
@@ -120,61 +124,64 @@ extern char *Log_MatchTrace(const char *
 #define	TRACE_CPU_PAIRING	 (1<<15)
 #define	TRACE_CPU_DISASM	 (1<<16)
 #define	TRACE_CPU_EXCEPTION	 (1<<17)
+#define	TRACE_CPU_REGS		 (1<<18)
 
-#define	TRACE_INT		 (1<<18)
+#define	TRACE_INT		 (1<<19)
 
-#define	TRACE_FDC		 (1<<19)
+#define	TRACE_FDC		 (1<<20)
 
-#define TRACE_ACIA		 (1<<20)
+#define TRACE_ACIA		 (1<<21)
 
-#define	TRACE_IKBD_CMDS 	 (1<<21)
-#define	TRACE_IKBD_ACIA 	 (1<<22)
-#define	TRACE_IKBD_EXEC 	 (1<<23)
+#define	TRACE_IKBD_CMDS 	 (1<<22)
+#define	TRACE_IKBD_ACIA 	 (1<<23)
+#define	TRACE_IKBD_EXEC 	 (1<<24)
 
-#define TRACE_BLITTER		 (1<<24)
+#define TRACE_BLITTER		 (1<<25)
 
-#define TRACE_OS_BIOS		 (1<<25)
-#define TRACE_OS_XBIOS  	 (1<<26)
-#define TRACE_OS_GEMDOS 	 (1<<27)
-#define TRACE_OS_VDI		 (1<<28)
-#define TRACE_OS_AES		 (1<<29)
+#define TRACE_OS_BIOS		 (1<<26)
+#define TRACE_OS_XBIOS  	 (1<<27)
+#define TRACE_OS_GEMDOS 	 (1<<28)
+#define TRACE_OS_VDI		 (1<<29)
+#define TRACE_OS_AES		 (1<<30)
 
-#define TRACE_IOMEM_RD  	 (1<<30)
-#define TRACE_IOMEM_WR  	 (1ULL<<31)
+#define TRACE_IOMEM_RD  	 (1ll<<31)
+#define TRACE_IOMEM_WR  	 (1ll<<32)
 
-#define TRACE_DMASND		 (1ll<<32)
+#define TRACE_DMASND		 (1ll<<33)
 
-#define TRACE_CROSSBAR		 (1ll<<33)
-#define TRACE_VIDEL		 (1ll<<34)
+#define TRACE_CROSSBAR		 (1ll<<34)
+#define TRACE_VIDEL		 (1ll<<35)
 
-#define TRACE_DSP_HOST_INTERFACE (1ll<<35)
-#define TRACE_DSP_HOST_COMMAND	 (1ll<<36)
-#define TRACE_DSP_HOST_SSI	 (1ll<<37)
-#define TRACE_DSP_DISASM	 (1ll<<38)
-#define TRACE_DSP_DISASM_REG	 (1ll<<39)
-#define TRACE_DSP_DISASM_MEM	 (1ll<<40)
-#define TRACE_DSP_STATE		 (1ll<<41)
-#define TRACE_DSP_INTERRUPT	 (1ll<<42)
+#define TRACE_DSP_HOST_INTERFACE (1ll<<36)
+#define TRACE_DSP_HOST_COMMAND	 (1ll<<37)
+#define TRACE_DSP_HOST_SSI	 (1ll<<38)
+#define TRACE_DSP_DISASM	 (1ll<<39)
+#define TRACE_DSP_DISASM_REG	 (1ll<<40)
+#define TRACE_DSP_DISASM_MEM	 (1ll<<41)
+#define TRACE_DSP_STATE		 (1ll<<42)
+#define TRACE_DSP_INTERRUPT	 (1ll<<43)
 
-#define TRACE_DSP_SYMBOLS	 (1ll<<43)
-#define TRACE_CPU_SYMBOLS	 (1ll<<44)
+#define TRACE_DSP_SYMBOLS	 (1ll<<44)
+#define TRACE_CPU_SYMBOLS	 (1ll<<45)
 
-#define TRACE_NVRAM		 (1ll<<45)
+#define TRACE_NVRAM		 (1ll<<46)
 
-#define TRACE_SCSI_CMD		 (1ll<<46)
+#define TRACE_SCSI_CMD		 (1ll<<47)
 
-#define TRACE_NATFEATS		 (1ll<<47)
+#define TRACE_NATFEATS		 (1ll<<48)
 
-#define TRACE_KEYMAP		 (1ll<<48)
+#define TRACE_KEYMAP		 (1ll<<49)
 
-#define TRACE_MIDI		 (1ll<<49)
+#define TRACE_MIDI		 (1ll<<50)
 
-#define TRACE_IDE		 (1ll<<50)
+#define TRACE_IDE		 (1ll<<51)
 
-#define TRACE_OS_BASE		 (1ll<<51)
+#define TRACE_OS_BASE		 (1ll<<52)
 
-#define TRACE_SCSIDRV		 (1ll<<52)
+#define TRACE_SCSIDRV		 (1ll<<53)
     
+#define TRACE_MEM		 (1ll<<54)
+
 #define	TRACE_NONE		 (0)
 #define	TRACE_ALL		 (~0)