Merge Gabe's changes from head.

[gem5.git] / src / dev / sparc / t1000.cc

diff --git a/src/dev/sparc/t1000.cc b/src/dev/sparc/t1000.cc
index 5fc7870845671bc10f5b20548d815ffaec24758e..692e0cfe155b2bf95b1b38dc365d9d347f9b46ce 100644 (file)
--- a/src/dev/sparc/t1000.cc
+++ b/src/dev/sparc/t1000.cc
@@ -39,7 +39,7 @@
 #include "cpu/intr_control.hh"
 #include "dev/simconsole.hh"
 #include "dev/sparc/t1000.hh"
-#include "sim/builder.hh"
+#include "params/T1000.hh"
 #include "sim/system.hh"
 
 using namespace std;
@@ -57,18 +57,21 @@ Tick
 T1000::intrFrequency()
 {
     panic("Need implementation\n");
+    M5_DUMMY_RETURN
 }
 
 void
 T1000::postConsoleInt()
 {
-    panic("Need implementation\n");
+    warn_once("Don't know what interrupt to post for console.\n");
+    //panic("Need implementation\n");
 }
 
 void
 T1000::clearConsoleInt()
 {
-    panic("Need implementation\n");
+    warn_once("Don't know what interrupt to clear for console.\n");
+    //panic("Need implementation\n");
 }
 
 void
@@ -87,6 +90,7 @@ Addr
 T1000::pciToDma(Addr pciAddr) const
 {
     panic("Need implementation\n");
+    M5_DUMMY_RETURN
 }
 
 
@@ -94,37 +98,11 @@ Addr
 T1000::calcConfigAddr(int bus, int dev, int func)
 {
     panic("Need implementation\n");
+    M5_DUMMY_RETURN
 }
 
-void
-T1000::serialize(std::ostream &os)
-{
-    panic("Need implementation\n");
-}
-
-void
-T1000::unserialize(Checkpoint *cp, const std::string &section)
+T1000 *
+T1000Params::create()
 {
-    panic("Need implementation\n");
+    return new T1000(name, system, intrctrl);
 }
-
-BEGIN_DECLARE_SIM_OBJECT_PARAMS(T1000)
-
-    SimObjectParam<System *> system;
-    SimObjectParam<IntrControl *> intrctrl;
-
-END_DECLARE_SIM_OBJECT_PARAMS(T1000)
-
-BEGIN_INIT_SIM_OBJECT_PARAMS(T1000)
-
-    INIT_PARAM(system, "system"),
-    INIT_PARAM(intrctrl, "interrupt controller")
-
-END_INIT_SIM_OBJECT_PARAMS(T1000)
-
-CREATE_SIM_OBJECT(T1000)
-{
-    return new T1000(getInstanceName(), system, intrctrl);
-}
-
-REGISTER_SIM_OBJECT("T1000", T1000)