proper naming for Breakpoints aspect

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@977 8c4709b5-6ec9-48aa-a5cd-a96041d1645a

core/SAL/bochs/BochsController.hpp

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

core/SAL/bochs/Breakpoints.ah

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

core/config/AspectConfig.hpp.in

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

core/config/CMakeLists.txt

@@ -2,7 +2,7 @@
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/variant_config.hpp.in
                ${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_MEMWRITE            "Event source: Memory writes" OFF)
 OPTION(CONFIG_EVENT_GUESTSYS            "Event source: Outbound guest-system communication" OFF)

core/experiments/FaultCoverageExperiment/experiment.hpp

@@ -12,7 +12,7 @@
 
 /*
 // 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)
   #error At least one of the following aspect-dependencies are not satisfied: \
          cpu loop, traps, save/restore. Enable aspects first (see AspectConfig.hpp)!