ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: in CX86Ops::_log better handle label symbols

This commit is contained in:
zilmar 2024-11-07 12:12:44 +10:30
parent d06212e766
commit a46ac9f38d
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp
View File

@ -862,10 +862,23 @@ asmjit::Error CX86Ops::_log(const char * data, size_t size) noexcept
Pos = AsmjitLog.find("L"); Pos = AsmjitLog.find("L");
if (m_LabelSymbols.size() > 0 && Pos != std::string::npos) if (m_LabelSymbols.size() > 0 && Pos != std::string::npos)
{ {
NumberSymbolMap::iterator itr = m_LabelSymbols.find(std::stoul(&AsmjitLog[Pos + 1], nullptr, 10)); size_t len = AsmjitLog.length();
uint32_t Value = 0;
for (int i = 0; i < 8 && (Pos + 1 + i) < len; i++)
{
char c = AsmjitLog[Pos + 1 + i];
if (c >= '0' && c <= '9')
{
Value = (Value << 4) | (c - '0');
}
else
{
break;
}
}
NumberSymbolMap::iterator itr = m_LabelSymbols.find(Value);
if (itr != m_LabelSymbols.end()) if (itr != m_LabelSymbols.end())
{ {
std::string::size_type endPos = Pos + 1; std::string::size_type endPos = Pos + 1;
for (std::string::size_type LenSize = AsmjitLog.length(); (endPos < LenSize && isdigit((unsigned char)AsmjitLog[endPos])); endPos++) for (std::string::size_type LenSize = AsmjitLog.length(); (endPos < LenSize && isdigit((unsigned char)AsmjitLog[endPos])); endPos++)
{ {
@ -892,7 +905,7 @@ void CX86Ops::AddLabelSymbol(const asmjit::Label & Label, const char * Symbol)
} }
else else
{ {
m_LabelSymbols.emplace(std::make_pair(Label.id(), NumberSymbol{Symbol, 1})); m_LabelSymbols.emplace(std::make_pair(Label.id(), NumberSymbol{Symbol, 2}));
} }
} }