From 773cb77656174b221c1e51b92a8af7d8e268b733 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Thu, 16 Aug 2007 16:49:02 -0400
Subject: Devices: Make EtherInts connect in the same way memory ports
 currently do.

--HG--
extra : convert_revision : 765b096785a77df9adc4791c9101b90696bd7be2
---
 src/python/swig/pyobject.cc | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'src/python')

diff --git a/src/python/swig/pyobject.cc b/src/python/swig/pyobject.cc
index 455888c04..20dd1deb1 100644
--- a/src/python/swig/pyobject.cc
+++ b/src/python/swig/pyobject.cc
@@ -34,6 +34,9 @@
 
 #include "base/inifile.hh"
 #include "base/output.hh"
+#include "dev/etherdevice.hh"
+#include "dev/etherobject.hh"
+#include "dev/etherint.hh"
 #include "mem/mem_object.hh"
 #include "mem/port.hh"
 #include "sim/sim_object.hh"
@@ -58,6 +61,23 @@ lookupPort(SimObject *so, const std::string &name, int i)
     return p;
 }
 
+EtherInt *
+lookupEthPort(SimObject *so, const std::string &name, int i)
+{
+    EtherObject *eo = dynamic_cast<EtherObject *>(so);
+    EtherDevice *ed = dynamic_cast<EtherDevice *>(so);
+    if (eo == NULL && ed == NULL) {
+        warn("error casting SimObject %s", so->name());
+        return NULL;
+    }
+
+    EtherInt *p = NULL;
+    if (eo)
+        p = eo->getEthPort(name, i);
+    else
+        p = ed->getEthPort(name, i);
+    return p;
+}
 
 /**
  * Connect the described MemObject ports.  Called from Python via SWIG.
@@ -67,6 +87,31 @@ int
 connectPorts(SimObject *o1, const std::string &name1, int i1,
              SimObject *o2, const std::string &name2, int i2)
 {
+    EtherObject *eo1, *eo2;
+    EtherDevice *ed1, *ed2;
+    MemObject *mo1, *mo2;
+
+    eo1 = dynamic_cast<EtherObject*>(o1);
+    ed1 = dynamic_cast<EtherDevice*>(o1);
+    mo1 = dynamic_cast<MemObject*>(o1);
+
+    eo2 = dynamic_cast<EtherObject*>(o2);
+    ed2 = dynamic_cast<EtherDevice*>(o2);
+    mo2 = dynamic_cast<MemObject*>(o2);
+
+    if ((eo1 || ed1) && (eo2 || ed2)) {
+        EtherInt *p1 = lookupEthPort(o1, name1, i1);
+        EtherInt *p2 = lookupEthPort(o2, name2, i2);
+
+        if (p1 != NULL &&  p2 != NULL) {
+
+            p1->setPeer(p2);
+            p2->setPeer(p1);
+
+            return 1;
+        }
+    }
+
     Port *p1 = lookupPort(o1, name1, i1);
     Port *p2 = lookupPort(o2, name2, i2);
 
-- 
cgit v1.2.3


From 464a51e29e858d6dc38847120868b36e97c8bb6d Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Fri, 17 Aug 2007 04:20:02 -0400
Subject: Ports: Only try to do EthPort stuff in full system.

--HG--
extra : convert_revision : 9ea093ea7c9ab22f8467c5cd5d55b66c71eb3427
---
 src/python/swig/pyobject.cc | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'src/python')

diff --git a/src/python/swig/pyobject.cc b/src/python/swig/pyobject.cc
index 20dd1deb1..5ae2aa177 100644
--- a/src/python/swig/pyobject.cc
+++ b/src/python/swig/pyobject.cc
@@ -34,13 +34,17 @@
 
 #include "base/inifile.hh"
 #include "base/output.hh"
-#include "dev/etherdevice.hh"
-#include "dev/etherobject.hh"
-#include "dev/etherint.hh"
+#include "config/full_system.hh"
 #include "mem/mem_object.hh"
 #include "mem/port.hh"
 #include "sim/sim_object.hh"
 
+#if FULL_SYSTEM
+#include "dev/etherdevice.hh"
+#include "dev/etherobject.hh"
+#include "dev/etherint.hh"
+#endif
+
 using namespace std;
 
 /**
@@ -61,6 +65,8 @@ lookupPort(SimObject *so, const std::string &name, int i)
     return p;
 }
 
+#if FULL_SYSTEM
+
 EtherInt *
 lookupEthPort(SimObject *so, const std::string &name, int i)
 {
@@ -78,6 +84,7 @@ lookupEthPort(SimObject *so, const std::string &name, int i)
         p = ed->getEthPort(name, i);
     return p;
 }
+#endif
 
 /**
  * Connect the described MemObject ports.  Called from Python via SWIG.
@@ -87,17 +94,18 @@ int
 connectPorts(SimObject *o1, const std::string &name1, int i1,
              SimObject *o2, const std::string &name2, int i2)
 {
-    EtherObject *eo1, *eo2;
-    EtherDevice *ed1, *ed2;
     MemObject *mo1, *mo2;
+    mo1 = dynamic_cast<MemObject*>(o1);
+    mo2 = dynamic_cast<MemObject*>(o2);
 
+#if FULL_SYSTEM
+    EtherObject *eo1, *eo2;
+    EtherDevice *ed1, *ed2;
     eo1 = dynamic_cast<EtherObject*>(o1);
     ed1 = dynamic_cast<EtherDevice*>(o1);
-    mo1 = dynamic_cast<MemObject*>(o1);
 
     eo2 = dynamic_cast<EtherObject*>(o2);
     ed2 = dynamic_cast<EtherDevice*>(o2);
-    mo2 = dynamic_cast<MemObject*>(o2);
 
     if ((eo1 || ed1) && (eo2 || ed2)) {
         EtherInt *p1 = lookupEthPort(o1, name1, i1);
@@ -111,7 +119,7 @@ connectPorts(SimObject *o1, const std::string &name1, int i1,
             return 1;
         }
     }
-
+#endif
     Port *p1 = lookupPort(o1, name1, i1);
     Port *p2 = lookupPort(o2, name2, i2);
 
-- 
cgit v1.2.3