1 files changed, 15 insertions, 6 deletions
diff --git a/src/arch/arm/utility.hh b/src/arch/arm/utility.hh
index 571a74ef8..a92ab072c 100644
--- a/src/arch/arm/utility.hh
+++ b/src/arch/arm/utility.hh
@@ -51,10 +51,19 @@
 #include "base/misc.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 
 namespace ArmISA {
 
+    inline PCState
+    buildRetPC(const PCState &curPC, const PCState &callPC)
+    {
+        PCState retPC = callPC;
+        retPC.uEnd();
+        return retPC;
+    }
+
     inline bool
     testPredicate(CPSR cpsr, ConditionCode code)
     {
@@ -93,12 +102,6 @@ namespace ArmISA {
         tc->activate(0);
     }
 
-    static inline bool
-    isThumb(Addr pc)
-    {
-        return (pc & PcTBit);
-    }
-
     static inline void
     copyRegs(ThreadContext *src, ThreadContext *dest)
     {
@@ -163,6 +166,12 @@ Fault readCp15Register(uint32_t &Rd, int CRn, int opc1, int CRm, int opc2);
 
 void skipFunction(ThreadContext *tc);
 
+inline void
+advancePC(PCState &pc, const StaticInstPtr inst)
+{
+    inst->advancePC(pc);
+}
+
 };