3ece6ab029
wierd ini files. The ini files are still used as an intermediate step,
but a sophisticated python library exists to help build them more
easily.
SConscript:
add the new embedded file stuff
remove all of the old object description junk
base/inifile.cc:
base/inifile.hh:
get rid of findDefault and findAppend since they were the source
of much evil.
base/trace.cc:
For now, if we don't have the dprintf_stream set up, dump
to standard out. We probably want a command line option
for this.
dev/alpha_console.cc:
PioDevice now takes a platform parameter.
All PioDevices must have a pio_latency parameter. We stick
a dummy parameter in here for now until we get rid of the
builder stuff.
dev/alpha_console.hh:
don't need Platform anymore
dev/baddev.cc:
PioDevice now takes a platform parameter.
All PioDevices must have a pio_latency parameter. We stick
a dummy parameter in here for now until we get rid of the
builder stuff. Same for the platform parameter, though we just
pass the PioDevice a null parameter since it isn't used by
this device and it's quicker.
dev/baddev.hh:
fix #include guards
dev/etherlink.cc:
rename parameters.
dev/ethertap.cc:
rename parameters
dev/ide_ctrl.cc:
All devices need an address even if it will get overwritten later.
dev/ide_disk.cc:
use an enum for the drive ID stuff.
rename disk_delay -> delay
Actually, I think that we should implement "cable select" and
have the controller tell the drive what it is.
dev/io_device.cc:
dev/io_device.hh:
All IO devices take a Platform *
dev/ns_gige.cc:
all devices need an io_bus. rename header_bus to io_bus
We don't need stuff for the interrupt controller since
it's all in the platform now.
dev/ns_gige.hh:
We don't need stuff for the interrupt controller now since
it's all in the platform.
dev/pciconfigall.cc:
Pass a dummy NULL to the PioDevice for the platform since
we don't need one.
dev/pcidev.cc:
Move a bunch of common functionality into the PciDev
dev/platform.hh:
remove unneeded code
dev/tsunami.cc:
remove unused param
dev/tsunami_cchip.cc:
pass platform pointer
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/uart.cc:
pass platform variable
dev/uart.hh:
don't need to keep a platform pointer. it's in the base class
kern/linux/linux_system.cc:
kern/tru64/tru64_system.cc:
rename some parameters
sim/builder.cc:
clean up builder code. use more parameters from the
config node. all sections with a type= are now created,
the old mechanisms no longer work
sim/builder.hh:
remove some extra variables since they are found in the ConfigNode
sim/main.cc:
add a quick hack command line argument -X to dump out the
embedded files. (probably should be fixed up a little.)
accept .mpy files
printing to the streams has to happen after the hierarchy
is built since we're moving away from param contexts
sim/param.cc:
add parsing support for ranges
sim/process.cc:
isValid isn't very useful anymore. interpret the names
stdout, stderr, cout, cerr for the file descriptors
sim/pyconfig/SConscript:
Add Action handlers for creating an embedded python file
and for creating an embedded C file.
use these action handlers to embed all objects found in the objects
tree into the binary along with the importer and the m5config stuff
sim/pyconfig/m5config.py:
Major changes to the original configuration file generator. These
changes largely involve implementing copy-on-write like semantics
for all of the SimObjects. Real documentation must be written.
sim/universe.cc:
Universe becomes a SimObject since we don't really have the notion of
param contexts in the python code.
--HG--
rename : sim/pyconfig/m5configbase.py => sim/pyconfig/m5config.py
extra : convert_revision : c353453e5beb91c37f15755998fc0d8858c6829a
78 lines
3 KiB
Plaintext
78 lines
3 KiB
Plaintext
from Device import DmaDevice
|
|
from Pci import PciDevice
|
|
|
|
simobj EtherInt(SimObject):
|
|
abstract = True
|
|
peer = Param.EtherInt(NULL, "peer interface")
|
|
|
|
simobj EtherLink(SimObject):
|
|
int1 = Param.EtherInt("interface 1")
|
|
int2 = Param.EtherInt("interface 2")
|
|
delay = Param.Tick(0, "transmit delay of packets in us")
|
|
speed = Param.Tick(100000000, "link speed in bits per second")
|
|
dump = Param.EtherDump(NULL, "dump object")
|
|
|
|
simobj EtherBus(SimObject):
|
|
loopback = Param.Bool(true,
|
|
"send packet back to the interface from which it came")
|
|
dump = Param.EtherDump(NULL, "dump object")
|
|
speed = Param.UInt64(100000000, "bus speed in bits per second")
|
|
|
|
simobj EtherTap(EtherInt):
|
|
bufsz = Param.Int(10000, "tap buffer size")
|
|
dump = Param.EtherDump(NULL, "dump object")
|
|
port = Param.UInt16(3500, "tap port")
|
|
|
|
simobj EtherDump(SimObject):
|
|
file = Param.String("dump file")
|
|
|
|
simobj EtherDev(DmaDevice):
|
|
hardware_address = Param.EthernetAddr(NextEthernetAddr,
|
|
"Ethernet Hardware Address")
|
|
|
|
dma_data_free = Param.Bool(false, "DMA of Data is free")
|
|
dma_desc_free = Param.Bool(false, "DMA of Descriptors is free")
|
|
dma_read_delay = Param.Tick(0, "fixed delay for dma reads")
|
|
dma_read_factor = Param.Tick(0, "multiplier for dma reads")
|
|
dma_write_delay = Param.Tick(0, "fixed delay for dma writes")
|
|
dma_write_factor = Param.Tick(0, "multiplier for dma writes")
|
|
|
|
rx_filter = Param.Bool(true, "Enable Receive Filter")
|
|
rx_delay = Param.Tick(1000, "Receive Delay")
|
|
tx_delay = Param.Tick(1000, "Transmit Delay")
|
|
|
|
intr_delay = Param.Tick(0, "Interrupt Delay in microseconds")
|
|
payload_bus = Param.Bus(NULL, "The IO Bus to attach to for payload")
|
|
physmem = Param.PhysicalMemory(Super, "Physical Memory")
|
|
tlaser = Param.Turbolaser(Super, "Turbolaser")
|
|
|
|
simobj NSGigE(PciDevice):
|
|
hardware_address = Param.EthernetAddr(NextEthernetAddr,
|
|
"Ethernet Hardware Address")
|
|
|
|
dma_data_free = Param.Bool(false, "DMA of Data is free")
|
|
dma_desc_free = Param.Bool(false, "DMA of Descriptors is free")
|
|
dma_read_delay = Param.Tick(0, "fixed delay for dma reads")
|
|
dma_read_factor = Param.Tick(0, "multiplier for dma reads")
|
|
dma_write_delay = Param.Tick(0, "fixed delay for dma writes")
|
|
dma_write_factor = Param.Tick(0, "multiplier for dma writes")
|
|
|
|
rx_filter = Param.Bool(true, "Enable Receive Filter")
|
|
rx_delay = Param.Tick(1000, "Receive Delay")
|
|
tx_delay = Param.Tick(1000, "Transmit Delay")
|
|
|
|
rx_fifo_size = Param.Int(131072, "max size in bytes of rxFifo")
|
|
tx_fifo_size = Param.Int(131072, "max size in bytes of txFifo")
|
|
|
|
intr_delay = Param.Tick(0, "Interrupt Delay in microseconds")
|
|
payload_bus = Param.Bus(NULL, "The IO Bus to attach to for payload")
|
|
physmem = Param.PhysicalMemory(Super, "Physical Memory")
|
|
|
|
simobj EtherDevInt(EtherInt):
|
|
device = Param.EtherDev("Ethernet device of this interface")
|
|
|
|
simobj NSGigEInt(EtherInt):
|
|
device = Param.NSGigE("Ethernet device of this interface")
|
|
|
|
|