diff -r 9281bcb466fa -r a6ad49f2b4e8 src/SConscript
--- a/src/SConscript	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/SConscript	Thu Feb 14 10:00:56 2013 +0000
@@ -899,9 +899,17 @@
                                  '-Wno-unused-value'])
         if compareVersions(env['GCC_VERSION'], '4.6') >= 0:
             swig_env.Append(CCFLAGS='-Wno-unused-but-set-variable')
+
+        # Add additional warnings here that should not be applied to
+        # the SWIG generated code
+        new_env.Append(CXXFLAGS='-Wmissing-declarations')
     if env['CLANG']:
         swig_env.Append(CCFLAGS=['-Wno-unused-label', '-Wno-unused-value'])
 
+        # Add additional warnings here that should not be applied to
+        # the SWIG generated code
+        new_env.Append(CXXFLAGS='-Wmissing-declarations')
+
     werror_env = new_env.Clone()
     werror_env.Append(CCFLAGS='-Werror')
 
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/arm/isa/formats/misc.isa
--- a/src/arch/arm/isa/formats/misc.isa	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/arm/isa/formats/misc.isa	Thu Feb 14 10:00:56 2013 +0000
@@ -81,7 +81,7 @@
 let {{
     header_output = '''
     StaticInstPtr
-    decodeMcrMrc15(ExtMachInst machInst);
+    decodeMcrMrc14(ExtMachInst machInst);
     '''
     decoder_output = '''
     StaticInstPtr
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/arm/isa/insts/m5ops.isa
--- a/src/arch/arm/isa/insts/m5ops.isa	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/arm/isa/insts/m5ops.isa	Thu Feb 14 10:00:56 2013 +0000
@@ -38,7 +38,9 @@
 
 
 let {{
-    header_output = ""
+    header_output = '''
+    uint64_t join32to64(uint32_t r1, uint32_t r0);
+    '''
     decoder_output = '''
     uint64_t join32to64(uint32_t r1, uint32_t r0)
     {
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/mips/isa/formats/control.isa
--- a/src/arch/mips/isa/formats/control.isa	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/mips/isa/formats/control.isa	Thu Feb 14 10:00:56 2013 +0000
@@ -172,6 +172,13 @@
 
 }};
 
+output header {{
+        bool isCoprocessorEnabled(%(CPU_exec_context)s *xc, unsigned cop_num);
+
+        bool isMMUTLB(%(CPU_exec_context)s *xc);
+
+}};
+
 output exec {{
         bool
         isCoprocessorEnabled(%(CPU_exec_context)s *xc, unsigned cop_num)
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/mips/isa/formats/dsp.isa
--- a/src/arch/mips/isa/formats/dsp.isa	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/mips/isa/formats/dsp.isa	Thu Feb 14 10:00:56 2013 +0000
@@ -135,6 +135,12 @@
         }
 }};
 
+output header {{
+    bool isDspEnabled(%(CPU_exec_context)s *xc);
+
+    bool isDspPresent(%(CPU_exec_context)s *xc);
+}};
+
 //Outputs to decoder.cc
 output decoder {{
 }};
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/mips/isa/formats/fp.isa
--- a/src/arch/mips/isa/formats/fp.isa	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/mips/isa/formats/fp.isa	Thu Feb 14 10:00:56 2013 +0000
@@ -86,6 +86,11 @@
         }
 }};
 
