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 <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>

diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc
index 58eb032c47b37c23421191139472cf6c3f39eda4..175fd7c002644b6856b9f37c42b652ac11690dc8 100644 (file)
--- a/src/arch/arm/utility.cc
+++ b/src/arch/arm/utility.cc
@@ -205,7 +205,7 @@ longDescFormatInUse(ThreadContext *tc)
     return ArmSystem::haveLPAE(tc) && ttbcr.eae;
 }
 
-MiscReg
+RegVal
 readMPIDR(ArmSystem *arm_sys, ThreadContext *tc)
 {
     CPSR cpsr = tc->readMiscReg(MISCREG_CPSR);
@@ -235,7 +235,7 @@ readMPIDR(ArmSystem *arm_sys, ThreadContext *tc)
     }
 }
 
-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 01b95b3b5770f3c44091a0e074df3bd3e1e75b7e..d802b944a6855352c3c1dbca88c2cf950d5927d5 100644 (file)
--- a/src/arch/arm/utility.hh
+++ b/src/arch/arm/utility.hh
@@ -253,10 +253,10 @@ bool longDescFormatInUse(ThreadContext *tc);
 /** 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,