diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2005-03-23 15:52:03 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2005-03-23 15:52:03 -0500 |
| commit | 903c984770f05efccd6487aa90e26957c28907d5 (patch) | |
| tree | e9a92385d5b06db63b202a27699f26996ab47974 /python/m5/objects | |
| parent | 2be988074cfd2d55617fdd4256ea62e7a1b63f92 (diff) | |
| parent | d4e9175c24f205231b0e338ee1d4a8e636749f69 (diff) | |
| download | gem5-903c984770f05efccd6487aa90e26957c28907d5.tar.xz | |
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : ed00a0f85ed796a19a3112d0dd5b775c1dbcf2b8
Diffstat (limited to 'python/m5/objects')
| -rw-r--r-- | python/m5/objects/BaseCache.mpy | 2 | ||||
| -rw-r--r-- | python/m5/objects/Ethernet.mpy | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/python/m5/objects/BaseCache.mpy b/python/m5/objects/BaseCache.mpy index 98a422e30..b9986917f 100644 --- a/python/m5/objects/BaseCache.mpy +++ b/python/m5/objects/BaseCache.mpy @@ -23,7 +23,7 @@ simobj BaseCache(BaseMem): "always service demand misses first") protocol = Param.CoherenceProtocol(NULL, "coherence protocol to use") repl = Param.Repl(NULL, "replacement policy") - size = Param.Int("capacity in bytes") + size = Param.MemorySize("capacity in bytes") split = Param.Bool(False, "whether or not this cache is split") split_size = Param.Int(0, "How many ways of the cache belong to CPU/LRU partition") diff --git a/python/m5/objects/Ethernet.mpy b/python/m5/objects/Ethernet.mpy index cd251f36d..3acd8d04d 100644 --- a/python/m5/objects/Ethernet.mpy +++ b/python/m5/objects/Ethernet.mpy @@ -68,8 +68,8 @@ simobj NSGigE(PciDevice): 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") + rx_fifo_size = Param.MemorySize('128kB', "max size in bytes of rxFifo") + tx_fifo_size = Param.MemorySize('128kB', "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") |