diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2014-02-18 05:50:59 -0500 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2014-02-18 05:50:59 -0500 |
| commit | f0ea79c41f6c6b00b976b6fe67ac350a1852022a (patch) | |
| tree | ca26eef5a8fb98b538f282fb5268ed15c9882582 | |
| parent | ffc838cd0062a9c0c8c4d09f8355829ec0ab16ca (diff) | |
| download | gem5-f0ea79c41f6c6b00b976b6fe67ac350a1852022a.tar.xz | |
dev: Include basic devices in NULL ISA build
This patch enbles use of the basic PIO devices as part of the NULL
build. Although it might seem counter intuitive to have a PIO device
without being able to execute a driver, this change enables us to
break a device class hierarchy into an ISA-agnostic part, and an
ISA-specific part, without requiring multiple-inheritance. The
ISA-agnostic base class is a PIO device, but does not make use of the
port.
| -rw-r--r-- | src/dev/SConscript | 9 | ||||
| -rw-r--r-- | src/dev/baddev.cc | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/dev/SConscript b/src/dev/SConscript index 1bcddb6ee..8596c2f74 100644 --- a/src/dev/SConscript +++ b/src/dev/SConscript @@ -31,12 +31,16 @@ Import('*') +SimObject('Device.py') +Source('io_device.cc') +Source('isa_fake.cc') +DebugFlag('IsaFake') + if env['TARGET_ISA'] == 'null': Return() SimObject('BadDevice.py') SimObject('CopyEngine.py') -SimObject('Device.py') SimObject('DiskImage.py') SimObject('Ethernet.py') SimObject('Ide.py') @@ -61,8 +65,6 @@ Source('i8254xGBe.cc') Source('ide_ctrl.cc') Source('ide_disk.cc') Source('intel_8254_timer.cc') -Source('io_device.cc') -Source('isa_fake.cc') Source('mc146818.cc') Source('ns_gige.cc') Source('pciconfigall.cc') @@ -92,7 +94,6 @@ DebugFlag('EthernetSM') DebugFlag('IdeCtrl') DebugFlag('IdeDisk') DebugFlag('Intel8254Timer') -DebugFlag('IsaFake') DebugFlag('MC146818') DebugFlag('PCIDEV') DebugFlag('PciConfigAll') diff --git a/src/dev/baddev.cc b/src/dev/baddev.cc index b3a30b7e5..918c754d5 100644 --- a/src/dev/baddev.cc +++ b/src/dev/baddev.cc @@ -32,14 +32,10 @@ * BadDevice implemenation */ -#include <deque> #include <string> -#include <vector> #include "base/trace.hh" -#include "config/the_isa.hh" #include "dev/baddev.hh" -#include "mem/port.hh" #include "params/BadDevice.hh" #include "sim/system.hh" |