Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/15795 )
Change subject: arm: Replace MiscReg with RegVal in utility.(hh|cc).
......................................................................
arm: Replace MiscReg with RegVal in utility.(hh|cc).
These uses snuck in after the previous pass which made this switch in
the rest of these files.
Change-Id: Ie891c6ec393a65f1c57c54301f0a2bb920d38bb0
Reviewed-on: https://gem5-review.googlesource.com/c/15795
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/arch/arm/utility.cc
M src/arch/arm/utility.hh
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc
index 58eb032..175fd7c 100644
--- a/src/arch/arm/utility.cc
+++ b/src/arch/arm/utility.cc
@@ -205,7 +205,7 @@
return ArmSystem::haveLPAE(tc) && ttbcr.eae;
}
-MiscReg
+RegVal
readMPIDR(ArmSystem *arm_sys, ThreadContext *tc)
{
CPSR cpsr = tc->readMiscReg(MISCREG_CPSR);
@@ -235,7 +235,7 @@
}
}
-MiscReg
+RegVal
getMPIDR(ArmSystem *arm_sys, ThreadContext *tc)
{
// Multiprocessor Affinity Register MPIDR from Cortex(tm)-A15 Technical
diff --git a/src/arch/arm/utility.hh b/src/arch/arm/utility.hh
index 01b95b3..d802b94 100644
--- a/src/arch/arm/utility.hh
+++ b/src/arch/arm/utility.hh
@@ -253,10 +253,10 @@
/** This helper function is either returing the value of
* MPIDR_EL1 (by calling getMPIDR), or it is issuing a read
* to VMPIDR_EL2 (as it happens in virtualized systems) */
-MiscReg readMPIDR(ArmSystem *arm_sys, ThreadContext *tc);
+RegVal readMPIDR(ArmSystem *arm_sys, ThreadContext *tc);
/** This helper function is returing the value of MPIDR_EL1 */
-MiscReg getMPIDR(ArmSystem *arm_sys, ThreadContext *tc);
+RegVal getMPIDR(ArmSystem *arm_sys, ThreadContext *tc);
static inline uint32_t
mcrMrcIssBuild(bool isRead, uint32_t crm, IntRegIndex rt, uint32_t crn,
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/15795
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ie891c6ec393a65f1c57c54301f0a2bb920d38bb0
Gerrit-Change-Number: 15795
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
