From 78b9a789d7adf69a82535b93f8822f8adaca3f7e Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Tue, 14 Mar 2006 16:39:59 -0500
Subject: Fixed up after a hand merge.

arch/alpha/utility.hh:
    Got rid of unnecessary extern and static qualifiers, and fixed up the hand merge.
arch/sparc/regfile.hh:
    Fixed up SPARC after a hand merge.

--HG--
extra : convert_revision : 56e2d90ddd144f3386dbea50fa96cfc461d46b81
---
 arch/sparc/regfile.hh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'arch/sparc')

diff --git a/arch/sparc/regfile.hh b/arch/sparc/regfile.hh
index 008956406..944fdfe80 100644
--- a/arch/sparc/regfile.hh
+++ b/arch/sparc/regfile.hh
@@ -511,6 +511,10 @@ namespace SparcISA
         void unserialize(Checkpoint *cp, const std::string &section);
     };
 
+    void copyRegs(ExecContext *src, ExecContext *dest);
+
+    void copyMiscRegs(ExecContext *src, ExecContext *dest);
+
 } // namespace SparcISA
 
 #endif
-- 
cgit v1.2.3