christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

proper naming for Breakpoints aspect

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@977 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-03-12 08:51:50 +00:00
parent 35decda01b
commit f9d8469114
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/SAL/bochs/BochsController.hpp
View File

@ -51,8 +51,9 @@ class BochsController : public SimulatorController
* Standard Event Handler API (SEH-API): * Standard Event Handler API (SEH-API):
* ********************************************************************/ * ********************************************************************/
/** /**
* Instruction pointer modification handler. This method is called (from * Instruction pointer modification handler. This method is called
* the CPULoop aspect) every time when the Bochs-internal IP changes. * (from the Breakpoints aspect) every time when the Bochs-internal IP
* changes.
* @param instrPtr * @param instrPtr
*/ */
void onInstrPtrChanged(address_t instrPtr); void onInstrPtrChanged(address_t instrPtr);

12
core/SAL/bochs/CPULoop.ah → core/SAL/bochs/Breakpoints.ah
View File

@ -1,15 +1,15 @@
#ifndef __CPU_LOOP_AH__ #ifndef __BREAKPOINTS_AH__
#define __CPU_LOOP_AH__ #define __BREAKPOINTS_AH__
#include "config/AspectConfig.hpp" #include "config/AspectConfig.hpp"
#ifdef CONFIG_EVENT_CPULOOP #ifdef CONFIG_EVENT_BREAKPOINTS
#include "../../../bochs/bochs.h" // for "BX_CPU_C" #include "../../../bochs/bochs.h" // for "BX_CPU_C"
#include "../../../bochs/cpu/cpu.h" // for "bxInstruction_c" #include "../../../bochs/cpu/cpu.h" // for "bxInstruction_c"
#include "../SALInst.hpp" #include "../SALInst.hpp"
aspect CPULoop aspect Breakpoints
{ {
pointcut cpuLoop() = "void defineCPULoopJoinPoint(...)"; pointcut cpuLoop() = "void defineCPULoopJoinPoint(...)";
@ -30,6 +30,6 @@ aspect CPULoop
} }
}; };
#endif // CONFIG_EVENT_CPULOOP #endif
#endif /* __CPU_LOOP_AH__ */ #endif

2
core/config/AspectConfig.hpp.in
View File

@ -6,7 +6,7 @@
// features. // features.
// Event sources // Event sources
#cmakedefine CONFIG_EVENT_CPULOOP #cmakedefine CONFIG_EVENT_BREAKPOINTS
#cmakedefine CONFIG_EVENT_MEMREAD #cmakedefine CONFIG_EVENT_MEMREAD
#cmakedefine CONFIG_EVENT_MEMWRITE #cmakedefine CONFIG_EVENT_MEMWRITE
#cmakedefine CONFIG_EVENT_GUESTSYS #cmakedefine CONFIG_EVENT_GUESTSYS

2
core/config/CMakeLists.txt
View File

@ -2,7 +2,7 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/variant_config.hpp.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/variant_config.hpp.in
${CMAKE_CURRENT_BINARY_DIR}/variant_config.hpp) ${CMAKE_CURRENT_BINARY_DIR}/variant_config.hpp)
OPTION(CONFIG_EVENT_CPULOOP "Event source: Breakpoints" OFF) OPTION(CONFIG_EVENT_BREAKPOINTS "Event source: Breakpoints" OFF)
OPTION(CONFIG_EVENT_MEMREAD "Event source: Memory reads" OFF) OPTION(CONFIG_EVENT_MEMREAD "Event source: Memory reads" OFF)
OPTION(CONFIG_EVENT_MEMWRITE "Event source: Memory writes" OFF) OPTION(CONFIG_EVENT_MEMWRITE "Event source: Memory writes" OFF)
OPTION(CONFIG_EVENT_GUESTSYS "Event source: Outbound guest-system communication" OFF) OPTION(CONFIG_EVENT_GUESTSYS "Event source: Outbound guest-system communication" OFF)

2
core/experiments/FaultCoverageExperiment/experiment.hpp
View File

@ -12,7 +12,7 @@
/* /*
// Check if aspect dependencies are satisfied: // Check if aspect dependencies are satisfied:
#if !defined(CONFIG_EVENT_CPULOOP) || !defined(CONFIG_EVENT_TRAP) || \ #if !defined(CONFIG_EVENT_BREAKPOINTS) || !defined(CONFIG_EVENT_TRAP) || \
!defined(CONFIG_SR_RESTORE) || !defined(CONFIG_SR_SAVE) !defined(CONFIG_SR_RESTORE) || !defined(CONFIG_SR_SAVE)
#error At least one of the following aspect-dependencies are not satisfied: \ #error At least one of the following aspect-dependencies are not satisfied: \
cpu loop, traps, save/restore. Enable aspects first (see AspectConfig.hpp)! cpu loop, traps, save/restore. Enable aspects first (see AspectConfig.hpp)!