diff options
author | Ron Dreslinski <rdreslin@umich.edu> | 2006-02-21 03:32:42 -0500 |
---|---|---|
committer | Ron Dreslinski <rdreslin@umich.edu> | 2006-02-21 03:32:42 -0500 |
commit | 00be4e8510f587603cf358d615d19d8bbf8ec57e (patch) | |
tree | 6a5b19f1c918e5579651ec831ff9f3022779cf1a /cpu/simple | |
parent | 562efe214c35c0d40c810a11e94cc6e08c32dda5 (diff) | |
download | gem5-00be4e8510f587603cf358d615d19d8bbf8ec57e.tar.xz |
Thanks to Ali, I was able to add chunk generation code in to handle a few cases. Still have some duplicated code we may want to revisit.
cpu/simple/cpu.cc:
Thanks to Ali I found the chunk generator, although I still seem to be duplicating some code becuase the only difference between readBlob and writeBlob is the command in the packet. Perhaps an access function with the command as a param would help with the duplication (sendBlob that takes a cmd (maybe).
mem/translating_port.cc:
Using the chunck generator to break it up to be in page size chunks
--HG--
extra : convert_revision : cc2e4e60c76098655e469f81c89d2c7438350fdb
Diffstat (limited to 'cpu/simple')
-rw-r--r-- | cpu/simple/cpu.cc | 43 |
1 files changed, 35 insertions, 8 deletions
diff --git a/cpu/simple/cpu.cc b/cpu/simple/cpu.cc index 02673119a..b7c213edf 100644 --- a/cpu/simple/cpu.cc +++ b/cpu/simple/cpu.cc @@ -36,6 +36,7 @@ #include <string> #include "base/cprintf.hh" +#include "base/chunk_generator.hh" #include "base/inifile.hh" #include "base/loader/symtab.hh" #include "base/misc.hh" @@ -130,19 +131,45 @@ SimpleCPU::CpuPort::recvRetry() void SimpleCPU::CpuPort::writeBlobFunctional(Addr addr, uint8_t *p, int size) { - int blksize = sendBlockSizeQuery(); - //Use Stever's break it inot block size chunk code - //then send functional - blksize |= blksize; + int prevSize = 0; + //Base Packet + for (ChunkGenerator gen(addr, size, sendBlockSizeQuery()); !gen.done(); gen.next()) + { + Packet *blobpkt = new Packet(); + CpuRequest *blobreq = new CpuRequest(); + blobpkt->addr = gen.addr(); + blobpkt->size = gen.size(); + blobpkt->cmd = Write; + blobpkt->req = blobreq; + blobpkt->req->paddr = blobpkt->addr; + blobpkt->req->size = blobpkt->size; + blobpkt->data = p + prevSize; + prevSize += blobpkt->size; + + sendFunctional(*blobpkt); + } } void SimpleCPU::CpuPort::readBlobFunctional(Addr addr, uint8_t *p, int size) { - int blksize = sendBlockSizeQuery(); - //Use Stever's break it inot block size chunk code - //then send functional - blksize |= blksize; + int prevSize = 0; + //Base Packet + for (ChunkGenerator gen(addr, size, sendBlockSizeQuery()); !gen.done(); gen.next()) + { + Packet *blobpkt = new Packet(); + CpuRequest *blobreq = new CpuRequest(); + blobpkt->addr = gen.addr(); + blobpkt->size = gen.size(); + blobpkt->cmd = Write; + blobpkt->req = blobreq; + blobpkt->req->paddr = blobpkt->addr; + blobpkt->req->size = blobpkt->size; + blobpkt->data = p + prevSize; + prevSize += blobpkt->size; + + sendFunctional(*blobpkt); + } } SimpleCPU::SimpleCPU(Params *p) |