From 98101bbbe4d54e3831800d63023d7c4730776b95 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 8 Jul 2019 18:00:56 -0400 Subject: [PATCH] Core: Use fmt where applicable for DebugInterface implementations These are trivial enough that they're basically one-to-one conversions with minor changes of syntax. --- Source/Core/Core/Debugger/PPCDebugInterface.cpp | 5 +++-- Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/Debugger/PPCDebugInterface.cpp b/Source/Core/Core/Debugger/PPCDebugInterface.cpp index d93f369ac3..473509a67c 100644 --- a/Source/Core/Core/Debugger/PPCDebugInterface.cpp +++ b/Source/Core/Core/Debugger/PPCDebugInterface.cpp @@ -7,9 +7,10 @@ #include #include +#include + #include "Common/Align.h" #include "Common/GekkoDisassembler.h" -#include "Common/StringUtil.h" #include "Core/Core.h" #include "Core/HW/DSP.h" @@ -199,7 +200,7 @@ std::string PPCDebugInterface::GetRawMemoryString(int memory, u32 address) const bool is_aram = memory != 0; if (is_aram || PowerPC::HostIsRAMAddress(address)) - return StringFromFormat("%08X%s", ReadExtraMemory(memory, address), is_aram ? " (ARAM)" : ""); + return fmt::format("{:08X}{}", ReadExtraMemory(memory, address), is_aram ? " (ARAM)" : ""); return is_aram ? "--ARAM--" : "--------"; } diff --git a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp index 9ec83289a8..8ea752fddd 100644 --- a/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp +++ b/Source/Core/Core/HW/DSPLLE/DSPDebugInterface.cpp @@ -7,8 +7,9 @@ #include #include +#include + #include "Common/MsgHandler.h" -#include "Common/StringUtil.h" #include "Core/DSP/DSPCore.h" #include "Core/DSP/DSPMemoryMap.h" #include "Core/HW/DSPLLE/DSPSymbols.h" @@ -156,7 +157,7 @@ std::string DSPDebugInterface::GetRawMemoryString(int memory, u32 address) { case 0: case 0x8: - return StringFromFormat("%04x", dsp_imem_read(address)); + return fmt::format("{:04x}", dsp_imem_read(address)); default: return "--IMEM--"; } @@ -166,9 +167,9 @@ std::string DSPDebugInterface::GetRawMemoryString(int memory, u32 address) { case 0: case 1: - return StringFromFormat("%04x (DMEM)", dsp_dmem_read(address)); + return fmt::format("{:04x} (DMEM)", dsp_dmem_read(address)); case 0xf: - return StringFromFormat("%04x (MMIO)", g_dsp.ifx_regs[address & 0xFF]); + return fmt::format("{:04x} (MMIO)", g_dsp.ifx_regs[address & 0xFF]); default: return "--DMEM--"; }