From 49a7ed0397954f555f5fb4272334e606a3048c59 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 9 Sep 2011 02:40:11 -0700 Subject: StaticInst: Merge StaticInst and StaticInstBase. Having two StaticInst classes, one nominally ISA dependent and the other ISA dependent, has not been historically useful and makes the StaticInst class more complicated that it needs to be. This change merges StaticInstBase into StaticInst. --- src/arch/arm/insts/macromem.cc | 8 ++++---- src/arch/arm/isa_traits.hh | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/arch/arm') diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc index e056856b6..48e561c95 100644 --- a/src/arch/arm/insts/macromem.cc +++ b/src/arch/arm/insts/macromem.cc @@ -140,12 +140,12 @@ MacroMemOp::MacroMemOp(const char *mnem, ExtMachInst machInst, } else if (load) { *++uop = new MicroUopRegMov(machInst, regIdx, INTREG_UREG1); if (reg == INTREG_PC) { - (*uop)->setFlag(StaticInstBase::IsControl); - (*uop)->setFlag(StaticInstBase::IsCondControl); - (*uop)->setFlag(StaticInstBase::IsIndirectControl); + (*uop)->setFlag(StaticInst::IsControl); + (*uop)->setFlag(StaticInst::IsCondControl); + (*uop)->setFlag(StaticInst::IsIndirectControl); // This is created as a RAS POP if (rn == INTREG_SP) - (*uop)->setFlag(StaticInstBase::IsReturn); + (*uop)->setFlag(StaticInst::IsReturn); } } diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh index 40371e065..43b3674d4 100644 --- a/src/arch/arm/isa_traits.hh +++ b/src/arch/arm/isa_traits.hh @@ -47,13 +47,12 @@ #include "arch/arm/types.hh" #include "base/types.hh" +#include "cpu/static_inst_fwd.hh" namespace LittleEndianGuest {} #define TARGET_ARM -class StaticInstPtr; - namespace ArmISA { using namespace LittleEndianGuest; -- cgit v1.2.3