Merge pull request #4245 from aldelaro5/logs-levels-changes

Lots of Logs levels changes (also enable INFO level in every build)

Source/Core/AudioCommon/OpenALStream.cpp

@@ -33,7 +33,7 @@ bool OpenALStream::Start()
   {
     char* defDevName = pDeviceList.GetDeviceName(pDeviceList.GetDefaultDevice());
 
-    WARN_LOG(AUDIO, "Found OpenAL device %s", defDevName);
+    INFO_LOG(AUDIO, "Found OpenAL device %s", defDevName);
 
     ALCdevice* pDevice = alcOpenDevice(defDevName);
     if (pDevice)

Source/Core/Common/BreakPoints.cpp

@@ -214,9 +214,9 @@ bool TMemCheck::Action(DebugInterface* debug_interface, u32 iValue, u32 addr, bo
   {
     if (Log)
     {
-      INFO_LOG(MEMMAP, "CHK %08x (%s) %s%i %0*x at %08x (%s)", pc,
-               debug_interface->GetDescription(pc).c_str(), write ? "Write" : "Read", size * 8,
-               size * 2, iValue, addr, debug_interface->GetDescription(addr).c_str());
+      NOTICE_LOG(MEMMAP, "CHK %08x (%s) %s%i %0*x at %08x (%s)", pc,
+                 debug_interface->GetDescription(pc).c_str(), write ? "Write" : "Read", size * 8,
+                 size * 2, iValue, addr, debug_interface->GetDescription(addr).c_str());
     }
     if (Break)
       return true;

Source/Core/Common/GL/GLUtil.cpp

@@ -46,7 +46,7 @@ GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string&
   }
   else
   {
-    DEBUG_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader.c_str());
+    INFO_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader.c_str());
   }
 
   bool shader_errors = !Result;
@@ -70,7 +70,7 @@ GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string&
   }
   else
   {
-    DEBUG_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader.c_str());
+    INFO_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader.c_str());
   }
 
   shader_errors |= !Result;

Source/Core/Common/Logging/Log.h

@@ -82,7 +82,7 @@ void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char*
 #define MAX_LOGLEVEL LogTypes::LOG_LEVELS::LDEBUG
 #else
 #ifndef MAX_LOGLEVEL
-#define MAX_LOGLEVEL LogTypes::LOG_LEVELS::LWARNING
+#define MAX_LOGLEVEL LogTypes::LOG_LEVELS::LINFO
 #endif  // loglevel
 #endif  // logging
 

Source/Core/Core/Boot/ElfReader.cpp

