piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add numeric label support to assembler

Browse Source
This commit is contained in:
vyuuui
2025-03-24 07:16:14 -07:00
parent 5d4b884e64
commit e34907025d
7 changed files with 224 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,6 +201,9 @@ std::optional<T> EvalIntegral(TokenType tp, std::string_view val)
return T{2};
case TokenType::So:
return T{3};
case TokenType::NumLabFwd:
case TokenType::NumLabBwd:
return std::accumulate(val.begin(), val.end() - 1, T{0}, dec_step);
default:
return std::nullopt;
}
@ -723,9 +726,9 @@ AssemblerToken Lexer::LexSingle() const
}
else if (h == '0')
{
const char imm_type = Peek();
const char nextch = Peek();
if (imm_type == 'x')
if (nextch == 'x')
{
token_type = TokenType::HexadecimalLit;
Step();
@ -733,21 +736,33 @@ AssemblerToken Lexer::LexSingle() const
{
}
}
else if (imm_type == 'b')
else if (nextch == 'b')
{
token_type = TokenType::BinaryLit;
Step();
for (char c = Peek(); IsBinary(c); c = Step().Peek())
if (!IsBinary(Peek()))
{
token_type = TokenType::NumLabBwd;
}
else
{
token_type = TokenType::BinaryLit;
for (char c = Peek(); IsBinary(c); c = Step().Peek())
{
}
}
}
else if (IsOctal(imm_type))
else if (IsOctal(nextch))
{
token_type = TokenType::OctalLit;
for (char c = Peek(); IsOctal(c); c = Step().Peek())
{
}
}
else if (nextch == 'f')
{
Step();
token_type = TokenType::NumLabFwd;
}
else
{
token_type = TokenType::DecimalLit;
@ -758,7 +773,22 @@ AssemblerToken Lexer::LexSingle() const
for (char c = Peek(); std::isdigit(c); c = Step().Peek())
{
}
token_type = TokenType::DecimalLit;
switch (Peek())
{
case 'f':
token_type = TokenType::NumLabFwd;
Step();
break;
case 'b':
token_type = TokenType::NumLabBwd;
Step();
break;
default:
token_type = TokenType::DecimalLit;
break;
}
}
else if (h == '<' || h == '>')
{