Fix compile errors due to rebase

This commit is contained in:
Exzap 2023-12-13 17:48:53 +01:00
parent 1cc458c543
commit c419bfc451
2 changed files with 3 additions and 5 deletions

View file

@ -1190,7 +1190,7 @@ void _IMLRA_checkAndTryExtendRange(IMLRegisterAllocatorContext& ctx, IMLSegment*
{ {
if (routeDepth >= 64) if (routeDepth >= 64)
{ {
forceLogDebug_printf("Recompiler RA route maximum depth exceeded\n"); cemuLog_logDebug(LogType::Force, "Recompiler RA route maximum depth exceeded\n");
return; return;
} }
route[routeDepth] = currentSegment; route[routeDepth] = currentSegment;

View file

@ -44,11 +44,9 @@ public:
void add(std::string_view appendedStr) 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(); size_t copyLen = appendedStr.size();
if (remainingLen < copyLen) if (this->length + copyLen + 1 >= this->limit)
copyLen = remainingLen; _reserve(std::max<uint32>(this->length + copyLen + 64, this->limit + this->limit / 2));
char* outputStart = (char*)(this->str + this->length); char* outputStart = (char*)(this->str + this->length);
std::copy(appendedStr.data(), appendedStr.data() + copyLen, outputStart); std::copy(appendedStr.data(), appendedStr.data() + copyLen, outputStart);
length += copyLen; length += copyLen;