[gem5-dev] Change in gem5/gem5[develop]: arch-arm: fix KVM build due to missing ArmISA namespace

[Ciro Santilli (Gerrit) via gem5-dev]

Ciro Santilli has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/34475 )

Change subject: arch-arm: fix KVM build due to missing ArmISA namespace
......................................................................

arch-arm: fix KVM build due to missing ArmISA namespace

The build was failing with:

arch/arm/kvm/armv8_cpu.hh:96:35: error: 'IntRegIndex' has not been declared

and other similar errors.

Change-Id: I15ebf0beb17a499585b409a431700e551a61a9ee
---
M src/arch/arm/kvm/armv8_cpu.hh
M src/arch/arm/kvm/base_cpu.cc
2 files changed, 5 insertions(+), 1 deletion(-)



diff --git a/src/arch/arm/kvm/armv8_cpu.hh b/src/arch/arm/kvm/armv8_cpu.hh
index 9870510..62ee5d6 100644
--- a/src/arch/arm/kvm/armv8_cpu.hh
+++ b/src/arch/arm/kvm/armv8_cpu.hh
@@ -45,6 +45,8 @@
 #include "arch/arm/kvm/base_cpu.hh"
 #include "arch/arm/miscregs.hh"

+using namespace ArmISA;
+
 struct ArmV8KvmCPUParams;

 /**
@@ -93,7 +95,7 @@
   protected:
     /** Mapping between integer registers in gem5 and KVM */
     struct IntRegInfo {
-        IntRegInfo(uint64_t _kvm, IntRegIndex _idx, const char *_name)
+        IntRegInfo(uint64_t _kvm, ArmISA::IntRegIndex _idx, const char  
*_name)
             : kvm(_kvm), idx(_idx), name(_name) {}

         /** Register index in KVM */
diff --git a/src/arch/arm/kvm/base_cpu.cc b/src/arch/arm/kvm/base_cpu.cc
index 04c5d0f..6fd2651 100644
--- a/src/arch/arm/kvm/base_cpu.cc
+++ b/src/arch/arm/kvm/base_cpu.cc
@@ -45,6 +45,8 @@
 #include "params/BaseArmKvmCPU.hh"
 #include "params/GenericTimer.hh"

+using namespace ArmISA;
+
 #define INTERRUPT_ID(type, vcpu, irq) (                    \
         ((type) << KVM_ARM_IRQ_TYPE_SHIFT) |               \
         ((vcpu) << KVM_ARM_IRQ_VCPU_SHIFT) |               \

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/34475
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I15ebf0beb17a499585b409a431700e551a61a9ee
Gerrit-Change-Number: 34475
Gerrit-PatchSet: 1
Gerrit-Owner: Ciro Santilli <ciro.santi...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s