@@ -104,7 +104,7 @@ const char* ElfReader::GetSectionName(int section) const
 // This is just a simple elf loader, good enough to load elfs generated by devkitPPC
 bool ElfReader::LoadIntoMemory()
 {
-  DEBUG_LOG(MASTER_LOG, "String section: %i", header->e_shstrndx);
+  INFO_LOG(MASTER_LOG, "String section: %i", header->e_shstrndx);
 
   // Should we relocate?
   bRelocate = (header->e_type != ET_EXEC);

Source/Core/Core/Core.cpp

@@ -977,7 +977,7 @@ void UpdateWantDeterminism(bool initial)
   bool new_want_determinism = Movie::IsMovieActive() || NetPlay::IsNetPlayRunning();
   if (new_want_determinism != g_want_determinism || initial)
   {
-    WARN_LOG(COMMON, "Want determinism <- %s", new_want_determinism ? "true" : "false");
+    NOTICE_LOG(COMMON, "Want determinism <- %s", new_want_determinism ? "true" : "false");
 
     bool was_unpaused = Core::PauseAndLock(true);
 

Source/Core/Core/DSP/DSPHWInterface.cpp

@@ -49,11 +49,11 @@ void gdsp_mbox_write_l(Mailbox mbx, u16 val)
 
 #if defined(_DEBUG) || defined(DEBUGFAST)
   if (mbx == MAILBOX_DSP)
-    INFO_LOG(DSP_MAIL, "DSP(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(MAILBOX_DSP),
-             g_dsp.pc);
+    DEBUG_LOG(DSP_MAIL, "DSP(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(MAILBOX_DSP),
+              g_dsp.pc);
   else
-    INFO_LOG(DSP_MAIL, "CPU(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(MAILBOX_CPU),
-             g_dsp.pc);
+    DEBUG_LOG(DSP_MAIL, "CPU(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(MAILBOX_CPU),
+              g_dsp.pc);
 #endif
 }
 
@@ -81,11 +81,11 @@ u16 gdsp_mbox_read_l(Mailbox mbx)
 
 #if defined(_DEBUG) || defined(DEBUGFAST)
   if (mbx == MAILBOX_DSP)
-    INFO_LOG(DSP_MAIL, "DSP(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(MAILBOX_DSP),
-             g_dsp.pc);
+    DEBUG_LOG(DSP_MAIL, "DSP(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(MAILBOX_DSP),
+              g_dsp.pc);
   else
-    INFO_LOG(DSP_MAIL, "CPU(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(MAILBOX_CPU),
-             g_dsp.pc);
+    DEBUG_LOG(DSP_MAIL, "CPU(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(MAILBOX_CPU),
+              g_dsp.pc);
 #endif
 
   return (u16)value;
@@ -101,7 +101,7 @@ void gdsp_ifx_write(u32 addr, u32 val)
     if (val & 0x1)
       DSPHost::InterruptRequest();
     else
-      INFO_LOG(DSPLLE, "Unknown Interrupt Request pc=%04x (%04x)", g_dsp.pc, val);
+      WARN_LOG(DSPLLE, "Unknown Interrupt Request pc=%04x (%04x)", g_dsp.pc, val);
     break;
 
   case DSP_DMBH:
@@ -136,7 +136,7 @@ void gdsp_ifx_write(u32 addr, u32 val)
   case DSP_GAIN:
     if (val)
     {
-      INFO_LOG(DSPLLE, "Gain Written: 0x%04x", val);
+      DEBUG_LOG(DSPLLE, "Gain Written: 0x%04x", val);
     }
   case DSP_DSPA:
   case DSP_DSMAH:
@@ -154,7 +154,7 @@ void gdsp_ifx_write(u32 addr, u32 val)
     {
       if (pdlabels[(addr & 0xFF) - 0xa0].name && pdlabels[(addr & 0xFF) - 0xa0].description)
       {
-        INFO_LOG(DSPLLE, "%04x MW %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name, val);
+        DEBUG_LOG(DSPLLE, "%04x MW %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name, val);
       }
       else
       {
@@ -200,8 +200,8 @@ static u16 _gdsp_ifx_read(u16 addr)
     {
       if (pdlabels[(addr & 0xFF) - 0xa0].name && pdlabels[(addr & 0xFF) - 0xa0].description)
       {
-        INFO_LOG(DSPLLE, "%04x MR %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name,
-                 g_dsp.ifx_regs[addr & 0xFF]);
+        DEBUG_LOG(DSPLLE, "%04x MR %s (%04x)", g_dsp.pc, pdlabels[(addr & 0xFF) - 0xa0].name,
+                  g_dsp.ifx_regs[addr & 0xFF]);
       }
       else
       {
@@ -280,8 +280,8 @@ static const u8* gdsp_ddma_in(u16 dsp_addr, u32 addr, u32 size)
           Common::swap16(*(const u16*)&g_dsp.cpu_ram[(addr + i) & 0x7FFFFFFF]);
     }
   }
-  INFO_LOG(DSPLLE, "*** ddma_in RAM (0x%08x) -> DRAM_DSP (0x%04x) : size (0x%08x)", addr,
-           dsp_addr / 2, size);
+  DEBUG_LOG(DSPLLE, "*** ddma_in RAM (0x%08x) -> DRAM_DSP (0x%04x) : size (0x%08x)", addr,
+            dsp_addr / 2, size);
 
   return dst + dsp_addr;
 }
@@ -309,8 +309,8 @@ static const u8* gdsp_ddma_out(u16 dsp_addr, u32 addr, u32 size)
     }
   }
 
-  INFO_LOG(DSPLLE, "*** ddma_out DRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)", dsp_addr / 2,
-           addr, size);
+  DEBUG_LOG(DSPLLE, "*** ddma_out DRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)", dsp_addr / 2,
+            addr, size);
 
   return src + dsp_addr;
 }

Source/Core/Core/GeckoCode.cpp

@@ -79,7 +79,7 @@ static bool InstallCodeHandler()
   std::string _rCodeHandlerFilename = File::GetSysDirectory() + GECKO_CODE_HANDLER;
   if (!File::ReadFileToString(_rCodeHandlerFilename, data))
   {
-    NOTICE_LOG(ACTIONREPLAY, "Could not enable cheats because codehandler.bin was missing.");
+    WARN_LOG(ACTIONREPLAY, "Could not enable cheats because codehandler.bin was missing.");
     return false;
   }
 

Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp

@@ -103,7 +103,7 @@ bool CEXIETHERNET::IsActivated()
 bool CEXIETHERNET::SendFrame(const u8* frame, u32 size)
 {
 #ifdef __linux__
-  INFO_LOG(SP1, "SendFrame %x\n%s", size, ArrayToString(frame, size, 0x10).c_str());
+  DEBUG_LOG(SP1, "SendFrame %x\n%s", size, ArrayToString(frame, size, 0x10).c_str());
 
   int writtenBytes = write(fd, frame, size);
   if ((u32)writtenBytes != size)
@@ -143,8 +143,8 @@ static void ReadThreadHandler(CEXIETHERNET* self)
     }
     else if (self->readEnabled.IsSet())
     {
-      INFO_LOG(SP1, "Read data: %s",
-               ArrayToString(self->mRecvBuffer.get(), readBytes, 0x10).c_str());
+      DEBUG_LOG(SP1, "Read data: %s",
+                ArrayToString(self->mRecvBuffer.get(), readBytes, 0x10).c_str());
       self->mRecvBufferLength = readBytes;
       self->RecvHandlePacket();
     }

Source/Core/Core/HW/CPU.cpp

@@ -9,6 +9,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/Event.h"
 #include "Common/Logging/Log.h"
+#include "Common/MsgHandler.h"
 #include "Core/Core.h"
 #include "Core/HW/CPU.h"
 #include "Core/HW/Memmap.h"
@@ -279,8 +280,7 @@ bool PauseAndLock(bool do_lock, bool unpause_on_unlock, bool control_adjacent)
     bool success = s_state_cpu_idle_cvar.wait_for(state_lock, std::chrono::seconds(10),
                                                   [] { return !s_state_cpu_thread_active; });
     if (!success)
-      NOTICE_LOG(
-          POWERPC,
+      PanicAlert(
           "Abandoned CPU Thread synchronization in CPU::PauseAndLock! We'll probably crash now.");
 
     if (control_adjacent)

Source/Core/Core/HW/DSP.cpp

@@ -498,8 +498,8 @@ static void Do_ARAM_DMA()
   if (g_arDMA.Cnt.dir)
   {
     // ARAM -> MRAM
-    INFO_LOG(DSPINTERFACE, "DMA %08x bytes from ARAM %08x to MRAM %08x PC: %08x", g_arDMA.Cnt.count,
-             g_arDMA.ARAddr, g_arDMA.MMAddr, PC);
+    DEBUG_LOG(DSPINTERFACE, "DMA %08x bytes from ARAM %08x to MRAM %08x PC: %08x",
+              g_arDMA.Cnt.count, g_arDMA.ARAddr, g_arDMA.MMAddr, PC);
 
     // Outgoing data from ARAM is mirrored every 64MB (verified on real HW)
     g_arDMA.ARAddr &= 0x3ffffff;
@@ -545,8 +545,8 @@ static void Do_ARAM_DMA()
   else
   {
     // MRAM -> ARAM
-    INFO_LOG(DSPINTERFACE, "DMA %08x bytes from MRAM %08x to ARAM %08x PC: %08x", g_arDMA.Cnt.count,
-             g_arDMA.MMAddr, g_arDMA.ARAddr, PC);
+    DEBUG_LOG(DSPINTERFACE, "DMA %08x bytes from MRAM %08x to ARAM %08x PC: %08x",
+              g_arDMA.Cnt.count, g_arDMA.MMAddr, g_arDMA.ARAddr, PC);
 
     // Incoming data into ARAM is mirrored every 64MB (verified on real HW)
     g_arDMA.ARAddr &= 0x3ffffff;

Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp

@@ -18,7 +18,7 @@
 
 AXUCode::AXUCode(DSPHLE* dsphle, u32 crc) : UCodeInterface(dsphle, crc), m_cmdlist_size(0)
 {
-  WARN_LOG(DSPHLE, "Instantiating AXUCode: crc=%08x", crc);
+  INFO_LOG(DSPHLE, "Instantiating AXUCode: crc=%08x", crc);
   m_mail_handler.PushMail(DSP_INIT);
   DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
 
@@ -54,7 +54,7 @@ void AXUCode::LoadResamplingCoefficients()
   if (fidx >= ArraySize(filenames))
     return;
 
-  WARN_LOG(DSPHLE, "Loading polyphase resampling coeffs from %s", filename.c_str());
+  INFO_LOG(DSPHLE, "Loading polyphase resampling coeffs from %s", filename.c_str());
 
   File::IOFile fp(filename, "rb");
   fp.ReadBytes(m_coeffs, 0x1000);
@@ -82,10 +82,10 @@ void AXUCode::HandleCommandList()
   u32 pb_addr = 0;
 
 #if 0
-	WARN_LOG(DSPHLE, "Command list:");
+	INFO_LOG(DSPHLE, "Command list:");
 	for (u32 i = 0; m_cmdlist[i] != CMD_END; ++i)
-		WARN_LOG(DSPHLE, "%04x", m_cmdlist[i]);
-	WARN_LOG(DSPHLE, "-------------");
+		INFO_LOG(DSPHLE, "%04x", m_cmdlist[i]);
+	INFO_LOG(DSPHLE, "-------------");
 #endif
 
   u32 curr_idx = 0;

Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp

@@ -20,7 +20,7 @@ AXWiiUCode::AXWiiUCode(DSPHLE* dsphle, u32 crc) : AXUCode(dsphle, crc), m_last_m
   for (u16& volume : m_last_aux_volumes)
     volume = 0x8000;
 
-  WARN_LOG(DSPHLE, "Instantiating AXWiiUCode");
+  INFO_LOG(DSPHLE, "Instantiating AXWiiUCode");
 
   m_old_axwii = (crc == 0xfa450138);
 }

Source/Core/Core/HW/DSPHLE/UCodes/CARD.cpp

@@ -11,7 +11,7 @@
 
 CARDUCode::CARDUCode(DSPHLE* dsphle, u32 crc) : UCodeInterface(dsphle, crc)
 {
-  DEBUG_LOG(DSPHLE, "CARDUCode - initialized");
+  INFO_LOG(DSPHLE, "CARDUCode - initialized");
   m_mail_handler.PushMail(DSP_INIT);
 }
 
@@ -37,7 +37,7 @@ void CARDUCode::HandleMail(u32 mail)
   }
   else
   {
-    DEBUG_LOG(DSPHLE, "CARDUCode - unknown command: %x", mail);
+    WARN_LOG(DSPHLE, "CARDUCode - unknown command: %x", mail);
   }
 
   m_mail_handler.PushMail(DSP_DONE);

Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp

@@ -134,12 +134,12 @@ void GBAUCode::HandleMail(u32 mail)
       m_dsphle->SetUCode(UCODE_ROM);
       break;
     default:
-      DEBUG_LOG(DSPHLE, "GBAUCode - unknown 0xcdd1 command: %08x", mail);
+      WARN_LOG(DSPHLE, "GBAUCode - unknown 0xcdd1 command: %08x", mail);
       break;
     }
   }
   else
   {
-    DEBUG_LOG(DSPHLE, "GBAUCode - unknown command: %08x", mail);
+    WARN_LOG(DSPHLE, "GBAUCode - unknown command: %08x", mail);
   }
 }

