derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fastmodel: Fix compilation errors

Browse Source 
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>
This commit is contained in:
Chun-Chen TK Hsu
2019-12-30 16:23:40 +08:00
parent 31f376f482
commit ab049c87c9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/arch/arm/fastmodel/CortexA76/thread_context.cc
View File

@@ -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;
}