arm: Remove "using namespace ArmISA" from arch/arm/isa_traits.hh.

[gem5.git] / src / arch / arm / isa / includes.isa

diff --git a/src/arch/arm/isa/includes.isa b/src/arch/arm/isa/includes.isa
index 9cdc1f926ad7446e29caf45fae48e7c346144155..13b47c8e0ffd7f15a147fd1dfe1cf0f01a3d6e01 100644 (file)
--- a/src/arch/arm/isa/includes.isa
+++ b/src/arch/arm/isa/includes.isa
@@ -1,6 +1,6 @@
 // -*- mode:c++ -*-
 
-// Copyright (c) 2010, 2012, 2017-2018 ARM Limited
+// Copyright (c) 2010, 2012, 2017-2018, 2020 ARM Limited
 // All rights reserved
 //
 // The license below extends only to copyright in the software and shall
@@ -64,12 +64,18 @@ output header {{
 #include "arch/arm/insts/static_inst.hh"
 #include "arch/arm/insts/sve.hh"
 #include "arch/arm/insts/sve_mem.hh"
+#include "arch/arm/insts/tme64.hh"
 #include "arch/arm/insts/vfp.hh"
 #include "arch/arm/isa_traits.hh"
 #include "enums/DecoderFlavor.hh"
 #include "mem/packet.hh"
 #include "sim/faults.hh"
 
+namespace ArmISAInst
+{
+using namespace ArmISA;
+}
+
 }};
 
 output decoder {{
@@ -96,8 +102,10 @@ output exec {{
 #include "arch/arm/faults.hh"
 #include "arch/arm/interrupts.hh"
 #include "arch/arm/isa.hh"
+#include "arch/arm/htm.hh"
 #include "arch/arm/isa_traits.hh"
 #include "arch/arm/pauth_helpers.hh"
+#include "arch/arm/semihosting.hh"
 #include "arch/arm/utility.hh"
 #include "arch/generic/memhelpers.hh"
 #include "base/condcodes.hh"
@@ -110,7 +118,6 @@ output exec {{
 
 #endif
 
-#include "base/cp_annotate.hh"
 #include "debug/Arm.hh"
 #include "mem/packet.hh"
 #include "mem/packet_access.hh"
@@ -119,4 +126,3 @@ output exec {{
 using namespace ArmISA;
 
 }};
-