From: Chun-Chen TK Hsu <chunchenhsu@google.com>
Date: Mon, 30 Dec 2019 08:23:40 +0000 (+0800)
Subject: fastmodel: Fix compilation errors
X-Git-Tag: v19.0.0.0~154
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ab049c87c9c85b5d1b6d6a99c81858534cc9f869;p=gem5.git

fastmodel: Fix compilation errors

This changes fixes two compilation errors when compiling with
FastModels. One is that CurrentMsn should be Iris::CurrentMsn and the
other is that currEL() function needs arch/arm/utility.hh header file.

Test by compiling GEM5 with FastModels:
scons -j64 build/ARM/gem5.opt \
  USE_ARM_FASTMODEL=1     \
  PVLIB_HOME=...          \
  MAXCORE_HOME=...        \
  ARMLMD_LICENSE_FILE=... \

Change-Id: Iabe0a5f25246591f99b57219428b8f87ecd3363c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23924
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
---

diff --git a/src/arch/arm/fastmodel/CortexA76/thread_context.cc b/src/arch/arm/fastmodel/CortexA76/thread_context.cc
index bd1d720fe..c7c92d158 100644
--- a/src/arch/arm/fastmodel/CortexA76/thread_context.cc
+++ b/src/arch/arm/fastmodel/CortexA76/thread_context.cc
@@ -30,6 +30,7 @@
 #include "arch/arm/fastmodel/CortexA76/thread_context.hh"
 
 #include "arch/arm/fastmodel/iris/memory_spaces.hh"
+#include "arch/arm/utility.hh"
 #include "iris/detail/IrisCppAdapter.h"
 #include "iris/detail/IrisObjects.h"
 
@@ -100,7 +101,7 @@ CortexA76TC::getBpSpaceId(Addr pc) const
 {
     if (bpSpaceId == iris::IRIS_UINT64_MAX) {
         for (auto &space: memorySpaces) {
-            if (space.canonicalMsn == CurrentMsn) {
+            if (space.canonicalMsn == Iris::CurrentMsn) {
                 bpSpaceId = space.spaceId;
                 break;
             }