Source/Core/Core/HW/DSPHLE/UCodes/INIT.cpp

@@ -9,7 +9,7 @@
 
 INITUCode::INITUCode(DSPHLE* dsphle, u32 crc) : UCodeInterface(dsphle, crc)
 {
-  DEBUG_LOG(DSPHLE, "INITUCode - initialized");
+  INFO_LOG(DSPHLE, "INITUCode - initialized");
   m_mail_handler.PushMail(0x80544348);
 }
 

Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp

@@ -21,7 +21,7 @@
 ROMUCode::ROMUCode(DSPHLE* dsphle, u32 crc)
     : UCodeInterface(dsphle, crc), m_current_ucode(), m_boot_task_num_steps(0), m_next_parameter(0)
 {
-  DEBUG_LOG(DSPHLE, "UCode_Rom - initialized");
+  INFO_LOG(DSPHLE, "UCode_Rom - initialized");
   m_mail_handler.Clear();
   m_mail_handler.PushMail(0x8071FEED);
 }
@@ -107,13 +107,13 @@ void ROMUCode::BootUCode()
     }
   }
 
-  DEBUG_LOG(DSPHLE, "CurrentUCode SOURCE Addr: 0x%08x", m_current_ucode.m_ram_address);
-  DEBUG_LOG(DSPHLE, "CurrentUCode Length:      0x%08x", m_current_ucode.m_length);
-  DEBUG_LOG(DSPHLE, "CurrentUCode DEST Addr:   0x%08x", m_current_ucode.m_imem_address);
-  DEBUG_LOG(DSPHLE, "CurrentUCode DMEM Length: 0x%08x", m_current_ucode.m_dmem_length);
-  DEBUG_LOG(DSPHLE, "CurrentUCode init_vector: 0x%08x", m_current_ucode.m_start_pc);
-  DEBUG_LOG(DSPHLE, "CurrentUCode CRC:         0x%08x", ector_crc);
-  DEBUG_LOG(DSPHLE, "BootTask - done");
+  INFO_LOG(DSPHLE, "CurrentUCode SOURCE Addr: 0x%08x", m_current_ucode.m_ram_address);
+  INFO_LOG(DSPHLE, "CurrentUCode Length:      0x%08x", m_current_ucode.m_length);
+  INFO_LOG(DSPHLE, "CurrentUCode DEST Addr:   0x%08x", m_current_ucode.m_imem_address);
+  INFO_LOG(DSPHLE, "CurrentUCode DMEM Length: 0x%08x", m_current_ucode.m_dmem_length);
+  INFO_LOG(DSPHLE, "CurrentUCode init_vector: 0x%08x", m_current_ucode.m_start_pc);
+  INFO_LOG(DSPHLE, "CurrentUCode CRC:         0x%08x", ector_crc);
+  INFO_LOG(DSPHLE, "BootTask - done");
 
   m_dsphle->SetUCode(ector_crc);
 }

Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp

