christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

coding-style improved.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1364 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-06-20 08:42:58 +00:00
parent 583f60c430
commit 127a25707f
2 changed files with 718 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/core/sal/Event.hpp
View File

@ -31,8 +31,7 @@ const unsigned ANY_INTERRUPT = static_cast<unsigned>(-1);
* \class BaseEvent * \class BaseEvent
* This is the base class for all event types. * This is the base class for all event types.
*/ */
class BaseEvent class BaseEvent {
{
private: private:
//! current class-scoped id counter to provide \a unique id's //! current class-scoped id counter to provide \a unique id's
static EventId m_Counter; static EventId m_Counter;
@ -102,8 +101,7 @@ class BaseEvent
* \class BEvent * \class BEvent
* A Breakpoint event to observe instruction changes within a given address space. * A Breakpoint event to observe instruction changes within a given address space.
*/ */
class BPEvent : virtual public BaseEvent class BPEvent : virtual public BaseEvent {
{
private: private:
address_t m_CR3; address_t m_CR3;
address_t m_TriggerInstrPtr; address_t m_TriggerInstrPtr;
@ -155,8 +153,7 @@ class BPEvent : virtual public BaseEvent
* \class BPSingleEvent * \class BPSingleEvent
* A Breakpoint event to observe specific instruction pointers. * A Breakpoint event to observe specific instruction pointers.
*/ */
class BPSingleEvent : virtual public BPEvent class BPSingleEvent : virtual public BPEvent {
{
private: private:
address_t m_WatchInstrPtr; address_t m_WatchInstrPtr;
public: public:
@ -194,8 +191,7 @@ class BPSingleEvent : virtual public BPEvent
* \class BPRangeEvent * \class BPRangeEvent
* A event type to observe ranges of instruction pointers. * A event type to observe ranges of instruction pointers.
*/ */
class BPRangeEvent : virtual public BPEvent class BPRangeEvent : virtual public BPEvent {
{
private: private:
address_t m_WatchStartAddr; address_t m_WatchStartAddr;
address_t m_WatchEndAddr; address_t m_WatchEndAddr;
@ -232,11 +228,9 @@ class BPRangeEvent : virtual public BPEvent
* FIXME? currently >8-bit accesses only match if their lowest address is being watched * FIXME? currently >8-bit accesses only match if their lowest address is being watched
* (e.g., a 32-bit write to 0x4 also accesses 0x7, but this cannot be matched) * (e.g., a 32-bit write to 0x4 also accesses 0x7, but this cannot be matched)
*/ */
class MemAccessEvent : virtual public BaseEvent class MemAccessEvent : virtual public BaseEvent {
{
public: public:
enum accessType_t enum accessType_t {
{
MEM_UNKNOWN = 0x0, MEM_UNKNOWN = 0x0,
MEM_READ = 0x1, MEM_READ = 0x1,
MEM_WRITE = 0x2, MEM_WRITE = 0x2,
@ -333,8 +327,7 @@ class MemAccessEvent : virtual public BaseEvent
* \class MemReadEvent * \class MemReadEvent
* Observes memory read accesses. * Observes memory read accesses.
*/ */
class MemReadEvent : virtual public MemAccessEvent class MemReadEvent : virtual public MemAccessEvent {
{
public: public:
MemReadEvent() MemReadEvent()
: MemAccessEvent(MEM_READ) { } : MemAccessEvent(MEM_READ) { }
@ -346,8 +339,7 @@ class MemReadEvent : virtual public MemAccessEvent
* \class MemWriteEvent * \class MemWriteEvent
* Observes memory write accesses. * Observes memory write accesses.
*/ */
class MemWriteEvent : virtual public MemAccessEvent class MemWriteEvent : virtual public MemAccessEvent {
{
public: public:
MemWriteEvent() MemWriteEvent()
: MemAccessEvent(MEM_READ) { } : MemAccessEvent(MEM_READ) { }
@ -359,8 +351,7 @@ class MemWriteEvent : virtual public MemAccessEvent
* \class TroubleEvent * \class TroubleEvent
* Observes interrupt/trap activties. * Observes interrupt/trap activties.
*/ */
class TroubleEvent : virtual public BaseEvent class TroubleEvent : virtual public BaseEvent {
{
private: private:
/** /**
* Specific guest system interrupt/trap number that actually * Specific guest system interrupt/trap number that actually
@ -418,8 +409,7 @@ class TroubleEvent : virtual public BaseEvent
* \class InterruptEvent * \class InterruptEvent
* Observes interrupts of the guest system. * Observes interrupts of the guest system.
*/ */
class InterruptEvent : virtual public TroubleEvent class InterruptEvent : virtual public TroubleEvent {
{
private: private:
bool m_IsNMI; //!< non maskable interrupt flag bool m_IsNMI; //!< non maskable interrupt flag
public: public:
@ -440,8 +430,7 @@ class InterruptEvent : virtual public TroubleEvent
* \class TrapEvent * \class TrapEvent
* Observes traps of the guest system. * Observes traps of the guest system.
*/ */
class TrapEvent : virtual public TroubleEvent class TrapEvent : virtual public TroubleEvent {
{
public: public:
TrapEvent() { } TrapEvent() { }
TrapEvent(unsigned trap) { addWatchNumber(trap); } TrapEvent(unsigned trap) { addWatchNumber(trap); }
@ -451,8 +440,7 @@ class TrapEvent : virtual public TroubleEvent
* \class GuestEvent * \class GuestEvent
* Used to receive data from the guest system. * Used to receive data from the guest system.
*/ */
class GuestEvent : virtual public BaseEvent class GuestEvent : virtual public BaseEvent {
{
private: private:
char m_Data; char m_Data;
unsigned m_Port; unsigned m_Port;
@ -480,8 +468,7 @@ class GuestEvent : virtual public BaseEvent
* \class IOPortEvent * \class IOPortEvent
* Observes I/O access on architectures with a separate I/O access mechanism (e.g. IA-32) * Observes I/O access on architectures with a separate I/O access mechanism (e.g. IA-32)
*/ */
class IOPortEvent : virtual public BaseEvent class IOPortEvent : virtual public BaseEvent {
{
private: private:
unsigned char m_Data; unsigned char m_Data;
unsigned m_Port; unsigned m_Port;
@ -534,8 +521,7 @@ class IOPortEvent : virtual public BaseEvent
* \class JumpEvent * \class JumpEvent
* JumpEvents are used to observe conditional jumps (if...else if...else). * JumpEvents are used to observe conditional jumps (if...else if...else).
*/ */
class JumpEvent : virtual public BaseEvent class JumpEvent : virtual public BaseEvent {
{
private: private:
unsigned m_Opcode; unsigned m_Opcode;
bool m_FlagTriggered; bool m_FlagTriggered;
@ -577,8 +563,7 @@ class JumpEvent : virtual public BaseEvent
* \class TimerEvent * \class TimerEvent
* This event type is used to create timeouts/timers within in an experiment. * This event type is used to create timeouts/timers within in an experiment.
*/ */
class TimerEvent : public BaseEvent class TimerEvent : public BaseEvent {
{
private: private:
unsigned m_Timeout; //!< timeout interval in milliseconds unsigned m_Timeout; //!< timeout interval in milliseconds
timer_id_t m_Id; //!< internal timer id (sim-specific) timer_id_t m_Id; //!< internal timer id (sim-specific)

3
src/core/sal/SimulatorController.hpp
View File

@ -31,8 +31,7 @@ class MemoryManager;
* activates the specific experiment There are further methods to read/write * activates the specific experiment There are further methods to read/write
* registers and memory, and control the SUT (save/restore/reset). * registers and memory, and control the SUT (save/restore/reset).
*/ */
class SimulatorController class SimulatorController {
{
protected: protected:
EventList m_EvList; //!< storage where events are being buffered EventList m_EvList; //!< storage where events are being buffered
CoroutineManager m_Flows; //!< managed experiment flows CoroutineManager m_Flows; //!< managed experiment flows