mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-31 18:11:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

handle sp and rtoc as GPR aliases

Browse Source 
Co-Authored-By: mitaclaw <140017135+mitaclaw@users.noreply.github.com>
This commit is contained in:
VampireFlower 2024-06-03 22:14:40 -06:00
parent 46a89936ae
commit 8f03d9e8ca
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/Common/Assembler/GekkoLexer.cpp
View File

@ -4,6 +4,7 @@
#include "Common/Assembler/GekkoLexer.h" #include "Common/Assembler/GekkoLexer.h"
#include "Common/Assert.h" #include "Common/Assert.h"
#include "Common/StringUtil.h"
#include <iterator> #include <iterator>
#include <numeric> #include <numeric>
@ -181,6 +182,11 @@ std::optional<T> EvalIntegral(TokenType tp, std::string_view val)
case TokenType::BinaryLit: case TokenType::BinaryLit:
return std::accumulate(val.begin() + 2, val.end(), T{0}, bin_step); return std::accumulate(val.begin() + 2, val.end(), T{0}, bin_step);
case TokenType::GPR: case TokenType::GPR:
if (CaseInsensitiveEquals(val, "sp"))
return T{1};
if (CaseInsensitiveEquals(val, "rtoc"))
return T{2};
[[fallthrough]];
case TokenType::FPR: case TokenType::FPR:
return std::accumulate(val.begin() + 1, val.end(), T{0}, dec_step); return std::accumulate(val.begin() + 1, val.end(), T{0}, dec_step);
case TokenType::CRField: case TokenType::CRField:
@ -649,44 +655,37 @@ TokenType Lexer::ClassifyAlnum() const
return false; return false;
}; };
constexpr auto eq_nocase = [](std::string_view str, std::string_view lwr) {
auto it_l = str.cbegin(), it_r = lwr.cbegin();
for (; it_l != str.cend() && it_r != lwr.cend(); it_l++, it_r++)
{
if (std::tolower(*it_l) != *it_r)
{
return false;
}
}
return it_l == str.end() && it_r == lwr.end();
};
if (std::tolower(alnum[0]) == 'r' && valid_regnum(alnum.substr(1))) if (std::tolower(alnum[0]) == 'r' && valid_regnum(alnum.substr(1)))
{ {
return TokenType::GPR; return TokenType::GPR;
} }
else if ((CaseInsensitiveEquals(alnum, "sp")) || (CaseInsensitiveEquals(alnum, "rtoc")))
{
return TokenType::GPR;
}
else if (std::tolower(alnum[0]) == 'f' && valid_regnum(alnum.substr(1))) else if (std::tolower(alnum[0]) == 'f' && valid_regnum(alnum.substr(1)))
{ {
return TokenType::FPR; return TokenType::FPR;
} }
else if (alnum.length() == 3 && eq_nocase(alnum.substr(0, 2), "cr") && alnum[2] >= '0' && else if (alnum.length() == 3 && CaseInsensitiveEquals(alnum.substr(0, 2), "cr") &&
alnum[2] <= '7') alnum[2] >= '0' && alnum[2] <= '7')
{ {
return TokenType::CRField; return TokenType::CRField;
} }
else if (eq_nocase(alnum, "lt")) else if (CaseInsensitiveEquals(alnum, "lt"))
{ {
return TokenType::Lt; return TokenType::Lt;
} }
else if (eq_nocase(alnum, "gt")) else if (CaseInsensitiveEquals(alnum, "gt"))
{ {
return TokenType::Gt; return TokenType::Gt;
} }
else if (eq_nocase(alnum, "eq")) else if (CaseInsensitiveEquals(alnum, "eq"))
{ {
return TokenType::Eq; return TokenType::Eq;
} }
else if (eq_nocase(alnum, "so")) else if (CaseInsensitiveEquals(alnum, "so"))
{ {
return TokenType::So; return TokenType::So;
} }