Fix compile errors due to rebase

cemu-project · Dec 17, 2023 · 7b04057 · 7b04057
1 parent 800ce43
commit 7b04057
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/Cafe/HW/Espresso/Recompiler/IML/IMLRegisterAllocator.cpp b/src/Cafe/HW/Espresso/Recompiler/IML/IMLRegisterAllocator.cpp
@@ -1190,7 +1190,7 @@ void _IMLRA_checkAndTryExtendRange(IMLRegisterAllocatorContext& ctx, IMLSegment*
 {
 	if (routeDepth >= 64)
 	{
-		forceLogDebug_printf("Recompiler RA route maximum depth exceeded\n");
+		cemuLog_logDebug(LogType::Force, "Recompiler RA route maximum depth exceeded\n");
 		return;
 	}
 	route[routeDepth] = currentSegment;

diff --git a/src/util/helpers/StringBuf.h b/src/util/helpers/StringBuf.h
@@ -44,11 +44,9 @@ class StringBuf
 
 	void add(std::string_view appendedStr)
 	{
-		if (this->length + appendedStr.size() + 1 >= this->limit)
-			_reserve(std::max<uint32>(this->length + appendedStr.size() + 64, this->limit + this->limit / 2));
 		size_t copyLen = appendedStr.size();
-		if (remainingLen < copyLen)
-			copyLen = remainingLen;
+		if (this->length + copyLen + 1 >= this->limit)
+			_reserve(std::max<uint32>(this->length + copyLen + 64, this->limit + this->limit / 2));
 		char* outputStart = (char*)(this->str + this->length);
 		std::copy(appendedStr.data(), appendedStr.data() + copyLen, outputStart);
 		length += copyLen;