Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/13469
Change subject: dev: Build most of the networking devices in the NULL_ISA
build.
......................................................................
dev: Build most of the networking devices in the NULL_ISA build.
The only part of these devices which are incompatible with other ISAs,
with the possible exception of endianness transformation, is that
the dist_iface implementation refers to ThreadContext methods and
that class is heavily tied to the guest ISA. Only those few lines are
excluded in a NULL_ISA build.
Change-Id: Ic6d643fdbb792d0a996a37d75e027c5ce0ecd460
---
M src/dev/net/SConscript
M src/dev/net/dist_iface.cc
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/dev/net/SConscript b/src/dev/net/SConscript
index e39df9d..908dd44 100644
--- a/src/dev/net/SConscript
+++ b/src/dev/net/SConscript
@@ -44,9 +44,6 @@
Import('*')
-if env['TARGET_ISA'] == 'null':
- Return()
-
SimObject('Ethernet.py')
# Basic Ethernet infrastructure
diff --git a/src/dev/net/dist_iface.cc b/src/dev/net/dist_iface.cc
index 7eef5d8..e09520f 100644
--- a/src/dev/net/dist_iface.cc
+++ b/src/dev/net/dist_iface.cc
@@ -857,6 +857,7 @@
// Unforunate that we have to populate the system pointer member this
way.
master->sys = tc->getSystemPtr();
+#if THE_ISA != NULL_ISA
// The invariant for both syncing and "unsyncing" is that all threads
will
// stop executing intructions until the desired sync state has been
reached
// for all nodes. This is the easiest way to prevent deadlock (in the
case
@@ -888,6 +889,7 @@
tc->quiesceTick(master->syncEvent->when() + 1);
}
}
+#endif
}
bool
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13469
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ic6d643fdbb792d0a996a37d75e027c5ce0ecd460
Gerrit-Change-Number: 13469
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
