3 files changed, 23 insertions, 17 deletions
diff --git a/src/arch/power/insts/branch.cc b/src/arch/power/insts/branch.cc
index c10f7c996..352c4ea57 100644
--- a/src/arch/power/insts/branch.cc
+++ b/src/arch/power/insts/branch.cc
@@ -52,10 +52,10 @@ PCDependentDisassembly::disassemble(Addr pc, const SymbolTable *symtab) const
     return *cachedDisassembly;
 }
 
-Addr
-BranchPCRel::branchTarget(Addr pc) const
+PowerISA::PCState
+BranchPCRel::branchTarget(const PowerISA::PCState &pc) const
 {
-    return (uint32_t)(pc + disp);
+    return (uint32_t)(pc.pc() + disp);
 }
 
 std::string
@@ -76,8 +76,8 @@ BranchPCRel::generateDisassembly(Addr pc, const SymbolTable *symtab) const
     return ss.str();
 }
 
-Addr
-BranchNonPCRel::branchTarget(Addr pc) const
+PowerISA::PCState
+BranchNonPCRel::branchTarget(const PowerISA::PCState &pc) const
 {
     return targetAddr;
 }
@@ -98,10 +98,10 @@ BranchNonPCRel::generateDisassembly(Addr pc, const SymbolTable *symtab) const
     return ss.str();
 }
 
-Addr
-BranchPCRelCond::branchTarget(Addr pc) const
+PowerISA::PCState
+BranchPCRelCond::branchTarget(const PowerISA::PCState &pc) const
 {
-    return (uint32_t)(pc + disp);
+    return (uint32_t)(pc.pc() + disp);
 }
 
 std::string
@@ -124,8 +124,8 @@ BranchPCRelCond::generateDisassembly(Addr pc, const SymbolTable *symtab) const
     return ss.str();
 }
 
-Addr
-BranchNonPCRelCond::branchTarget(Addr pc) const
+PowerISA::PCState
+BranchNonPCRelCond::branchTarget(const PowerISA::PCState &pc) const
 {
     return targetAddr;
 }
@@ -149,11 +149,11 @@ BranchNonPCRelCond::generateDisassembly(Addr pc,
     return ss.str();
 }
 
-Addr
+PowerISA::PCState
 BranchRegCond::branchTarget(ThreadContext *tc) const
 {
     uint32_t regVal = tc->readIntReg(_srcRegIdx[_numSrcRegs - 1]);
-    return (regVal & 0xfffffffc);
+    return regVal & 0xfffffffc;
 }
 
 std::string
diff --git a/src/arch/power/insts/branch.hh b/src/arch/power/insts/branch.hh
index dd00e42c3..7b9e78dee 100644
--- a/src/arch/power/insts/branch.hh
+++ b/src/arch/power/insts/branch.hh
@@ -86,7 +86,7 @@ class BranchPCRel : public PCDependentDisassembly
         }
     }
 
-    Addr branchTarget(Addr pc) const;
+    PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const;
 
     std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
 };
@@ -112,7 +112,7 @@ class BranchNonPCRel : public PCDependentDisassembly
         }
     }
 
-    Addr branchTarget(Addr pc) const;
+    PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const;
 
     std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
 };
@@ -187,7 +187,7 @@ class BranchPCRelCond : public BranchCond
         }
     }
 
-    Addr branchTarget(Addr pc) const;
+    PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const;
 
     std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
 };
@@ -213,7 +213,7 @@ class BranchNonPCRelCond : public BranchCond
         }
     }
 
-    Addr branchTarget(Addr pc) const;
+    PowerISA::PCState branchTarget(const PowerISA::PCState &pc) const;
 
     std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
 };
@@ -231,7 +231,7 @@ class BranchRegCond : public BranchCond
     {
     }
 
-    Addr branchTarget(ThreadContext *tc) const;
+    PowerISA::PCState branchTarget(ThreadContext *tc) const;
 
     std::string generateDisassembly(Addr pc, const SymbolTable *symtab) const;
 };
diff --git a/src/arch/power/insts/static_inst.hh b/src/arch/power/insts/static_inst.hh
index 399e75371..91eca6fb0 100644
--- a/src/arch/power/insts/static_inst.hh
+++ b/src/arch/power/insts/static_inst.hh
@@ -63,6 +63,12 @@ class PowerStaticInst : public StaticInst
 
     std::string
     generateDisassembly(Addr pc, const SymbolTable *symtab) const;
+
+    void
+    advancePC(PowerISA::PCState &pcState) const
+    {
+        pcState.advance();
+    }
 };
 
 } // PowerISA namespace