From a3aae21d031c93ab1b9a90d435d9590dad2482c4 Mon Sep 17 00:00:00 2001
From: Korey Sewell <ksewell@umich.edu>
Date: Thu, 9 Mar 2006 03:27:51 -0500
Subject: last changes before big merge

arch/alpha/isa_traits.hh:
arch/sparc/isa_traits.hh:
    add nnpc for compiling purposes in exec_context setNextNPC function
cpu/exec_context.hh:
    set NNPC function
cpu/simple/cpu.cc:
    use NNPC in determining what PC we are using

--HG--
extra : convert_revision : e810cfbc5dc31879b20d2cc40bf9871613203532
---
 arch/sparc/isa_traits.hh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'arch/sparc')

diff --git a/arch/sparc/isa_traits.hh b/arch/sparc/isa_traits.hh
index c592a05ed..1752ed194 100644
--- a/arch/sparc/isa_traits.hh
+++ b/arch/sparc/isa_traits.hh
@@ -409,6 +409,7 @@ namespace SparcISA
 
         Addr pc;		// Program Counter
         Addr npc;		// Next Program Counter
+        Addr nnpc;
 
         void serialize(std::ostream &os);
         void unserialize(Checkpoint *cp, const std::string &section);
-- 
cgit v1.2.3