mirror of https://github.com/PCSX2/pcsx2.git
Core: Remove syscon log and merge with EE logs
This commit is contained in:
parent
e06cf23a03
commit
ebf8cba6a4
|
@ -304,7 +304,6 @@ struct SysConsoleLogPack
|
|||
{
|
||||
ConsoleLogSource ELF;
|
||||
ConsoleLogSource eeRecPerf;
|
||||
ConsoleLogSource sysoutConsole;
|
||||
ConsoleLogSource pgifLog;
|
||||
|
||||
ConsoleLogFromVM<Color_Cyan> eeConsole;
|
||||
|
@ -374,7 +373,6 @@ extern void __Log( const char* fmt, ... );
|
|||
#define eeConLog SysConsole.eeConsole.IsActive() && SysConsole.eeConsole.Write
|
||||
#define eeDeci2Log SysConsole.deci2.IsActive() && SysConsole.deci2.Write
|
||||
#define iopConLog SysConsole.iopConsole.IsActive() && SysConsole.iopConsole.Write
|
||||
#define sysConLog SysConsole.sysoutConsole.IsActive() && SysConsole.sysoutConsole.Write
|
||||
#define pgifConLog SysConsole.pgifLog.IsActive() && SysConsole.pgifLog.Write
|
||||
#define recordingConLog SysConsole.recordingConsole.IsActive() && SysConsole.recordingConsole.Write
|
||||
#define controlLog SysConsole.controlInfo.IsActive() && SysConsole.controlInfo.Write
|
||||
|
|
|
@ -400,7 +400,6 @@ void LogSink::UpdateLogging(SettingsInterface& si)
|
|||
|
||||
const bool ee_console_enabled = any_logging_sinks && si.GetBoolValue("Logging", "EnableEEConsole", false);
|
||||
SysConsole.eeConsole.Enabled = ee_console_enabled;
|
||||
SysConsole.sysoutConsole.Enabled = ee_console_enabled;
|
||||
|
||||
SysConsole.iopConsole.Enabled = any_logging_sinks && si.GetBoolValue("Logging", "EnableIOPConsole", false);
|
||||
SysTrace.IOP.R3000A.Enabled = true;
|
||||
|
|
|
@ -1110,8 +1110,8 @@ void SYSCALL()
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
sysConLog(fmt,
|
||||
char buf[2048];
|
||||
snprintf(buf, sizeof(buf), fmt,
|
||||
regs[0],
|
||||
regs[1],
|
||||
regs[2],
|
||||
|
@ -1120,6 +1120,8 @@ void SYSCALL()
|
|||
regs[5],
|
||||
regs[6]
|
||||
);
|
||||
|
||||
eeConLog(buf);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -101,7 +101,6 @@ static const TraceLogDescriptor
|
|||
SysConsoleLogPack::SysConsoleLogPack()
|
||||
: ELF(&TLD_ELF, Color_Gray)
|
||||
, eeRecPerf(&TLD_eeRecPerf, Color_Gray)
|
||||
, sysoutConsole(&TLD_sysoutConsole, Color_Gray)
|
||||
, pgifLog(&TLD_Pgif)
|
||||
, eeConsole(&TLD_eeConsole)
|
||||
, iopConsole(&TLD_iopConsole)
|
||||
|
|
Loading…
Reference in New Issue