derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
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
This commit is contained in:
Ron Dreslinski
2006-02-21 03:32:42 -05:00
parent 562efe214c
commit 00be4e8510
2 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
cpu/simple/cpu.cc
View File

@@ -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)

38
mem/translating_port.cc
View File

@@ -27,6 +27,7 @@
*/
#include <string>
#include "base/chunk_generator.hh"
#include "mem/port.hh"
#include "mem/translating_port.hh"
#include "mem/page_table.hh"
@@ -42,15 +43,17 @@ Fault
TranslatingPort::readBlobFunctional(Addr addr, uint8_t *p, int size)
{
Addr paddr;
int prevSize = 0;
//@todo Break up things larger than a page size
pTable->page_check(addr, size);
for (ChunkGenerator gen(addr, size, VMPageSize); !gen.done(); gen.next()) {
if (!pTable->translate(gen.addr(),paddr))
return Machine_Check_Fault;
if (!pTable->translate(addr,paddr))
return Machine_Check_Fault;
port->readBlobFunctional(paddr, p + prevSize, gen.size());
prevSize += gen.size();
}
port->readBlobFunctional(paddr, p, size);
return No_Fault;
}
@@ -58,14 +61,17 @@ Fault
TranslatingPort::writeBlobFunctional(Addr addr, uint8_t *p, int size)
{
Addr paddr;
int prevSize = 0;
//@todo Break up things larger than a page size
pTable->page_check(addr, size);
for (ChunkGenerator gen(addr, size, VMPageSize); !gen.done(); gen.next()) {
if (!pTable->translate(addr,paddr))
return Machine_Check_Fault;
if (!pTable->translate(gen.addr(),paddr))
return Machine_Check_Fault;
port->writeBlobFunctional(paddr, p + prevSize, gen.size());
prevSize += gen.size();
}
port->writeBlobFunctional(paddr, p, size);
return No_Fault;
}
@@ -74,14 +80,14 @@ TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size)
{
Addr paddr;
//@todo Break up things larger than a page size
//Use the Stever breakup code
pTable->page_check(addr, size);
for (ChunkGenerator gen(addr, size, VMPageSize); !gen.done(); gen.next()) {
if (!pTable->translate(addr,paddr))
return Machine_Check_Fault;
if (!pTable->translate(gen.addr(),paddr))
return Machine_Check_Fault;
port->memsetBlobFunctional(paddr, val, gen.size());
}
port->memsetBlobFunctional(paddr, val, size);
return No_Fault;
}