--- uae/src/newcpu.c	2018/04/24 16:46:12	1.1.1.6
+++ uae/src/newcpu.c	2018/04/24 16:47:25	1.1.1.7
@@ -1151,43 +1151,42 @@ static int n_insns = 0, n_spcinsns = 0;
 
 static uaecptr last_trace_ad = 0;
 
-static __inline__ void do_trace (void)
+static void do_trace (void)
 {
-    if (regs.spcflags & SPCFLAG_TRACE) {		/* 6 */
-	if (regs.t0) {
-	    uae_u16 opcode;
-	    /* should also include TRAP, CHK, SR modification FPcc */
-	    /* probably never used so why bother */
-	    /* We can afford this to be inefficient... */
-	    m68k_setpc (m68k_getpc ());
-	    fill_prefetch_0 ();
-	    opcode = get_word (regs.pc);
-	    if (opcode == 0x4e72 		/* RTE */
-		|| opcode == 0x4e74 		/* RTD */
-		|| opcode == 0x4e75 		/* RTS */
-		|| opcode == 0x4e77 		/* RTR */
-		|| opcode == 0x4e76 		/* TRAPV */
-		|| (opcode & 0xffc0) == 0x4e80 	/* JSR */
-		|| (opcode & 0xffc0) == 0x4ec0 	/* JMP */
-		|| (opcode & 0xff00) == 0x6100  /* BSR */
-		|| ((opcode & 0xf000) == 0x6000	/* Bcc */
-		    && cctrue((opcode >> 8) & 0xf))
-		|| ((opcode & 0xf0f0) == 0x5050 /* DBcc */
-		    && !cctrue((opcode >> 8) & 0xf)
-		    && (uae_s16)m68k_dreg(regs, opcode & 7) != 0))
-	    {
-		last_trace_ad = m68k_getpc ();
-		regs.spcflags &= ~SPCFLAG_TRACE;
-		regs.spcflags |= SPCFLAG_DOTRACE;
-	    }
-	} else if (regs.t1) {
+    if (regs.t0) {
+	uae_u16 opcode;
+	/* should also include TRAP, CHK, SR modification FPcc */
+	/* probably never used so why bother */
+	/* We can afford this to be inefficient... */
+	m68k_setpc (m68k_getpc ());
+	fill_prefetch_0 ();
+	opcode = get_word (regs.pc);
+	if (opcode == 0x4e72 		/* RTE */
+	    || opcode == 0x4e74 		/* RTD */
+	    || opcode == 0x4e75 		/* RTS */
+	    || opcode == 0x4e77 		/* RTR */
+	    || opcode == 0x4e76 		/* TRAPV */
+	    || (opcode & 0xffc0) == 0x4e80 	/* JSR */
+	    || (opcode & 0xffc0) == 0x4ec0 	/* JMP */
+	    || (opcode & 0xff00) == 0x6100  /* BSR */
+	    || ((opcode & 0xf000) == 0x6000	/* Bcc */
+		&& cctrue((opcode >> 8) & 0xf))
+	    || ((opcode & 0xf0f0) == 0x5050 /* DBcc */
+		&& !cctrue((opcode >> 8) & 0xf)
+		&& (uae_s16)m68k_dreg(regs, opcode & 7) != 0))
+	{
 	    last_trace_ad = m68k_getpc ();
 	    regs.spcflags &= ~SPCFLAG_TRACE;
 	    regs.spcflags |= SPCFLAG_DOTRACE;
 	}
+    } else if (regs.t1) {
+	last_trace_ad = m68k_getpc ();
+	regs.spcflags &= ~SPCFLAG_TRACE;
+	regs.spcflags |= SPCFLAG_DOTRACE;
     }
 }
 
+
 static int do_specialties (void)
 {
     /*n_spcinsns++;*/
@@ -1214,7 +1213,8 @@ static int do_specialties (void)
 	    }
 	}
     }
-    do_trace ();
+    if (regs.spcflags & SPCFLAG_TRACE)
+	do_trace ();
 
     if (regs.spcflags & SPCFLAG_DISK)
 	do_disk ();