+output header {{
+        void fpResetCauseBits(%(CPU_exec_context)s *cpu);
+
+}};
+
 output exec {{
         inline Fault checkFpEnableFault(%(CPU_exec_context)s *xc)
         {
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/mips/isa/formats/mem.isa
--- a/src/arch/mips/isa/formats/mem.isa	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/mips/isa/formats/mem.isa	Thu Feb 14 10:00:56 2013 +0000
@@ -96,6 +96,11 @@
 
 }};
 
+output header {{
+    uint64_t getMemData(%(CPU_exec_context)s *xc, Packet *packet);
+
+}};
+
 output exec {{
     /** return data in cases where there the size of data is only
         known in the packet
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/mips/isa/formats/mt.isa
--- a/src/arch/mips/isa/formats/mt.isa	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/mips/isa/formats/mt.isa	Thu Feb 14 10:00:56 2013 +0000
@@ -84,6 +84,17 @@
     }
 }};
 
+output header {{
+   void getThrRegExValues(%(CPU_exec_context)s *xc,
+                          MipsISA::VPEConf0Reg &vpe_conf0,
+                          MipsISA::TCBindReg &tc_bind_mt,
+                          MipsISA::TCBindReg &tc_bind,
+                          MipsISA::VPEControlReg &vpe_control,
+                          MipsISA::MVPConf0Reg &mvp_conf0);
+
+   void getMTExValues(%(CPU_exec_context)s *xc, MipsISA::Config3Reg &config3);
+}};
+
 output exec {{
     void getThrRegExValues(%(CPU_exec_context)s *xc,
             VPEConf0Reg &vpe_conf0, TCBindReg &tc_bind_mt,
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/mips/isa/includes.isa
--- a/src/arch/mips/isa/includes.isa	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/mips/isa/includes.isa	Thu Feb 14 10:00:56 2013 +0000
@@ -39,7 +39,8 @@
 #include <sstream>
 
 #include "arch/mips/isa_traits.hh"
-#include "arch/mips/types.hh"
+#include "arch/mips/mt_constants.hh"
+#include "arch/mips/pra_constants.hh"
 #include "cpu/static_inst.hh"
 #include "mem/packet.hh"
 }};
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/sparc/faults.hh
--- a/src/arch/sparc/faults.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/sparc/faults.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -276,6 +276,19 @@
             StaticInstPtr inst = StaticInst::nullStaticInstPtr);
 };
 
+void enterREDState(ThreadContext *tc);
+
+void doREDFault(ThreadContext *tc, TrapType tt);
+
+void doNormalFault(ThreadContext *tc, TrapType tt, bool gotoHpriv);
+
+void getREDVector(MiscReg TT, Addr &PC, Addr &NPC);
+
+void getHyperVector(ThreadContext * tc, Addr &PC, Addr &NPC, MiscReg TT);
+
+void getPrivVector(ThreadContext *tc, Addr &PC, Addr &NPC, MiscReg TT,
+                   MiscReg TL);
+
 } // namespace SparcISA
 
 #endif // __SPARC_FAULTS_HH__
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/x86/bios/intelmp.hh
--- a/src/arch/x86/bios/intelmp.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/x86/bios/intelmp.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -73,6 +73,12 @@
 struct X86IntelMPBusHierarchyParams;
 struct X86IntelMPCompatAddrSpaceModParams;
 
+template<class T>
+uint8_t writeOutField(PortProxy& proxy, Addr addr, T val);
+
+uint8_t writeOutString(PortProxy& proxy, Addr addr, std::string str,
+                       int length);
+
 namespace X86ISA
 {
 
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/x86/cpuid.hh
--- a/src/arch/x86/cpuid.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/x86/cpuid.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -55,6 +55,8 @@
         {}
     };
 
+    uint64_t stringToRegister(const char *str);
+
     bool doCpuid(ThreadContext * tc, uint32_t function,
             uint32_t index, CpuidResult &result);
 } // namespace X86ISA
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/arch/x86/interrupts.hh
--- a/src/arch/x86/interrupts.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/arch/x86/interrupts.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -66,8 +66,12 @@
 class ThreadContext;
 class BaseCPU;
 
+int divideFromConf(uint32_t conf);
+
 namespace X86ISA {
 
+ApicRegIndex decodeAddr(Addr paddr);
+
 class Interrupts : public BasicPioDevice, IntDev
 {
   protected:
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/base/debug.hh
--- a/src/base/debug.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/base/debug.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -32,6 +32,7 @@
 #ifndef __BASE_DEBUG_HH__
 #define __BASE_DEBUG_HH__
 
+#include <map>
 #include <string>
 #include <vector>
 
@@ -110,6 +111,19 @@
     void disable();
 };
 
+typedef std::map<std::string, Flag *> FlagsMap;
+FlagsMap &allFlags();
+
+Flag *findFlag(const std::string &name);
+
+bool changeFlag(const char *s, bool value);
+
 } // namespace Debug
 
+void setDebugFlag(const char *string);
+
+void clearDebugFlag(const char *string);
+
+void dumpDebugFlags();
+
 #endif // __BASE_DEBUG_HH__
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/base/debug.cc
--- a/src/base/debug.cc	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/base/debug.cc	Thu Feb 14 10:00:56 2013 +0000
@@ -33,8 +33,6 @@
 
 #include <algorithm>
 #include <csignal>
-#include <map>
-#include <vector>
 
 #include "base/cprintf.hh"
 #include "base/debug.hh"
@@ -62,7 +60,6 @@
 //
 // Flags for debugging purposes.  Primarily for trace.hh
 //
-typedef std::map<string, Flag *> FlagsMap;
 int allFlagsVersion = 0;
 FlagsMap &
 allFlags()
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/base/hostinfo.hh
--- a/src/base/hostinfo.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/base/hostinfo.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -35,6 +35,8 @@
 
 #include "base/types.hh"
 
+std::string __get_hostname();
+
 std::string &hostname();
 
 uint64_t procInfo(const char *filename, const char *target);
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/base/hostinfo.cc
--- a/src/base/hostinfo.cc	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/base/hostinfo.cc	Thu Feb 14 10:00:56 2013 +0000
@@ -44,6 +44,7 @@
 #include <cstring>
 #include <string>
 
+#include "base/hostinfo.hh"
 #include "base/misc.hh"
 #include "base/str.hh"
 #include "base/types.hh"
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/base/inet.hh
--- a/src/base/inet.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/base/inet.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -463,6 +463,7 @@
     int pstart() const { return off() + get()->size(); }
 };
 
+uint16_t __tu_cksum(const IpPtr &ip);
 uint16_t cksum(const UdpPtr &ptr);
 
 int hsplit(const EthPacketPtr &ptr);
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/base/statistics.hh
--- a/src/base/statistics.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/base/statistics.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -3164,6 +3164,16 @@
 
 std::list<Info *> &statsList();
 
+typedef std::map<const void *, Info *> MapType;
+MapType &statsMap();
+
+typedef std::map<std::string, Info *> NameMapType;
+NameMapType &nameMap();
+
+bool validateStatName(const std::string &name);
+
 } // namespace Stats
 
+void debugDumpStats();
+
 #endif // __BASE_STATISTICS_HH__
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/base/statistics.cc
--- a/src/base/statistics.cc	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/base/statistics.cc	Thu Feb 14 10:00:56 2013 +0000
@@ -49,7 +49,6 @@
 namespace Stats {
 
 std::string Info::separatorString = "::";
-typedef map<const void *, Info *> MapType;
 
 // We wrap these in a function to make sure they're built in time.
 list<Info *> &
@@ -114,7 +113,6 @@
 {
 }
 
-typedef map<std::string, Info *> NameMapType;
 NameMapType &
 nameMap()
 {
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/base/stats/text.hh
--- a/src/base/stats/text.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/base/stats/text.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -35,6 +35,7 @@
 #include <string>
 
 #include "base/stats/output.hh"
+#include "base/stats/types.hh"
 #include "base/output.hh"
 
 namespace Stats {
@@ -75,6 +76,8 @@
     virtual void end();
 };
 
+std::string ValueToString(Result value, int precision);
+
 Output *initText(const std::string &filename, bool desc);
 
 } // namespace Stats
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/base/userinfo.cc
--- a/src/base/userinfo.cc	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/base/userinfo.cc	Thu Feb 14 10:00:56 2013 +0000
@@ -34,6 +34,8 @@
 
 #include <string>
 
+#include "base/userinfo.hh"
+
 std::string
 username()
 {
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/cpu/legiontrace.hh
--- a/src/cpu/legiontrace.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/cpu/legiontrace.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -42,6 +42,8 @@
 
 namespace Trace {
 
+void setupSharedData();
+
 class LegionTraceRecord : public InstRecord
 {
   public:
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/cpu/pc_event.hh
--- a/src/cpu/pc_event.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/cpu/pc_event.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -39,6 +39,7 @@
 
 class ThreadContext;
 class PCEventQueue;
+class System;
 
 class PCEvent
 {
@@ -141,4 +142,8 @@
     virtual void process(ThreadContext *tc);
 };
 
+void sched_break_pc_sys(System *sys, Addr addr);
+
+void sched_break_pc(Addr addr);
+
 #endif // __PC_EVENT_HH__
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/dev/disk_image.hh
--- a/src/dev/disk_image.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/dev/disk_image.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -135,4 +135,20 @@
     virtual off_t write(const uint8_t *data, off_t offset);
 };
 
+void SafeRead(std::ifstream &stream, void *data, int count);
+
+template<class T>
+void SafeRead(std::ifstream &stream, T &data);
+
+template<class T>
+void SafeReadSwap(std::ifstream &stream, T &data);
+
+void SafeWrite(std::ofstream &stream, const void *data, int count);
+
+template<class T>
+void SafeWrite(std::ofstream &stream, const T &data);
+
+template<class T>
+void SafeWriteSwap(std::ofstream &stream, const T &data);
+
 #endif // __DISK_IMAGE_HH__
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/kern/tru64/dump_mbuf.cc
--- a/src/kern/tru64/dump_mbuf.cc	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/kern/tru64/dump_mbuf.cc	Thu Feb 14 10:00:56 2013 +0000
@@ -40,6 +40,7 @@
 #include "base/types.hh"
 #include "config/the_isa.hh"
 #include "cpu/thread_context.hh"
+#include "kern/tru64/dump_mbuf.hh"
 #include "kern/tru64/mbuf.hh"
 #include "sim/arguments.hh"
 #include "sim/system.hh"
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/kern/tru64/printf.cc
--- a/src/kern/tru64/printf.cc	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/kern/tru64/printf.cc	Thu Feb 14 10:00:56 2013 +0000
@@ -36,6 +36,7 @@
 #include "base/cprintf.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
+#include "kern/tru64/printf.hh"
 #include "sim/arguments.hh"
 
 using namespace std;
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/mem/ruby/buffers/MessageBuffer.hh
--- a/src/mem/ruby/buffers/MessageBuffer.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/mem/ruby/buffers/MessageBuffer.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -216,6 +216,8 @@
     int m_vnet_id;
 };
 
+Cycles random_time();
+
 inline std::ostream&
 operator<<(std::ostream& out, const MessageBuffer& obj)
 {
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/mem/ruby/network/simple/PerfectSwitch.hh
--- a/src/mem/ruby/network/simple/PerfectSwitch.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/mem/ruby/network/simple/PerfectSwitch.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -53,6 +53,8 @@
     int m_value;
 };
 
+bool operator<(const LinkOrder& l1, const LinkOrder& l2);
+
 class PerfectSwitch : public Consumer
 {
   public:
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/mem/ruby/profiler/AddressProfiler.hh
--- a/src/mem/ruby/profiler/AddressProfiler.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/mem/ruby/profiler/AddressProfiler.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -92,6 +92,14 @@
     int m_num_of_sequencers;
 };
 
+AccessTraceForAddress& lookupTraceForAddress(const Address& addr,
+                                             AddressProfiler::AddressMap&
+                                             record_map);
+
+void printSorted(std::ostream& out, int num_of_sequencers,
+                 const AddressProfiler::AddressMap &record_map,
+                 std::string description);
+
 inline std::ostream&
 operator<<(std::ostream& out, const AddressProfiler& obj)
 {
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/mem/ruby/system/CacheMemory.hh
--- a/src/mem/ruby/system/CacheMemory.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/mem/ruby/system/CacheMemory.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -170,4 +170,6 @@
     bool m_resource_stalls;
 };
 
+std::ostream& operator<<(std::ostream& out, const CacheMemory& obj);
+
 #endif // __MEM_RUBY_SYSTEM_CACHEMEMORY_HH__
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/mem/ruby/system/RubyMemoryControl.hh
--- a/src/mem/ruby/system/RubyMemoryControl.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/mem/ruby/system/RubyMemoryControl.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -168,4 +168,6 @@
     MemCntrlProfiler* m_profiler_ptr;
 };
 
+std::ostream& operator<<(std::ostream& out, const RubyMemoryControl& obj);
+
 #endif // __MEM_RUBY_SYSTEM_MEMORY_CONTROL_HH__
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/mem/ruby/system/WireBuffer.hh
--- a/src/mem/ruby/system/WireBuffer.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/mem/ruby/system/WireBuffer.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -100,4 +100,6 @@
 
 };
 
+std::ostream& operator<<(std::ostream& out, const WireBuffer& obj);
+
 #endif // __MEM_RUBY_SYSTEM_WireBuffer_HH__
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/python/swig/pyobject.hh
--- a/src/python/swig/pyobject.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/python/swig/pyobject.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -31,12 +31,15 @@
 #include <Python.h>
 
 #include "base/types.hh"
+#include "dev/etherint.hh"
 #include "sim/serialize.hh"
 #include "sim/sim_object.hh"
 
 extern "C" SimObject *convertSwigSimObjectPtr(PyObject *);
 SimObject *resolveSimObject(const std::string &name);
 
+EtherInt * lookupEthPort(SimObject *so, const std::string &name, int i);
+
 /**
  * Connect the described MemObject ports.  Called from Python via SWIG.
  */
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/python/swig/pyobject.cc
--- a/src/python/swig/pyobject.cc	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/python/swig/pyobject.cc	Thu Feb 14 10:00:56 2013 +0000
@@ -35,10 +35,10 @@
 #include "base/inifile.hh"
 #include "base/output.hh"
 #include "dev/etherdevice.hh"
-#include "dev/etherint.hh"
 #include "dev/etherobject.hh"
 #include "mem/mem_object.hh"
 #include "mem/port.hh"
+#include "python/swig/pyobject.hh"
 #include "sim/full_system.hh"
 #include "sim/sim_object.hh"
 
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/sim/debug.hh
--- a/src/sim/debug.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/sim/debug.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -53,6 +53,8 @@
  */
 void eventqDump();
 
+void py_interact();
+
 int getRemoteGDBPort();
 // Remote gdb base port.  0 disables remote gdb.
 void setRemoteGDBPort(int port);
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/sim/drain.hh
--- a/src/sim/drain.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/sim/drain.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -236,4 +236,7 @@
 
 };
 
+DrainManager *createDrainManager();
+void cleanupDrainManager(DrainManager *drain_manager);
+
 #endif
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/sim/eventq.hh
--- a/src/sim/eventq.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/sim/eventq.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -418,6 +418,8 @@
 #endif
 };
 
+void dumpMainQueue();
+
 #ifndef SWIG
 class EventManager
 {
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/sim/init.hh
--- a/src/sim/init.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/sim/init.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -31,6 +31,8 @@
 #ifndef __SIM_INIT_HH__
 #define __SIM_INIT_HH__
 
+#include <Python.h>
+
 /*
  * Data structure describing an embedded python file.
  */
@@ -74,8 +76,13 @@
     static void initAll();
 };
 
+void dumpStatsHandler(int sigtype);
+void dumprstStatsHandler(int sigtype);
+void exitNowHandler(int sigtype);
+void abortHandler(int sigtype);
 void initSignals();
 int initM5Python();
 int m5Main(int argc, char **argv);
+PyMODINIT_FUNC initm5(void);
 
 #endif // __SIM_INIT_HH__
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/sim/serialize.hh
--- a/src/sim/serialize.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/sim/serialize.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -178,6 +178,8 @@
     static void unserializeGlobals(Checkpoint *cp);
 };
 
+void debug_serialize(const std::string &cpt_dir);
+
 //
 // A SerializableBuilder serves as an evaluation context for a set of
 // parameters that describe a specific instance of a Serializable.  This
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/sim/sim_object.hh
--- a/src/sim/sim_object.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/sim/sim_object.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -176,4 +176,8 @@
     static SimObject *find(const char *name);
 };
 
+#ifdef DEBUG
+void debugObjectBreak(const char *objs);
+#endif
+
 #endif // __SIM_OBJECT_HH__
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/sim/stat_control.hh
--- a/src/sim/stat_control.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/sim/stat_control.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -46,6 +46,12 @@
 
 namespace Stats {
 
+double statElapsedTime();
+
+Tick statElapsedTicks();
+
+Tick statFinalTick();
+
 void initSimStats();
 
 /**
diff -r 9281bcb466fa -r a6ad49f2b4e8 src/sim/system.hh
--- a/src/sim/system.hh	Thu Feb 14 10:00:21 2013 +0000
+++ b/src/sim/system.hh	Thu Feb 14 10:00:56 2013 +0000
@@ -429,4 +429,6 @@
 
 };
 
+void printSystems();
+
 #endif // __SYSTEM_HH__