Roger Chang has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/66811?usp=email )
Change subject: arch-riscv: Refactor template JumpConstructor
......................................................................
arch-riscv: Refactor template JumpConstructor
Add COPCODE == 4 condition to ensure the available instruction is either
c_jr or c_jalr and the flag IsReturn should set for instruction c_jalr if
RC1 == t0
Change-Id: I1b39a6c1dc52c8035f16cc64a1b4c494b14879c0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66811
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Yu-hsin Wang <yuhsi...@google.com>
---
M src/arch/riscv/isa/formats/standard.isa
1 file changed, 23 insertions(+), 3 deletions(-)
Approvals:
Yu-hsin Wang: Looks good to me, approved
kokoro: Regressions pass
Jason Lowe-Power: Looks good to me, approved
diff --git a/src/arch/riscv/isa/formats/standard.isa
b/src/arch/riscv/isa/formats/standard.isa
index 6be281f..bb500f5 100644
--- a/src/arch/riscv/isa/formats/standard.isa
+++ b/src/arch/riscv/isa/formats/standard.isa
@@ -250,9 +250,14 @@
%(constructor)s;
%(imm_code)s;
if (QUADRANT != 0x3) {
- // Handle "c_jr" instruction, set "IsReturn" flag if RC1 is 1
or 5
- if (CFUNCT1 == 0 && (RC1 == 1 || RC1 == 5))
- flags[IsReturn] = true;
+ if (COPCODE == 4) {
+ // Handle "c_jr" instruction, set "IsReturn" flag if RC1
is 1 or 5
+ if (CFUNCT1 == 0 && (RC1 == 1 || RC1 == 5))
+ flags[IsReturn] = true;
+ // Handle "c_jalr" instruction, set IsReturn if RC1 != ra
+ if (CFUNCT1 == 1 && RC1 == 5)
+ flags[IsReturn] = true;
+ }
} else {
bool rd_link = (RD == 1 || RD == 5);
bool rs1_link = (RS1 == 1 || RS1 == 5);
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/66811?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I1b39a6c1dc52c8035f16cc64a1b4c494b14879c0
Gerrit-Change-Number: 66811
Gerrit-PatchSet: 5
Gerrit-Owner: Roger Chang <rogerycch...@google.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Roger Chang <rogerycch...@google.com>
Gerrit-Reviewer: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Earl Ou <shunhsin...@google.com>
Gerrit-CC: Jui-min Lee <f...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