@@ -118,7 +118,7 @@ ZeldaUCode::ZeldaUCode(DSPHLE* dsphle, u32 crc) : UCodeInterface(dsphle, crc)
   m_flags = it->second;
   m_renderer.SetFlags(m_flags);
 
-  WARN_LOG(DSPHLE, "Zelda UCode loaded, crc=%08x, flags=%08x", crc, m_flags);
+  INFO_LOG(DSPHLE, "Zelda UCode loaded, crc=%08x, flags=%08x", crc, m_flags);
 
   if (m_flags & LIGHT_PROTOCOL)
   {

Source/Core/Core/HW/DVDInterface.cpp

@@ -743,7 +743,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
   // Probably only used though WII_IPC
   case DVDLowGetCoverReg:
     WriteImmediate(s_DICVR.Hex, output_address, reply_to_ios);
-    INFO_LOG(DVDINTERFACE, "DVDLowGetCoverReg 0x%08x", s_DICVR.Hex);
+    DEBUG_LOG(DVDINTERFACE, "DVDLowGetCoverReg 0x%08x", s_DICVR.Hex);
     break;
 
   // Probably only used by Wii
@@ -769,7 +769,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
 
   // Probably only used by Wii
   case DVDLowClearCoverInterrupt:
-    INFO_LOG(DVDINTERFACE, "DVDLowClearCoverInterrupt");
+    DEBUG_LOG(DVDINTERFACE, "DVDLowClearCoverInterrupt");
     s_DICVR.CVRINT = 0;
     break;
 
@@ -999,7 +999,7 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
       WriteImmediate(s_current_length >> 2, output_address, reply_to_ios);
       break;
     default:
-      WARN_LOG(DVDINTERFACE, "(Audio): Subcommand: %02x  Request Audio status %s",
+      INFO_LOG(DVDINTERFACE, "(Audio): Subcommand: %02x  Request Audio status %s",
                command_0 >> 16 & 0xFF, s_stream ? "on" : "off");
       break;
     }
@@ -1029,13 +1029,13 @@ void ExecuteCommand(u32 command_0, u32 command_1, u32 command_2, u32 output_addr
     {
       // TODO: What is this actually supposed to do?
       s_stream = true;
-      WARN_LOG(DVDINTERFACE, "(Audio): Audio enabled");
+      INFO_LOG(DVDINTERFACE, "(Audio): Audio enabled");
     }
     else
     {
       // TODO: What is this actually supposed to do?
       s_stream = false;
-      WARN_LOG(DVDINTERFACE, "(Audio): Audio disabled");
+      INFO_LOG(DVDINTERFACE, "(Audio): Audio disabled");
     }
     break;
 

Source/Core/Core/HW/EXI_DeviceAGP.cpp

@@ -254,7 +254,7 @@ u32 CEXIAgp::ImmRead(u32 _uSize)
     m_current_cmd = 0;
     break;
   }
-  INFO_LOG(EXPANSIONINTERFACE, "AGP read %x", uData);
+  DEBUG_LOG(EXPANSIONINTERFACE, "AGP read %x", uData);
   return uData;
 }
 
@@ -266,7 +266,7 @@ void CEXIAgp::ImmWrite(u32 _uData, u32 _uSize)
 
   u8 HashCmd;
   u64 Mask;
-  INFO_LOG(EXPANSIONINTERFACE, "AGP command %x", _uData);
+  DEBUG_LOG(EXPANSIONINTERFACE, "AGP command %x", _uData);
   switch (m_current_cmd)
   {
   case 0xAE020000:  // set up 24 bit address for read 2 bytes