diff options
author | Chun-Chen TK Hsu <chunchenhsu@google.com> | 2019-12-30 16:23:40 +0800 |
---|---|---|
committer | Chun-Chen TK Hsu <chunchenhsu@google.com> | 2019-12-30 22:41:58 +0000 |
commit | ab049c87c9c85b5d1b6d6a99c81858534cc9f869 (patch) | |
tree | f6b1d8987e1e1d4707686fbc94842f5853bfa483 /src/arch | |
parent | 31f376f482cfe2bda130de732f86b1181feea2cd (diff) | |
download | gem5-ab049c87c9c85b5d1b6d6a99c81858534cc9f869.tar.xz |
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>
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/arm/fastmodel/CortexA76/thread_context.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |