Some more changes for compilation. Since memset is now part of port and not virtual, no need for memory to define them.
mem/physical.cc: Return 0 for block size. The chunk generator should treat this as a infinite size. mem/physical.hh: Add function prototype mem/port.hh: Fix function to take no arguments mem/translating_port.cc: mem/translating_port.hh: Remove the memsetBlob because it doesn't exist yet. --HG-- extra : convert_revision : dfe352acfc2912ecc9a1ba1863e5666f46b991cc
This commit is contained in:
parent
4bd11c10a5
commit
1fff9f504f
5 changed files with 8 additions and 5 deletions
|
@ -54,7 +54,7 @@ using namespace std;
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
PhysicalMemory::PhysicalMemory(const string &n, Range<Addr> range,
|
PhysicalMemory::PhysicalMemory(const string &n, Range<Addr> range,
|
||||||
MemoryController *mmu, const std::string &fname)
|
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)
|
pmem_addr(NULL)
|
||||||
{
|
{
|
||||||
if (pmem_size % TheISA::PageBytes != 0)
|
if (pmem_size % TheISA::PageBytes != 0)
|
||||||
|
@ -167,8 +167,8 @@ PhysicalMemory::prot_memset(Addr addr, uint8_t val, int size)
|
||||||
int
|
int
|
||||||
PhysicalMemory::deviceBlockSize()
|
PhysicalMemory::deviceBlockSize()
|
||||||
{
|
{
|
||||||
//For now the largest accesses we can take are Page Sized
|
//Can accept anysize request
|
||||||
return VMPageSize;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -64,6 +64,7 @@ class PhysicalMemory : public Memory
|
||||||
void prot_access_error(Addr addr, int size, const std::string &func);
|
void prot_access_error(Addr addr, int size, const std::string &func);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
virtual int deviceBlockSize();
|
||||||
|
|
||||||
// Read/Write arbitrary amounts of data to simulated memory space
|
// Read/Write arbitrary amounts of data to simulated memory space
|
||||||
virtual void prot_read(Addr addr, uint8_t *p, int size);
|
virtual void prot_read(Addr addr, uint8_t *p, int size);
|
||||||
|
|
|
@ -96,7 +96,7 @@ class Port
|
||||||
/** Function to set the pointer for the peer port.
|
/** Function to set the pointer for the peer port.
|
||||||
@todo should be called by the configuration stuff (python).
|
@todo should be called by the configuration stuff (python).
|
||||||
*/
|
*/
|
||||||
Port *getPeer(Port *port) { return peer; }
|
Port *getPeer() { return peer; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
|
|
@ -75,6 +75,7 @@ TranslatingPort::writeBlobFunctional(Addr addr, uint8_t *p, int size)
|
||||||
return No_Fault;
|
return No_Fault;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
Fault
|
Fault
|
||||||
TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size)
|
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;
|
return No_Fault;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
Fault
|
Fault
|
||||||
TranslatingPort::writeStringFunctional(Addr addr, const char *str)
|
TranslatingPort::writeStringFunctional(Addr addr, const char *str)
|
||||||
|
|
|
@ -50,7 +50,7 @@ class TranslatingPort
|
||||||
public:
|
public:
|
||||||
Fault readBlobFunctional(Addr addr, uint8_t *p, int size);
|
Fault readBlobFunctional(Addr addr, uint8_t *p, int size);
|
||||||
Fault writeBlobFunctional(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 writeStringFunctional(Addr addr, const char *str);
|
||||||
Fault readStringFunctional(std::string &str, Addr addr);
|
Fault readStringFunctional(std::string &str, Addr addr);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue