christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

A few CPUState-related methods should be const (getter)

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@2084 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2013-02-14 14:45:22 +00:00
parent accfba8237
commit 3cc40e62c7
10 changed files with 24 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/sal/gem5/Gem5ArmCPU.cc
View File

@ -2,7 +2,7 @@
namespace fail {
regdata_t Gem5ArmCPU::getRegisterContent(Register* reg)
regdata_t Gem5ArmCPU::getRegisterContent(Register* reg) const
{
switch (reg->getType()) {
case RT_GP:
@ -40,19 +40,4 @@ void Gem5ArmCPU::setRegisterContent(Register* reg, regdata_t value)
// TODO: assertion?
}
address_t Gem5ArmCPU::getInstructionPointer()
{
return getRegisterContent(getRegister(RI_IP));
}
address_t Gem5ArmCPU::getStackPointer()
{
return getRegisterContent(getRegister(RI_SP));
}
address_t Gem5ArmCPU::getLinkRegister()
{
return getRegisterContent(getRegister(RI_LR));
}
} // end-of-namespace: fail

12
src/core/sal/gem5/Gem5ArmCPU.hpp
View File

@ -29,7 +29,7 @@ public:
* @param reg the destination register whose content should be retrieved
* @return the content of register \c reg
*/
regdata_t getRegisterContent(Register* reg);
regdata_t getRegisterContent(Register* reg) const;
/**
* Sets the register content for the \a current gem5 CPU.
* @param reg the (initialized) register object whose content should be set
@ -41,16 +41,12 @@ public:
* for the current CPU \c this.
* @return the current instruction ptr address
*/
address_t getInstructionPointer();
address_t getStackPointer();
address_t getLinkRegister();
unsigned int getId() { return m_Id; }
address_t getInstructionPointer() const { return getRegisterContent(getRegister(RI_IP)); }
/**
* Retrieves the current stack pointer for the current CPU \c this.
* @return the current stack ptr address
*/
address_t getStackPointer() const { return getRegisterContent(getRegister(RI_SP)); }
/**
* Retrieves the link register (return address when a function returns) for
* the current CPU \c this. See
@ -58,10 +54,12 @@ public:
* for further information.
* @return the current link register address
*/
address_t getLinkRegister() const { return getRegisterContent(getRegister(RI_LR)); }
/**
* Returns the ID of the current CPU.
* @return the unique ID of \c this CPU object
*/
unsigned int getId() const { return m_Id; }
private:
unsigned int m_Id; //!< the unique ID of this CPU
System* m_System; //!< the gem5 system object