Roger Chang has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67251?usp=email )
Change subject: arch-riscv: Check RISCV process run in matched CPU
......................................................................
arch-riscv: Check RISCV process run in matched CPU
1. Remove set RV32 flag in RiscvProcess32
2. Check if binary run appropriate CPU
Change-Id: I00b0725f3eb4f29e45b8ec719317af79355dc728
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67251
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/riscv/process.cc
1 file changed, 24 insertions(+), 5 deletions(-)
Approvals:
kokoro: Regressions pass
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
diff --git a/src/arch/riscv/process.cc b/src/arch/riscv/process.cc
index dc7abae..cd00f5d 100644
--- a/src/arch/riscv/process.cc
+++ b/src/arch/riscv/process.cc
@@ -101,8 +101,12 @@
Process::initState();
argsInit<uint64_t>(PageBytes);
- for (ContextID ctx: contextIds)
- system->threads[ctx]->setMiscRegNoEffect(MISCREG_PRV, PRV_U);
+ for (ContextID ctx: contextIds) {
+ auto *tc = system->threads[ctx];
+ tc->setMiscRegNoEffect(MISCREG_PRV, PRV_U);
+ auto *isa = dynamic_cast<ISA*>(tc->getIsaPtr());
+ fatal_if(isa->rvType() != RV64, "RISC V CPU should run in 64 bits
mode");
+ }
}
void
@@ -114,9 +118,8 @@
for (ContextID ctx: contextIds) {
auto *tc = system->threads[ctx];
tc->setMiscRegNoEffect(MISCREG_PRV, PRV_U);
- PCState pc = tc->pcState().as<PCState>();
- pc.rvType(RV32);
- tc->pcState(pc);
+ auto *isa = dynamic_cast<ISA*>(tc->getIsaPtr());
+ fatal_if(isa->rvType() != RV32, "RISC V CPU should run in 32 bits
mode");
}
}
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67251?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: I00b0725f3eb4f29e45b8ec719317af79355dc728
Gerrit-Change-Number: 67251
Gerrit-PatchSet: 4
Gerrit-Owner: Roger Chang <[email protected]>
Gerrit-Reviewer: Bobby Bruce <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jui-min Lee <[email protected]>
Gerrit-Reviewer: Roger Chang <[email protected]>
Gerrit-Reviewer: Yu-hsin Wang <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-CC: Earl Ou <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
