Architecture changes (only gem5 implementation right now):
- The register manager is gone. It's functionality is now encapsulated in the CPU classes. - For the client, there is the ConcreteCPU class that encapsulates the access to the CPU state (including registers) and architecture details. The correspondig objects for the CPUs inside the simulator can be accessed through the SimulatorController.getCPU() function. - Listener got a new ConcreteCPU* member to filter for which CPU the events should fire. The default NULL is used as wildcard for all aviable CPUs. The events respectively got a ConcreteCPU* member to indicate which CPU really fired the event. - For the server, there is CPUArchitecture to access the architecture details. git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1966 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
32
src/core/sal/arm/arch.cc
Normal file
32
src/core/sal/arm/arch.cc
Normal file
@ -0,0 +1,32 @@
|
||||
#include "arch.hpp"
|
||||
#include "../Register.hpp"
|
||||
|
||||
namespace fail {
|
||||
|
||||
ArmArchitecture::ArmArchitecture()
|
||||
{
|
||||
fillRegisterList();
|
||||
}
|
||||
|
||||
void ArmArchitecture::fillRegisterList()
|
||||
{
|
||||
// TODO: Add missing registers
|
||||
// 16x 32-Bit GP Registers
|
||||
for (int i=0; i<16; i++)
|
||||
{
|
||||
Register *reg = new Register(i, RT_GP, 32);
|
||||
addRegister(reg);
|
||||
}
|
||||
}
|
||||
|
||||
ArmArchitecture::~ArmArchitecture()
|
||||
{
|
||||
std::vector< Register* >::iterator it = m_Registers.begin();
|
||||
while(it != m_Registers.end())
|
||||
{
|
||||
delete *it;
|
||||
it = m_Registers.erase(it);
|
||||
}
|
||||
}
|
||||
|
||||
} // end-of-namespace: fail
|
||||
87
src/core/sal/arm/arch.hpp
Normal file
87
src/core/sal/arm/arch.hpp
Normal file
@ -0,0 +1,87 @@
|
||||
#ifndef __ARM_ARCH_HPP__
|
||||
#define __ARM_ARCH_HPP__
|
||||
|
||||
#include "../CPU.hpp"
|
||||
#include "../CPUState.hpp"
|
||||
|
||||
namespace fail {
|
||||
/**
|
||||
* \class ArmArchitecture
|
||||
* This class adds ARM specific functionality to the base architecture. This can be used for every
|
||||
* simulator backend that runs on ARM.
|
||||
*/
|
||||
class ArmArchitecture : public CPUArchitecture
|
||||
{
|
||||
public:
|
||||
ArmArchitecture();
|
||||
~ArmArchitecture();
|
||||
|
||||
private:
|
||||
void fillRegisterList();
|
||||
};
|
||||
|
||||
class ArmCPUState : public CPUState
|
||||
{
|
||||
public:
|
||||
virtual regdata_t getRegisterContent(Register* reg) = 0;
|
||||
|
||||
virtual address_t getInstructionPointer() = 0;
|
||||
virtual address_t getStackPointer() = 0;
|
||||
/**
|
||||
* Returns the current Link Register.
|
||||
* @return the current lr
|
||||
*/
|
||||
virtual address_t getLinkRegister() = 0;
|
||||
};
|
||||
|
||||
enum GPRegIndex
|
||||
{
|
||||
RI_R0,
|
||||
RI_R1,
|
||||
RI_R2,
|
||||
RI_R3,
|
||||
RI_R4,
|
||||
RI_R5,
|
||||
RI_R6,
|
||||
RI_R7,
|
||||
RI_R8,
|
||||
RI_R9,
|
||||
RI_R10,
|
||||
RI_R11,
|
||||
RI_R12,
|
||||
RI_R13,
|
||||
RI_SP = RI_R13,
|
||||
RI_R14,
|
||||
RI_LR = RI_R14,
|
||||
RI_R15,
|
||||
RI_IP = RI_R15,
|
||||
|
||||
RI_R13_SVC,
|
||||
RI_R14_SVC,
|
||||
|
||||
RI_R13_MON,
|
||||
RI_R14_MON,
|
||||
|
||||
RI_R13_ABT,
|
||||
RI_R14_ABT,
|
||||
|
||||
RI_R13_UND,
|
||||
RI_R14_UND,
|
||||
|
||||
RI_R13_IRQ,
|
||||
RI_R14_IRQ,
|
||||
|
||||
RI_R8_FIQ,
|
||||
RI_R9_FIQ,
|
||||
RI_R10_FIQ,
|
||||
RI_R11_FIQ,
|
||||
RI_R12_FIQ,
|
||||
RI_R13_FIQ,
|
||||
RI_R14_FIQ
|
||||
};
|
||||
|
||||
// TODO: Enum for misc registers
|
||||
|
||||
} // end-of-namespace: fail
|
||||
|
||||
#endif // __ARM_ARCH_HPP__
|
||||
Reference in New Issue
Block a user