LibDisassembly: RISC-V disassembly 4-2/4-5: Disassemble extensions FD (floating-point), A (atomic) and Zicsr (CSRs) #25836
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
👀 pr-needs-review
spholz
reviewed
Mar 30, 2025
| @@ -147,6 +271,16 @@ String MemoryLoad::mnemonic() const | |||
| return MUST(String::formatted("l{}", m_width)); | |||
| } | |||
|
|
|||
| String FloatMemoryLoad::to_string(DisplayStyle display_style, u32, Optional<SymbolProvider const&>) const | |||
| { | |||
| return MUST(String::formatted("fl{:8} {}, {:#03x}({})", memory_width(), format_register(destination_register(), display_style), immediate(), format_register(base(), display_style))); | |||
There was a problem hiding this comment.
You use mnemonic() in the format string everywhere except here and in FloatMemoryStore::to_string.
There was a problem hiding this comment.
You forgot to change it for FloatMemory**Store**.
Note that CSR pretty-printing is not yet implemented, since we aim to establish shared CSR utilities in AK in the near future.
Again, no point in splitting these two since the orthagonal instruction set makes supporting both in common abstractions convenient.
kleinesfilmroellchen
force-pushed
the
risc-v-disasm/04-02-fdazicsr
branch
from
0de3973 to
f35831d
Compare
spholz
reviewed
Apr 12, 2025
Comment on lines
+35
to
+40
| break; | ||
| default: | ||
| return adopt_own(*new (nothrow) UnknownInstruction); | ||
| } | ||
|
|
||
| return adopt_own(*new (nothrow) AtomicMemoryOperation(operation, is_acquire, is_release, width, raw_parts.rs1, raw_parts.rs2, raw_parts.rd)); |
There was a problem hiding this comment.
Suggested change
| break; | |
| default: | |
| return adopt_own(*new (nothrow) UnknownInstruction); | |
| } | |
| return adopt_own(*new (nothrow) AtomicMemoryOperation(operation, is_acquire, is_release, width, raw_parts.rs1, raw_parts.rs2, raw_parts.rd)); | |
| return adopt_own(*new (nothrow) AtomicMemoryOperation(operation, is_acquire, is_release, width, raw_parts.rs1, raw_parts.rs2, raw_parts.rd)); | |
| default: | |
| return adopt_own(*new (nothrow) UnknownInstruction); | |
| } |
nit: Having this break feels weird now that you cast the funct7 directly to the Operation enum.
| @@ -172,6 +172,26 @@ String InstructionFetchFence::mnemonic() const | |||
| return "fence.i"_string; | |||
| } | |||
|
|
|||
| String CSRImmediateInstruction::to_string(DisplayStyle display_style, u32, Optional<SymbolProvider const&>) const | |||
| { | |||
| return MUST(String::formatted("{:10} {}, {:x}, {}", mnemonic(), format_register(destination_register(), display_style), csr(), immediate())); | |||
|
|
||
| String CSRRegisterInstruction::to_string(DisplayStyle display_style, u32, Optional<SymbolProvider const&>) const | ||
| { | ||
| return MUST(String::formatted("{:10} {}, {:x}, {}", mnemonic(), format_register(destination_register(), display_style), csr(), format_register(source_register(), display_style))); |
| @@ -147,6 +271,16 @@ String MemoryLoad::mnemonic() const | |||
| return MUST(String::formatted("l{}", m_width)); | |||
| } | |||
|
|
|||
| String FloatMemoryLoad::to_string(DisplayStyle display_style, u32, Optional<SymbolProvider const&>) const | |||
| { | |||
| return MUST(String::formatted("fl{:8} {}, {:#03x}({})", memory_width(), format_register(destination_register(), display_style), immediate(), format_register(base(), display_style))); | |||
There was a problem hiding this comment.
You forgot to change it for FloatMemory**Store**.
Comment on lines
82
to
87
| if ((raw_parts.funct7 & 1) > 0) | ||
| return adopt_own(*new ConvertFloat(ConvertFloat::Operation::SingleToDouble, rounding_mode, as_float_register(raw_parts.rs1), as_float_register(raw_parts.rd))); | ||
| else | ||
| return adopt_own(*new ConvertFloat(ConvertFloat::Operation::DoubleToSingle, rounding_mode, as_float_register(raw_parts.rs1), as_float_register(raw_parts.rd))); |
There was a problem hiding this comment.
The fmt field (you call it width) is at the same position as for all other instructions.
It just means the target format for FCVT.S.D, FCVT.D.S etc.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This second PR in the collection deals with all the remaining non-priviledged extensions we need right now. I encourage anyone with three years of free time to tackle V :3
LibDisassembly: Add RISC-V Zicsr extension decoding
Note that CSR pretty-printing is not yet implemented, since we aim to establish shared CSR utilities in AK in the near future.
LibDisassembly: Add RISC-V FD extension decoding
Again, no point in splitting these two since the orthagonal instruction set makes supporting both in common abstractions convenient.
LibDisassembly: Add RISC-V A extension decoding