diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-05-26 14:17:33 -0400 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-05-26 14:17:33 -0400 |
commit | e533fad711fce66bf2e4a6669baeb8eaf02799e1 (patch) | |
tree | 0fdb6011df3204031dd1dec784649aa3cdac5613 /src/dev/alpha_console.cc | |
parent | da6a7b1263cf624790f06a5f944366fb113dffc8 (diff) | |
download | gem5-e533fad711fce66bf2e4a6669baeb8eaf02799e1.tar.xz |
Significant rework of Packet class interface:
- new constructor guarantees initialization of most fields
- flags track status of non-guaranteed fields (addr, size, src)
- accessor functions (getAddr() etc.) check status on access
- Command & Result classes are nested in Packet class scope
- Command now built from vector of behavior bits
- string version of Command for tracing
- reinitFromRequest() and makeTimingResponse() encapsulate
common manipulations of existing packets
src/cpu/simple/atomic.cc:
src/cpu/simple/base.cc:
src/cpu/simple/timing.cc:
src/dev/alpha_console.cc:
src/dev/ide_ctrl.cc:
src/dev/io_device.cc:
src/dev/io_device.hh:
src/dev/isa_fake.cc:
src/dev/ns_gige.cc:
src/dev/pciconfigall.cc:
src/dev/sinic.cc:
src/dev/tsunami_cchip.cc:
src/dev/tsunami_io.cc:
src/dev/tsunami_pchip.cc:
src/dev/uart8250.cc:
src/mem/bus.cc:
src/mem/bus.hh:
src/mem/physical.cc:
src/mem/port.cc:
src/mem/port.hh:
src/mem/request.hh:
Update for new Packet interface.
--HG--
extra : convert_revision : 9973d09ea4fa61795f23772a7d3995fa4df5c269
Diffstat (limited to 'src/dev/alpha_console.cc')
-rw-r--r-- | src/dev/alpha_console.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/dev/alpha_console.cc b/src/dev/alpha_console.cc index f24c09844..0b4bb048c 100644 --- a/src/dev/alpha_console.cc +++ b/src/dev/alpha_console.cc @@ -95,15 +95,15 @@ AlphaConsole::read(Packet *pkt) * machine dependent address swizzle is required? */ - assert(pkt->result == Unknown); - assert(pkt->addr >= pioAddr && pkt->addr < pioAddr + pioSize); + assert(pkt->result == Packet::Unknown); + assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize); pkt->time += pioDelay; - Addr daddr = pkt->addr - pioAddr; + Addr daddr = pkt->getAddr() - pioAddr; pkt->allocate(); - switch (pkt->size) + switch (pkt->getSize()) { case sizeof(uint32_t): switch (daddr) @@ -124,7 +124,7 @@ AlphaConsole::read(Packet *pkt) /* Old console code read in everyting as a 32bit int * we now break that for better error checking. */ - pkt->result = BadAddress; + pkt->result = Packet::BadAddress; } DPRINTF(AlphaConsole, "read: offset=%#x val=%#x\n", daddr, pkt->get<uint32_t>()); @@ -181,9 +181,10 @@ AlphaConsole::read(Packet *pkt) pkt->get<uint64_t>()); break; default: - pkt->result = BadAddress; + pkt->result = Packet::BadAddress; } - if (pkt->result == Unknown) pkt->result = Success; + if (pkt->result == Packet::Unknown) + pkt->result = Packet::Success; return pioDelay; } @@ -192,12 +193,12 @@ AlphaConsole::write(Packet *pkt) { pkt->time += pioDelay; - assert(pkt->result == Unknown); - assert(pkt->addr >= pioAddr && pkt->addr < pioAddr + pioSize); - Addr daddr = pkt->addr - pioAddr; + assert(pkt->result == Packet::Unknown); + assert(pkt->getAddr() >= pioAddr && pkt->getAddr() < pioAddr + pioSize); + Addr daddr = pkt->getAddr() - pioAddr; uint64_t val = pkt->get<uint64_t>(); - assert(pkt->size == sizeof(uint64_t)); + assert(pkt->getSize() == sizeof(uint64_t)); switch (daddr) { case offsetof(AlphaAccess, diskUnit): @@ -240,7 +241,7 @@ AlphaConsole::write(Packet *pkt) panic("Unknown 64bit access, %#x\n", daddr); } - pkt->result = Success; + pkt->result = Packet::Success; return pioDelay; } |