--- hatari/src/includes/m68000.h 2019/04/01 07:15:29 1.1.1.12 +++ hatari/src/includes/m68000.h 2019/04/09 08:47:15 1.1.1.13 @@ -197,10 +197,10 @@ static inline void M68000_AddCyclesWithP && ( ( cycles & 3 ) == 2 ) && ( ( LastInstrCycles & 3 ) == 2 ) ) { Pairing = 1; - HATARI_TRACE( HATARI_TRACE_CPU_PAIRING , - "pairing detected pc=%x family %s/%s cycles %d/%d\n" , - m68k_getpc(), OpcodeName[LastOpcodeFamily] , - OpcodeName[OpcodeFamily], LastInstrCycles, cycles ); + LOG_TRACE(TRACE_CPU_PAIRING, + "cpu pairing detected pc=%x family %s/%s cycles %d/%d\n", + m68k_getpc(), OpcodeName[LastOpcodeFamily], + OpcodeName[OpcodeFamily], LastInstrCycles, cycles); } /* [NP] This part is only needed to track possible pairing instructions, */ @@ -209,10 +209,10 @@ static inline void M68000_AddCyclesWithP if ( (LastOpcodeFamily!=OpcodeFamily) && ( Pairing == 0 ) && ( ( cycles & 3 ) == 2 ) && ( ( LastInstrCycles & 3 ) == 2 ) ) { - HATARI_TRACE( HATARI_TRACE_CPU_PAIRING , - "could pair pc=%x family %s/%s cycles %d/%d\n" , - m68k_getpc(), OpcodeName[LastOpcodeFamily] , - OpcodeName[OpcodeFamily], LastInstrCycles, cycles ); + LOG_TRACE(TRACE_CPU_PAIRING, + "cpu could pair pc=%x family %s/%s cycles %d/%d\n", + m68k_getpc(), OpcodeName[LastOpcodeFamily], + OpcodeName[OpcodeFamily], LastInstrCycles, cycles); } #endif