From c52db636cea7741d8633556ee9276bddd3d0e8ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 12 Jan 2023 22:34:44 +0100
Subject: [PATCH] Optimize tag formatting

---
 Core/HLE/ReplaceTables.cpp      | 32 ++++++++++++++++++--------------
 Core/HLE/sceDmac.cpp            |  5 +++--
 Core/HLE/sceKernelInterrupt.cpp |  7 ++++---
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/Core/HLE/ReplaceTables.cpp b/Core/HLE/ReplaceTables.cpp
index 446df7826c..93ac83c079 100644
--- a/Core/HLE/ReplaceTables.cpp
+++ b/Core/HLE/ReplaceTables.cpp
@@ -159,12 +159,13 @@ static int Replace_memcpy() {
 	RETURN(destPtr);
 
 	if (MemBlockInfoDetailed(bytes)) {
-		const std::string tag = GetMemWriteTagAt("ReplaceMemcpy/", srcPtr, bytes);
-		NotifyMemInfo(MemBlockFlags::READ, srcPtr, bytes, tag.c_str(), tag.size());
-		NotifyMemInfo(MemBlockFlags::WRITE, destPtr, bytes, tag.c_str(), tag.size());
+		char tagData[128];
+		size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "ReplaceMemcpy/", srcPtr, bytes);
+		NotifyMemInfo(MemBlockFlags::READ, srcPtr, bytes, tagData, tagSize);
+		NotifyMemInfo(MemBlockFlags::WRITE, destPtr, bytes, tagData, tagSize);
 
 		// It's pretty common that games will copy video data.
-		if (tag == "ReplaceMemcpy/VideoDecode" || tag == "ReplaceMemcpy/VideoDecodeRange") {
+		if (!strcmp(tagData, "ReplaceMemcpy/VideoDecode") || !strcmp(tagData, "ReplaceMemcpy/VideoDecodeRange")) {
 			if (bytes == 512 * 272 * 4) {
 				gpu->PerformWriteFormattedFromMemory(destPtr, bytes, 512, GE_FORMAT_8888);
 			}
@@ -211,12 +212,13 @@ static int Replace_memcpy_jak() {
 	RETURN(destPtr);
 
 	if (MemBlockInfoDetailed(bytes)) {
-		const std::string tag = GetMemWriteTagAt("ReplaceMemcpy/", srcPtr, bytes);
-		NotifyMemInfo(MemBlockFlags::READ, srcPtr, bytes, tag.c_str(), tag.size());
-		NotifyMemInfo(MemBlockFlags::WRITE, destPtr, bytes, tag.c_str(), tag.size());
+		char tagData[128];
+		size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "ReplaceMemcpy/", srcPtr, bytes);
+		NotifyMemInfo(MemBlockFlags::READ, srcPtr, bytes, tagData, tagSize);
+		NotifyMemInfo(MemBlockFlags::WRITE, destPtr, bytes, tagData, tagSize);
 
 		// It's pretty common that games will copy video data.
-		if (tag == "ReplaceMemcpy/VideoDecode" || tag == "ReplaceMemcpy/VideoDecodeRange") {
+		if (!strcmp(tagData, "ReplaceMemcpy/VideoDecode") || !strcmp(tagData, "ReplaceMemcpy/VideoDecodeRange")) {
 			if (bytes == 512 * 272 * 4) {
 				gpu->PerformWriteFormattedFromMemory(destPtr, bytes, 512, GE_FORMAT_8888);
 			}
@@ -250,9 +252,10 @@ static int Replace_memcpy16() {
 	RETURN(destPtr);
 
 	if (MemBlockInfoDetailed(bytes)) {
-		const std::string tag = GetMemWriteTagAt("ReplaceMemcpy16/", srcPtr, bytes);
-		NotifyMemInfo(MemBlockFlags::READ, srcPtr, bytes, tag.c_str(), tag.size());
-		NotifyMemInfo(MemBlockFlags::WRITE, destPtr, bytes, tag.c_str(), tag.size());
+		char tagData[128];
+		size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "ReplaceMemcpy16/", srcPtr, bytes);
+		NotifyMemInfo(MemBlockFlags::READ, srcPtr, bytes, tagData, tagSize);
+		NotifyMemInfo(MemBlockFlags::WRITE, destPtr, bytes, tagData, tagSize);
 	}
 
 	return 10 + bytes / 4;  // approximation
@@ -322,9 +325,10 @@ static int Replace_memmove() {
 	RETURN(destPtr);
 
 	if (MemBlockInfoDetailed(bytes)) {
-		const std::string tag = GetMemWriteTagAt("ReplaceMemmove/", srcPtr, bytes);
-		NotifyMemInfo(MemBlockFlags::READ, srcPtr, bytes, tag.c_str(), tag.size());
-		NotifyMemInfo(MemBlockFlags::WRITE, destPtr, bytes, tag.c_str(), tag.size());
+		char tagData[128];
+		size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "ReplaceMemmove/", srcPtr, bytes);
+		NotifyMemInfo(MemBlockFlags::READ, srcPtr, bytes, tagData, tagSize);
+		NotifyMemInfo(MemBlockFlags::WRITE, destPtr, bytes, tagData, tagSize);
 	}
 
 	return 10 + bytes / 4;  // approximation
diff --git a/Core/HLE/sceDmac.cpp b/Core/HLE/sceDmac.cpp
index 3735eb2a84..f7bcf0d0f6 100644
--- a/Core/HLE/sceDmac.cpp
+++ b/Core/HLE/sceDmac.cpp
@@ -52,8 +52,9 @@ static int __DmacMemcpy(u32 dst, u32 src, u32 size) {
 	if (!skip && size != 0) {
 		currentMIPS->InvalidateICache(src, size);
 		if (MemBlockInfoDetailed(size)) {
-			const std::string tag = GetMemWriteTagAt("DmacMemcpy/", src, size);
-			Memory::Memcpy(dst, src, size, tag.c_str(), tag.size());
+			char tagData[128];
+			size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "DmacMemcpy/", src, size);
+			Memory::Memcpy(dst, src, size, tagData, tagSize);
 		} else {
 			Memory::Memcpy(dst, src, size, "DmacMemcpy");
 		}
diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp
index 569c1cf746..2168df3eed 100644
--- a/Core/HLE/sceKernelInterrupt.cpp
+++ b/Core/HLE/sceKernelInterrupt.cpp
@@ -657,9 +657,10 @@ static u32 sceKernelMemcpy(u32 dst, u32 src, u32 size)
 	}
 
 	if (MemBlockInfoDetailed(size)) {
-		const std::string tag = GetMemWriteTagAt("KernelMemcpy/", src, size);
-		NotifyMemInfo(MemBlockFlags::READ, src, size, tag.c_str(), tag.size());
-		NotifyMemInfo(MemBlockFlags::WRITE, dst, size, tag.c_str(), tag.size());
+		char tagData[128];
+		size_t tagSize = FormatMemWriteTagAt(tagData, sizeof(tagData), "KernelMemcpy/", src, size);
+		NotifyMemInfo(MemBlockFlags::READ, src, size, tagData, tagSize);
+		NotifyMemInfo(MemBlockFlags::WRITE, dst, size, tagData, tagSize);
 	}
 
 	return dst;