Adding some definitons for read/write blob/string. I need to locate te code stever wrote to break up address ranges into blk/page size chunks.
cpu/simple/cpu.cc: cpu/simple/cpu.hh: Add read/write blob definitions, still need to break it up into blk size chunks (where was the code stever wrote for that?) mem/physical.hh: Remove un-needed function (I think) mem/port.hh: Default these virtual functions to panic unimplented mem/translating_port.cc: Again handling read/write string properly. Need the stever code to break things into page size chunks yet mem/translating_port.hh: Having trouble with the const declerator. I will need to read how it works, for now it compiles if I remove it. --HG-- extra : convert_revision : f174e06700daa9967958d18e01798270c90d6dac
This commit is contained in:
parent
75152fcaf7
commit
562efe214c
6 changed files with 51 additions and 33 deletions
|
@ -127,8 +127,23 @@ SimpleCPU::CpuPort::recvRetry()
|
||||||
return cpu->processRetry();
|
return cpu->processRetry();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
SimpleCPU::SimpleCPU(Params *p)
|
SimpleCPU::SimpleCPU(Params *p)
|
||||||
: BaseCPU(p), icachePort(this),
|
: BaseCPU(p), icachePort(this),
|
||||||
|
|
|
@ -88,6 +88,10 @@ class SimpleCPU : public BaseCPU
|
||||||
virtual void recvStatusChange(Status status);
|
virtual void recvStatusChange(Status status);
|
||||||
|
|
||||||
virtual Packet *recvRetry();
|
virtual Packet *recvRetry();
|
||||||
|
|
||||||
|
virtual void readBlobFunctional(Addr addr, uint8_t *p, int size);
|
||||||
|
|
||||||
|
virtual void writeBlobFunctional(Addr addr, uint8_t *p, int size);
|
||||||
};
|
};
|
||||||
|
|
||||||
CpuPort icachePort;
|
CpuPort icachePort;
|
||||||
|
|
|
@ -78,14 +78,14 @@ class PhysicalMemory : public Memory
|
||||||
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
||||||
};
|
};
|
||||||
|
|
||||||
uint64_t
|
/*uint64_t
|
||||||
PhysicalMemory::phys_read_qword(Addr addr) const
|
PhysicalMemory::phys_read_qword(Addr addr) const
|
||||||
{
|
{
|
||||||
if (addr + sizeof(uint64_t) > pmem_size)
|
if (addr + sizeof(uint64_t) > pmem_size)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return *(uint64_t *)(pmem_addr + addr);
|
return *(uint64_t *)(pmem_addr + addr);
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
#endif //__PHYSICAL_MEMORY_HH__
|
#endif //__PHYSICAL_MEMORY_HH__
|
||||||
|
|
19
mem/port.hh
19
mem/port.hh
|
@ -186,14 +186,16 @@ class Port
|
||||||
appropriate chunks. The default implementation can use
|
appropriate chunks. The default implementation can use
|
||||||
getBlockSize() to determine the block size and go from there.
|
getBlockSize() to determine the block size and go from there.
|
||||||
*/
|
*/
|
||||||
virtual void readBlobFunctional(Addr addr, uint8_t *p, int size);
|
virtual void readBlobFunctional(Addr addr, uint8_t *p, int size)
|
||||||
|
{ panic("Unimplemented"); }
|
||||||
|
|
||||||
/** This function is a wrapper around sendFunctional()
|
/** This function is a wrapper around sendFunctional()
|
||||||
that breaks a larger, arbitrarily aligned access into
|
that breaks a larger, arbitrarily aligned access into
|
||||||
appropriate chunks. The default implementation can use
|
appropriate chunks. The default implementation can use
|
||||||
getBlockSize() to determine the block size and go from there.
|
getBlockSize() to determine the block size and go from there.
|
||||||
*/
|
*/
|
||||||
virtual void writeBlobFunctional(Addr addr, const uint8_t *p, int size);
|
virtual void writeBlobFunctional(Addr addr, uint8_t *p, int size)
|
||||||
|
{ panic("Unimplemented"); }
|
||||||
|
|
||||||
/** Fill size bytes starting at addr with byte value val. This
|
/** Fill size bytes starting at addr with byte value val. This
|
||||||
should not need to be virtual, since it can be implemented in
|
should not need to be virtual, since it can be implemented in
|
||||||
|
@ -203,17 +205,8 @@ class Port
|
||||||
prot_memset on the old functional memory that's never used),
|
prot_memset on the old functional memory that's never used),
|
||||||
but Nate claims it is.
|
but Nate claims it is.
|
||||||
*/
|
*/
|
||||||
void memsetBlobFunctional(Addr addr, uint8_t val, int size);
|
void memsetBlobFunctional(Addr addr, uint8_t val, int size)
|
||||||
|
{ panic("Unimplemented"); }
|
||||||
// I believe these two string functions can be defined once and
|
|
||||||
// for all at the top level by implementing them in terms of
|
|
||||||
// readBlob and writeBlob.
|
|
||||||
|
|
||||||
/** Write null-terminated string 'str' into memory at 'addr'. */
|
|
||||||
void writeStringFunctional(Addr addr, const char *str);
|
|
||||||
|
|
||||||
/** Read null-terminated string from 'addr' into 'str'. */
|
|
||||||
void readStringFunctional(std::string &str, Addr addr);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif //__MEM_PORT_HH__
|
#endif //__MEM_PORT_HH__
|
||||||
|
|
|
@ -55,7 +55,7 @@ TranslatingPort::readBlobFunctional(Addr addr, uint8_t *p, int size)
|
||||||
}
|
}
|
||||||
|
|
||||||
Fault
|
Fault
|
||||||
TranslatingPort::writeBlobFunctional(Addr addr, const uint8_t *p, int size)
|
TranslatingPort::writeBlobFunctional(Addr addr, uint8_t *p, int size)
|
||||||
{
|
{
|
||||||
Addr paddr;
|
Addr paddr;
|
||||||
|
|
||||||
|
@ -75,6 +75,7 @@ TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size)
|
||||||
Addr paddr;
|
Addr paddr;
|
||||||
|
|
||||||
//@todo Break up things larger than a page size
|
//@todo Break up things larger than a page size
|
||||||
|
//Use the Stever breakup code
|
||||||
pTable->page_check(addr, size);
|
pTable->page_check(addr, size);
|
||||||
|
|
||||||
if (!pTable->translate(addr,paddr))
|
if (!pTable->translate(addr,paddr))
|
||||||
|
@ -87,33 +88,38 @@ TranslatingPort::memsetBlobFunctional(Addr addr, uint8_t val, int size)
|
||||||
Fault
|
Fault
|
||||||
TranslatingPort::writeStringFunctional(Addr addr, const char *str)
|
TranslatingPort::writeStringFunctional(Addr addr, const char *str)
|
||||||
{
|
{
|
||||||
//@todo Break up things larger than a page size
|
Addr paddr,vaddr;
|
||||||
//pTable->page_check(addr, size);
|
uint8_t c;
|
||||||
//Need to check string length???
|
|
||||||
|
|
||||||
Addr paddr;
|
vaddr = addr;
|
||||||
|
|
||||||
if (!pTable->translate(addr,paddr))
|
do {
|
||||||
return Machine_Check_Fault;
|
c = *str++;
|
||||||
|
if (!pTable->translate(vaddr++,paddr))
|
||||||
|
return Machine_Check_Fault;
|
||||||
|
|
||||||
|
port->writeBlobFunctional(paddr, &c, 1);
|
||||||
|
} while (c);
|
||||||
|
|
||||||
port->writeStringFunctional(paddr, str);
|
|
||||||
return No_Fault;
|
return No_Fault;
|
||||||
}
|
}
|
||||||
|
|
||||||
Fault
|
Fault
|
||||||
TranslatingPort::readStringFunctional(std::string &str, Addr addr)
|
TranslatingPort::readStringFunctional(std::string &str, Addr addr)
|
||||||
{
|
{
|
||||||
//@todo Break up things larger than a page size
|
Addr paddr,vaddr;
|
||||||
//pTable->page_check(addr, size);
|
uint8_t c;
|
||||||
//Need to check string length???
|
|
||||||
|
|
||||||
Addr paddr;
|
vaddr = addr;
|
||||||
|
|
||||||
if (!pTable->translate(addr,paddr))
|
do {
|
||||||
return Machine_Check_Fault;
|
if (!pTable->translate(vaddr++,paddr))
|
||||||
|
return Machine_Check_Fault;
|
||||||
|
|
||||||
|
port->readBlobFunctional(paddr, &c, 1);
|
||||||
|
str += c;
|
||||||
|
} while (c);
|
||||||
|
|
||||||
//@todo Break this up into readBlobs
|
|
||||||
port->readStringFunctional(str, paddr);
|
|
||||||
return No_Fault;
|
return No_Fault;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,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, const 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