changeset 9df38d259935 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=9df38d259935
description:
SE/FS: Put platform pointers in fewer objects.
Not all objects need a platform pointer, and having one creates a
dependence
on their being a platform object. This change removes the platform
pointer to
from the base device object and moves it into subclasses that actually
need
it.
diffstat:
src/arch/x86/X86LocalApic.py | 5 +++++
src/arch/x86/interrupts.cc | 6 +++++-
src/arch/x86/interrupts.hh | 5 +++++
src/dev/Device.py | 1 -
src/dev/Pci.py | 2 ++
src/dev/Uart.py | 1 +
src/dev/alpha/AlphaBackdoor.py | 1 +
src/dev/arm/RealView.py | 1 +
src/dev/arm/gic.cc | 7 ++++---
src/dev/arm/gic.hh | 2 ++
src/dev/baddev.cc | 1 -
src/dev/io_device.cc | 2 +-
src/dev/io_device.hh | 6 ------
src/dev/pcidev.cc | 4 ++--
src/dev/pcidev.hh | 8 ++++----
src/dev/sparc/T1000.py | 1 +
src/dev/sparc/iob.cc | 3 ---
17 files changed, 34 insertions(+), 22 deletions(-)
diffs (281 lines):
diff -r 491297d019f3 -r 9df38d259935 src/arch/x86/X86LocalApic.py
--- a/src/arch/x86/X86LocalApic.py Fri Sep 30 00:29:07 2011 -0700
+++ b/src/arch/x86/X86LocalApic.py Tue Oct 04 02:26:03 2011 -0700
@@ -26,7 +26,9 @@
#
# Authors: Gabe Black
+from m5.defines import buildEnv
from m5.params import *
+from m5.proxy import *
from Device import BasicPioDevice
class X86LocalApic(BasicPioDevice):
@@ -36,3 +38,6 @@
int_port = Port("Port for sending and receiving interrupt messages")
int_latency = Param.Latency('1ns', \
"Latency for an interrupt to propagate through this device.")
+ if buildEnv['FULL_SYSTEM']: # No platform in SE mode.
+ platform = Param.Platform(Parent.any,
+ "Platform this device is part of.")
diff -r 491297d019f3 -r 9df38d259935 src/arch/x86/interrupts.cc
--- a/src/arch/x86/interrupts.cc Fri Sep 30 00:29:07 2011 -0700
+++ b/src/arch/x86/interrupts.cc Tue Oct 04 02:26:03 2011 -0700
@@ -302,10 +302,11 @@
//
BasicPioDevice::init();
IntDev::init();
-
+#if FULL_SYSTEM
Pc * pc = dynamic_cast<Pc *>(platform);
assert(pc);
pc->southBridge->ioApic->registerLocalApic(initialApicId, this);
+#endif
}
@@ -613,6 +614,9 @@
pendingStartup(false), startupVector(0),
startedUp(false), pendingUnmaskableInt(false),
pendingIPIs(0), cpu(NULL)
+#if FULL_SYSTEM
+ , platform(p->platform)
+#endif
{
pioSize = PageBytes;
memset(regs, 0, sizeof(regs));
diff -r 491297d019f3 -r 9df38d259935 src/arch/x86/interrupts.hh
--- a/src/arch/x86/interrupts.hh Fri Sep 30 00:29:07 2011 -0700
+++ b/src/arch/x86/interrupts.hh Tue Oct 04 02:26:03 2011 -0700
@@ -44,6 +44,7 @@
#include "arch/x86/faults.hh"
#include "arch/x86/intmessage.hh"
#include "base/bitfield.hh"
+#include "config/full_system.hh"
#include "cpu/thread_context.hh"
#include "dev/x86/intdev.hh"
#include "dev/io_device.hh"
@@ -175,6 +176,10 @@
int initialApicId;
+#if FULL_SYSTEM
+ Platform *platform;
+#endif
+
public:
/*
* Params stuff.
diff -r 491297d019f3 -r 9df38d259935 src/dev/Device.py
--- a/src/dev/Device.py Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/Device.py Tue Oct 04 02:26:03 2011 -0700
@@ -34,7 +34,6 @@
type = 'PioDevice'
abstract = True
pio = Port("Programmed I/O port")
- platform = Param.Platform(Parent.any, "Platform this device is part of")
system = Param.System(Parent.any, "System this device is part of")
class BasicPioDevice(PioDevice):
diff -r 491297d019f3 -r 9df38d259935 src/dev/Pci.py
--- a/src/dev/Pci.py Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/Pci.py Tue Oct 04 02:26:03 2011 -0700
@@ -33,6 +33,7 @@
class PciConfigAll(PioDevice):
type = 'PciConfigAll'
+ platform = Param.Platform(Parent.any, "Platform this device is part of.")
pio_latency = Param.Tick(1, "Programmed IO latency in simticks")
bus = Param.UInt8(0x00, "PCI bus to act as config space for")
size = Param.MemorySize32('16MB', "Size of config space")
@@ -41,6 +42,7 @@
class PciDevice(DmaDevice):
type = 'PciDevice'
abstract = True
+ platform = Param.Platform(Parent.any, "Platform this device is part of.")
config = Port(Self.pio.peerObj.port, "PCI configuration space port")
pci_bus = Param.Int("PCI bus")
pci_dev = Param.Int("PCI device number")
diff -r 491297d019f3 -r 9df38d259935 src/dev/Uart.py
--- a/src/dev/Uart.py Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/Uart.py Tue Oct 04 02:26:03 2011 -0700
@@ -33,6 +33,7 @@
class Uart(BasicPioDevice):
type = 'Uart'
abstract = True
+ platform = Param.Platform(Parent.any, "Platform this device is part of.")
terminal = Param.Terminal(Parent.any, "The terminal")
class Uart8250(Uart):
diff -r 491297d019f3 -r 9df38d259935 src/dev/alpha/AlphaBackdoor.py
--- a/src/dev/alpha/AlphaBackdoor.py Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/alpha/AlphaBackdoor.py Tue Oct 04 02:26:03 2011 -0700
@@ -36,5 +36,6 @@
cpu = Param.BaseCPU(Parent.cpu[0], "Processor")
disk = Param.SimpleDisk("Simple Disk")
terminal = Param.Terminal(Parent.any, "The console terminal")
+ platform = Param.Platform(Parent.any, "Platform this device is part of.")
if buildEnv['FULL_SYSTEM']: # No AlphaSystem in SE mode.
system = Param.AlphaSystem(Parent.any, "system object")
diff -r 491297d019f3 -r 9df38d259935 src/dev/arm/RealView.py
--- a/src/dev/arm/RealView.py Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/arm/RealView.py Tue Oct 04 02:26:03 2011 -0700
@@ -83,6 +83,7 @@
class Gic(PioDevice):
type = 'Gic'
+ platform = Param.Platform(Parent.any, "Platform this device is part of.")
dist_addr = Param.Addr(0x1f001000, "Address for distributor")
cpu_addr = Param.Addr(0x1f000100, "Address for cpu")
dist_pio_delay = Param.Latency('10ns', "Delay for PIO r/w to distributor")
diff -r 491297d019f3 -r 9df38d259935 src/dev/arm/gic.cc
--- a/src/dev/arm/gic.cc Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/arm/gic.cc Tue Oct 04 02:26:03 2011 -0700
@@ -53,9 +53,10 @@
#include "mem/packet_access.hh"
Gic::Gic(const Params *p)
- : PioDevice(p),distAddr(p->dist_addr), cpuAddr(p->cpu_addr),
- distPioDelay(p->dist_pio_delay), cpuPioDelay(p->cpu_pio_delay),
- intLatency(p->int_latency), enabled(false), itLines(p->it_lines)
+ : PioDevice(p), platform(p->platform), distAddr(p->dist_addr),
+ cpuAddr(p->cpu_addr), distPioDelay(p->dist_pio_delay),
+ cpuPioDelay(p->cpu_pio_delay), intLatency(p->int_latency),
+ enabled(false), itLines(p->it_lines)
{
itLinesLog2 = ceilLog2(itLines);
diff -r 491297d019f3 -r 9df38d259935 src/dev/arm/gic.hh
--- a/src/dev/arm/gic.hh Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/arm/gic.hh Tue Oct 04 02:26:03 2011 -0700
@@ -124,6 +124,8 @@
Bitfield<12,10> cpu_id;
EndBitUnion(IAR)
+ Platform *platform;
+
/** Distributor address GIC listens at */
Addr distAddr;
diff -r 491297d019f3 -r 9df38d259935 src/dev/baddev.cc
--- a/src/dev/baddev.cc Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/baddev.cc Tue Oct 04 02:26:03 2011 -0700
@@ -39,7 +39,6 @@
#include "base/trace.hh"
#include "config/the_isa.hh"
#include "dev/baddev.hh"
-#include "dev/platform.hh"
#include "mem/port.hh"
#include "params/BadDevice.hh"
#include "sim/system.hh"
diff -r 491297d019f3 -r 9df38d259935 src/dev/io_device.cc
--- a/src/dev/io_device.cc Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/io_device.cc Tue Oct 04 02:26:03 2011 -0700
@@ -58,7 +58,7 @@
PioDevice::PioDevice(const Params *p)
- : MemObject(p), platform(p->platform), sys(p->system), pioPort(NULL)
+ : MemObject(p), sys(p->system), pioPort(NULL)
{}
PioDevice::~PioDevice()
diff -r 491297d019f3 -r 9df38d259935 src/dev/io_device.hh
--- a/src/dev/io_device.hh Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/io_device.hh Tue Oct 04 02:26:03 2011 -0700
@@ -42,7 +42,6 @@
#include "sim/sim_object.hh"
class Event;
-class Platform;
class PioDevice;
class DmaDevice;
class System;
@@ -173,11 +172,6 @@
class PioDevice : public MemObject
{
protected:
-
- /** The platform we are in. This is used to decide what type of memory
- * transaction we should perform. */
- Platform *platform;
-
System *sys;
/** The pioPort that handles the requests for us and provides us requests
diff -r 491297d019f3 -r 9df38d259935 src/dev/pcidev.cc
--- a/src/dev/pcidev.cc Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/pcidev.cc Tue Oct 04 02:26:03 2011 -0700
@@ -83,7 +83,7 @@
PciDev::PciDev(const Params *p)
- : DmaDevice(p), plat(p->platform), pioDelay(p->pio_latency),
+ : DmaDevice(p), platform(p->platform), pioDelay(p->pio_latency),
configDelay(p->config_latency), configPort(NULL)
{
config.vendor = htole(p->VendorID);
@@ -143,7 +143,7 @@
}
}
- plat->registerPciDevice(p->pci_bus, p->pci_dev, p->pci_func,
+ platform->registerPciDevice(p->pci_bus, p->pci_dev, p->pci_func,
letoh(config.interruptLine));
}
diff -r 491297d019f3 -r 9df38d259935 src/dev/pcidev.hh
--- a/src/dev/pcidev.hh Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/pcidev.hh Tue Oct 04 02:26:03 2011 -0700
@@ -149,7 +149,7 @@
}
protected:
- Platform *plat;
+ Platform *platform;
Tick pioDelay;
Tick configDelay;
PciConfigPort *configPort;
@@ -173,15 +173,15 @@
public:
Addr pciToDma(Addr pciAddr) const
- { return plat->pciToDma(pciAddr); }
+ { return platform->pciToDma(pciAddr); }
void
intrPost()
- { plat->postPciInt(letoh(config.interruptLine)); }
+ { platform->postPciInt(letoh(config.interruptLine)); }
void
intrClear()
- { plat->clearPciInt(letoh(config.interruptLine)); }
+ { platform->clearPciInt(letoh(config.interruptLine)); }
uint8_t
interruptLine()
diff -r 491297d019f3 -r 9df38d259935 src/dev/sparc/T1000.py
--- a/src/dev/sparc/T1000.py Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/sparc/T1000.py Tue Oct 04 02:26:03 2011 -0700
@@ -46,6 +46,7 @@
class Iob(PioDevice):
type = 'Iob'
+ platform = Param.Platform(Parent.any, "Platform this device is part of.")
pio_latency = Param.Latency('1ns', "Programed IO latency in simticks")
diff -r 491297d019f3 -r 9df38d259935 src/dev/sparc/iob.cc
--- a/src/dev/sparc/iob.cc Fri Sep 30 00:29:07 2011 -0700
+++ b/src/dev/sparc/iob.cc Tue Oct 04 02:26:03 2011 -0700
@@ -62,9 +62,6 @@
pioDelay = p->pio_latency;
- // Get the interrupt controller from the platform
- ic = platform->intrctrl;
-
for (int x = 0; x < NumDeviceIds; ++x) {
intMan[x].cpu = 0;
intMan[x].vector = 0;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
