--- hatari/src/debug/log.c	2019/04/09 08:55:33	1.1.1.6
+++ hatari/src/debug/log.c	2019/04/09 08:58:02	1.1.1.8
@@ -47,6 +47,7 @@ static flagname_t ExceptionFlags[] = {
 	{ EXCEPT_CHK,       "chk" },
 	{ EXCEPT_TRAPV,     "trapv" },
 	{ EXCEPT_PRIVILEGE, "privilege" },
+	{ EXCEPT_TRACE,     "trace" },
 	{ EXCEPT_NOHANDLER, "nohandler" },
 
 	{ EXCEPT_DSP,       "dsp" },
@@ -84,6 +85,7 @@ static flagname_t TraceFlags[] = {
 	{ TRACE_CPU_PAIRING	 , "cpu_pairing" } ,
 	{ TRACE_CPU_DISASM	 , "cpu_disasm" } ,
 	{ TRACE_CPU_EXCEPTION	 , "cpu_exception" } ,
+	{ TRACE_CPU_REGS	 , "cpu_regs" } ,
 	{ TRACE_CPU_ALL 	 , "cpu_all" } ,
 
 	{ TRACE_INT		 , "int" } ,
@@ -143,6 +145,10 @@ static flagname_t TraceFlags[] = {
 
 	{ TRACE_OS_BASE		 , "os_base" } ,
 
+	{ TRACE_SCSIDRV		 , "scsidrv" } ,
+
+	{ TRACE_MEM		 , "mem" } ,
+
 	{ TRACE_ALL		 , "all" }
 };
 #endif /* ENABLE_TRACING */
@@ -163,6 +169,7 @@ void Log_Default(void)
 {
 	hLogFile = stderr;
 	TraceFile = stderr;
+	TextLogLevel = LOG_INFO;
 }
 
 /*-----------------------------------------------------------------------*/
@@ -391,8 +398,8 @@ const char* Log_SetExceptionDebugMask (c
 	const char *errstr;
 
 	Uint64 mask = EXCEPT_NONE;
-	errstr = Log_ParseOptionFlags(FlagsStr, ExceptionFlags, ARRAYSIZE(ExceptionFlags), &mask);
-	ConfigureParams.Log.nExceptionDebugMask = mask;
+	errstr = Log_ParseOptionFlags(FlagsStr, ExceptionFlags, ARRAY_SIZE(ExceptionFlags), &mask);
+	ConfigureParams.Debugger.nExceptionDebugMask = mask;
 	return errstr;
 }
 
@@ -410,7 +417,7 @@ const char* Log_SetTraceOptions (const c
 	const char *errstr;
 
 	LogTraceFlags = TRACE_NONE;
-	errstr = Log_ParseOptionFlags(FlagsStr, TraceFlags, ARRAYSIZE(TraceFlags), &LogTraceFlags);
+	errstr = Log_ParseOptionFlags(FlagsStr, TraceFlags, ARRAY_SIZE(TraceFlags), &LogTraceFlags);
 
 	/* Enable Hatari flags needed for tracing selected items */
 	if (LogTraceFlags & (TRACE_OS_AES|TRACE_OS_VDI))
@@ -438,7 +445,7 @@ char *Log_MatchTrace(const char *text, i
 		i = 0;
 	}
 	/* next match */
-	while (i < ARRAYSIZE(TraceFlags)) {
+	while (i < ARRAY_SIZE(TraceFlags)) {
 		name = TraceFlags[i++].name;
 		if (strncasecmp(name, text, len) == 0)
 			return (strdup(name));