Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DEBUGGER] Assemble dialog box instruction proper disassembly and absolute addresses support #13468

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+290 −59
Open

[DEBUGGER] Assemble dialog box instruction proper disassembly and absolute addresses support #13468

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
07ca278
[DEBUGGER] Assemble dialog box instruction automatically filed with t…
Nitch2024 Mar 29, 2025
2acc29c
Use exception safe strtoul to fix build issue for Linux and OSX
Nitch2024 Mar 29, 2025
da7ad1d
Improved roundtrip between assemble and disassemble following vyuuui …
Nitch2024 Apr 3, 2025
cbcaf0b
Fixing lint issues
Nitch2024 Apr 3, 2025
db195e4
Fixed typo
Nitch2024 Apr 4, 2025
90737fd
Merge branch 'dolphin-emu:master' into AssembleDialog
Nitch2024 Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Source/Core/Common/Assembler/GekkoIRGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ void GekkoIRPlugin::EvalTerminalRel(Terminal type, const AssemblerToken& tok)
case Terminal::Bin:
case Terminal::GPR:
case Terminal::FPR:
case Terminal::GQR:
case Terminal::SPR:
case Terminal::CRField:
case Terminal::Lt:
Expand Down Expand Up @@ -732,6 +733,7 @@ void GekkoIRPlugin::EvalTerminalAbs(Terminal type, const AssemblerToken& tok)
case Terminal::Bin:
case Terminal::GPR:
case Terminal::FPR:
case Terminal::GQR:
case Terminal::SPR:
case Terminal::CRField:
case Terminal::Lt:
Expand Down
13 changes: 13 additions & 0 deletions Source/Core/Common/Assembler/GekkoLexer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ std::optional<T> EvalIntegral(TokenType tp, std::string_view val)
if (CaseInsensitiveEquals(val, "rtoc"))
return T{2};
[[fallthrough]];
case TokenType::GQR:
return std::accumulate(val.begin() + 2, val.end(), T{0}, dec_step);
case TokenType::FPR:
return std::accumulate(val.begin() + 1, val.end(), T{0}, dec_step);
case TokenType::CRField:
Expand Down Expand Up @@ -220,6 +222,8 @@ std::string_view TokenTypeToStr(TokenType tp)
return "GPR";
case TokenType::FPR:
return "FPR";
case TokenType::GQR:
return "QGR";
case TokenType::SPR:
return "SPR";
case TokenType::CRField:
Expand Down Expand Up @@ -668,6 +672,15 @@ TokenType Lexer::ClassifyAlnum() const
{
return TokenType::FPR;
}
else if (std::tolower(alnum[0]) == 'p' && valid_regnum(alnum.substr(1)))
{
return TokenType::FPR;
}
else if (alnum.length() == 3 && CaseInsensitiveEquals(alnum.substr(0, 2), "qr") &&
alnum[2] >= '0' && alnum[2] <= '7')
{
return TokenType::GQR;
}
else if (alnum.length() == 3 && CaseInsensitiveEquals(alnum.substr(0, 2), "cr") &&
alnum[2] >= '0' && alnum[2] <= '7')
{
Expand Down
1 change: 1 addition & 0 deletions Source/Core/Common/Assembler/GekkoLexer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ enum class TokenType
FloatLit,
GPR,
FPR,
GQR,
CRField,
SPR,
Lt,
Expand Down
4 changes: 4 additions & 0 deletions Source/Core/Common/Assembler/GekkoParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ void ParsePpcBuiltin(ParseState* state)
case TokenType::FPR:
state->plugin.OnTerminal(Terminal::FPR, tok);
break;
case TokenType::GQR:
state->plugin.OnTerminal(Terminal::GQR, tok);
break;
case TokenType::SPR:
state->plugin.OnTerminal(Terminal::SPR, tok);
break;
Expand Down Expand Up @@ -176,6 +179,7 @@ void ParseBaseexpr(ParseState* state)
case TokenType::GPR:
case TokenType::FPR:
case TokenType::SPR:
case TokenType::GQR:
case TokenType::CRField:
case TokenType::Lt:
case TokenType::Gt:
Expand Down
1 change: 1 addition & 0 deletions Source/Core/Common/Assembler/GekkoParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ enum class Terminal
Id,
GPR,
FPR,
GQR,
SPR,
CRField,
Lt,
Expand Down
Loading