summaryrefslogtreecommitdiff
path: root/src/arch/arm/insts
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/arm/insts')
-rw-r--r--src/arch/arm/insts/static_inst.hh13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/arch/arm/insts/static_inst.hh b/src/arch/arm/insts/static_inst.hh
index 486d30fe4..5c6a315a1 100644
--- a/src/arch/arm/insts/static_inst.hh
+++ b/src/arch/arm/insts/static_inst.hh
@@ -48,6 +48,7 @@
#include "arch/arm/utility.hh"
#include "arch/arm/system.hh"
#include "base/trace.hh"
+#include "cpu/exec_context.hh"
#include "cpu/static_inst.hh"
#include "sim/byteswap.hh"
#include "sim/full_system.hh"
@@ -290,16 +291,14 @@ class ArmStaticInst : public StaticInst
return ((spsr & ~bitMask) | (val & bitMask));
}
- template<class XC>
static inline Addr
- readPC(XC *xc)
+ readPC(ExecContext *xc)
{
return xc->pcState().instPC();
}
- template<class XC>
static inline void
- setNextPC(XC *xc, Addr val)
+ setNextPC(ExecContext *xc, Addr val)
{
PCState pc = xc->pcState();
pc.instNPC(val);
@@ -340,9 +339,8 @@ class ArmStaticInst : public StaticInst
}
// Perform an interworking branch.
- template<class XC>
static inline void
- setIWNextPC(XC *xc, Addr val)
+ setIWNextPC(ExecContext *xc, Addr val)
{
PCState pc = xc->pcState();
pc.instIWNPC(val);
@@ -351,9 +349,8 @@ class ArmStaticInst : public StaticInst
// Perform an interworking branch in ARM mode, a regular branch
// otherwise.
- template<class XC>
static inline void
- setAIWNextPC(XC *xc, Addr val)
+ setAIWNextPC(ExecContext *xc, Addr val)
{
PCState pc = xc->pcState();
pc.instAIWNPC(val);