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.

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

Decode AMOXOR_D (and similar instructions) only when XLEN=64bits #1355

Merged
merged 3 commits into from
Sep 1, 2023

Conversation

JeanRochCoulon
Copy link
Contributor

It fixes #1352

@github-actions
Copy link
Contributor

❌ failed run, report available here.

core/decoder.sv Outdated
@@ -1073,7 +1073,7 @@ module decoder import ariane_pkg::*; #(
instruction_o.rd[4:0] = instr.atype.rd;
// TODO(zarubaf): Ordering
// words
if (CVA6Cfg.RVA && instr.stype.funct3 == 3'h2) begin
if (riscv::IS_XLEN64 && CVA6Cfg.RVA && instr.stype.funct3 == 3'h2) begin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @JeanRochCoulon, I think only the double words AMO.D instruction that should be decoded when XLEN = 64,
the AMO.W word instructions it a RV32A instruction.
So I think you should modify the condition for double words not words

@JeanRochCoulon JeanRochCoulon changed the title Decode AMOXOR_W only when XLEN=64bits Decode AMOXOR_D (and similar instructions) only when XLEN=64bits Aug 31, 2023
@github-actions
Copy link
Contributor

✔️ successful run, report available here.

@JeanRochCoulon
Copy link
Contributor Author

Thank you @AyoubJalali
Can you check it fixes the bug ?

@AyoubJalali
Copy link
Contributor

Can you check it fixes the bug ?

LGTM

@JeanRochCoulon JeanRochCoulon merged commit c8202ae into master Sep 1, 2023
12 checks passed
@JeanRochCoulon JeanRochCoulon deleted the JeanRochCoulon-AMOXOR branch September 1, 2023 09:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Decoding RV64 as a RV32 instruction
2 participants