diff --git a/mem/physical.cc b/mem/physical.cc index 031d832dda..4c17432932 100644 --- a/mem/physical.cc +++ b/mem/physical.cc @@ -54,7 +54,7 @@ using namespace std; #if FULL_SYSTEM PhysicalMemory::PhysicalMemory(const string &n, Range range, MemoryController *mmu, const std::string &fname) - : FunctionalMemory(n), base_addr(range.start), pmem_size(range.size()), + : Memory(n), base_addr(range.start), pmem_size(range.size()), pmem_addr(NULL) { if (pmem_size % TheISA::PageBytes != 0) @@ -167,8 +167,8 @@ PhysicalMemory::prot_memset(Addr addr, uint8_t val, int size) int PhysicalMemory::deviceBlockSize() { - //For now the largest accesses we can take are Page Sized - return VMPageSize; + //Can accept anysize request + return 0; } void diff --git a/mem/physical.hh b/mem/physical.hh index a98c522122..156a4da1d7 100644 --- a/mem/physical.hh +++ b/mem/physical.hh @@ -64,6 +64,7 @@ class PhysicalMemory : public Memory void prot_access_error(Addr addr, int size, const std::string &func); public: + virtual int deviceBlockSize(); // Read/Write arbitrary amounts of data to simulated memory space virtual void prot_read(Addr addr, uint8_t *p, int size); diff --git a/mem/port.hh b/mem/port.hh index 88cca885be..9d0bd7968d 100644 --- a/mem/port.hh +++ b/mem/port.hh @@ -96,7 +96,7 @@ class Port /** Function to set the pointer for the peer port. @todo should be called by the configuration stuff (python). */ - Port *getPeer(Port *port) { return peer; } + Port *getPeer() { return peer; } protected: diff --git a/mem/translating_port.cc b/mem/translating_port.cc index 4c2dd3acb8..052d350b99 100644 --- a/mem/translating_port.cc +++ b/mem/translating_port.cc @@ -75,6 +75,7 @@ TranslatingPort::writeBlobFunctional(Addr addr, uint8_t *p, int size) return No_Fault; } +/* Fault TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size) { @@ -90,6 +91,7 @@ TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size) return No_Fault; } +*/ Fault TranslatingPort::writeStringFunctional(Addr addr, const char *str) diff --git a/mem/translating_port.hh b/mem/translating_port.hh index c8764bf413..671c322370 100644 --- a/mem/translating_port.hh +++ b/mem/translating_port.hh @@ -50,7 +50,7 @@ class TranslatingPort public: Fault readBlobFunctional(Addr addr, uint8_t *p, int size); Fault writeBlobFunctional(Addr addr, uint8_t *p, int size); - Fault memsetBlobFunctional(Addr addr, uint8_t val, int size); + // Fault memsetBlobFunctional(Addr addr, uint8_t val, int size); Fault writeStringFunctional(Addr addr, const char *str); Fault readStringFunctional(std::string &str, Addr addr);