1 files changed, 16 insertions, 0 deletions
diff --git a/src/arch/x86/utility.hh b/src/arch/x86/utility.hh
index 05ce53347..143fde00c 100644
--- a/src/arch/x86/utility.hh
+++ b/src/arch/x86/utility.hh
@@ -46,12 +46,22 @@
 #include "base/misc.hh"
 #include "base/types.hh"
 #include "config/full_system.hh"
+#include "cpu/static_inst.hh"
 #include "cpu/thread_context.hh"
 
 class ThreadContext;
 
 namespace X86ISA
 {
+
+    inline PCState
+    buildRetPC(const PCState &curPC, const PCState &callPC)
+    {
+        PCState retPC = callPC;
+        retPC.uEnd();
+        return retPC;
+    }
+
     uint64_t
     getArgument(ThreadContext *tc, int &number, uint16_t size, bool fp);
 
@@ -86,6 +96,12 @@ namespace X86ISA
     void copyMiscRegs(ThreadContext *src, ThreadContext *dest);
 
     void skipFunction(ThreadContext *tc);
+
+    inline void
+    advancePC(PCState &pc, const StaticInstPtr inst)
+    {
+        inst->advancePC(pc);
+    }
 };
 
 #endif // __ARCH_X86_UTILITY_HH__