From 00be4e8510f587603cf358d615d19d8bbf8ec57e Mon Sep 17 00:00:00 2001 From: Ron Dreslinski Date: Tue, 21 Feb 2006 03:32:42 -0500 Subject: 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 --- mem/translating_port.cc | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'mem') diff --git a/mem/translating_port.cc b/mem/translating_port.cc index ef4ed83d0..4c2dd3acb 100644 --- a/mem/translating_port.cc +++ b/mem/translating_port.cc @@ -27,6 +27,7 @@ */ #include +#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(gen.addr(),paddr)) + return Machine_Check_Fault; - if (!pTable->translate(addr,paddr)) - return Machine_Check_Fault; + port->memsetBlobFunctional(paddr, val, gen.size()); + } - port->memsetBlobFunctional(paddr, val, size); return No_Fault; } -- cgit v1.2.3