[gem5-dev] changeset in gem5: misc: Remove FullSystem check for networking ...

[Michael LeBeane]

changeset 3e9314ddf012 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=3e9314ddf012
description:
        misc: Remove FullSystem check for networking components
        Ethernet devices are currently only hooked up if running in FS mode.  
Much of
        the Ethernet networking code is generic and can be used to build 
non-Ethernet
        device models.  Some of these device models do not require a complex 
driver
        stack and can be built to use an EmulatedDriver in SE mode. This patch 
enables
        etherent interfaces to properly connect regardless of whether the 
simulation
        is in FS or SE mode.

diffstat:

 src/python/swig/pyobject.cc |  28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diffs (42 lines):

diff -r 57f21c16adde -r 3e9314ddf012 src/python/swig/pyobject.cc
--- a/src/python/swig/pyobject.cc       Tue Sep 13 23:06:18 2016 -0400
+++ b/src/python/swig/pyobject.cc       Tue Sep 13 23:06:32 2016 -0400
@@ -77,25 +77,23 @@
              SimObject *o2, const std::string &name2, int i2)
 {
 #if THE_ISA != NULL_ISA
-    if (FullSystem) {
-        EtherObject *eo1, *eo2;
-        EtherDevice *ed1, *ed2;
-        eo1 = dynamic_cast<EtherObject*>(o1);
-        ed1 = dynamic_cast<EtherDevice*>(o1);
-        eo2 = dynamic_cast<EtherObject*>(o2);
-        ed2 = dynamic_cast<EtherDevice*>(o2);
+    EtherObject *eo1, *eo2;
+    EtherDevice *ed1, *ed2;
+    eo1 = dynamic_cast<EtherObject*>(o1);
+    ed1 = dynamic_cast<EtherDevice*>(o1);
+    eo2 = dynamic_cast<EtherObject*>(o2);
+    ed2 = dynamic_cast<EtherDevice*>(o2);
 
-        if ((eo1 || ed1) && (eo2 || ed2)) {
-            EtherInt *p1 = lookupEthPort(o1, name1, i1);
-            EtherInt *p2 = lookupEthPort(o2, name2, i2);
+    if ((eo1 || ed1) && (eo2 || ed2)) {
+        EtherInt *p1 = lookupEthPort(o1, name1, i1);
+        EtherInt *p2 = lookupEthPort(o2, name2, i2);
 
-            if (p1 != NULL &&  p2 != NULL) {
+        if (p1 != NULL &&  p2 != NULL) {
 
-                p1->setPeer(p2);
-                p2->setPeer(p1);
+            p1->setPeer(p2);
+            p2->setPeer(p1);
 
-                return 1;
-            }
+            return 1;
         }
     }
 #endif
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev