diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-01-19 13:22:38 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-01-19 13:22:38 -0500 |
| commit | 51d52a38348399a152c3a42f71eca710d0bc72da (patch) | |
| tree | 60f407f42f10772b00fcdf8734037bb25b5797e1 | |
| parent | 19bd52c935bb3e31621cf7b72fb5796543e68501 (diff) | |
| parent | b65f365474e6e861275cdab493fd1ad62b98933b (diff) | |
| download | gem5-51d52a38348399a152c3a42f71eca710d0bc72da.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : 1064ec4c8624682b35f66163fb349fe04903411d
| -rw-r--r-- | dev/pktfifo.cc | 1 | ||||
| -rw-r--r-- | objects/Pci.mpy | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dev/pktfifo.cc b/dev/pktfifo.cc index ae82123cf..79a96cc1d 100644 --- a/dev/pktfifo.cc +++ b/dev/pktfifo.cc @@ -60,7 +60,6 @@ PacketFifo::unserialize(const string &base, Checkpoint *cp, paramIn(cp, section, base + ".packets", fifosize); fifo.clear(); - fifo.resize(fifosize); for (int i = 0; i < fifosize; ++i) { PacketPtr p = new PacketData(16384); diff --git a/objects/Pci.mpy b/objects/Pci.mpy index d6917b020..a7763139f 100644 --- a/objects/Pci.mpy +++ b/objects/Pci.mpy @@ -1,7 +1,7 @@ from Device import FooPioDevice, DmaDevice simobj PciConfigData(FooPioDevice): - addr = 0xffffffffffffffff + addr = 0xffffffffffffffffL VendorID = Param.UInt16("Vendor ID") DeviceID = Param.UInt16("Device ID") Command = Param.UInt16(0, "Command") @@ -47,4 +47,4 @@ simobj PciDevice(DmaDevice): pci_func = Param.Int("PCI function code") configdata = Param.PciConfigData(Super, "PCI Config data") configspace = Param.PciConfigAll(Super, "PCI Configspace") - addr = 0xffffffffffffffff + addr = 0xffffffffffffffffL |