From f9d8469114e4687324f1e13d3e5640a3d747204b Mon Sep 17 00:00:00 2001
From: hsc <hsc@8c4709b5-6ec9-48aa-a5cd-a96041d1645a>
Date: Mon, 12 Mar 2012 08:51:50 +0000
Subject: [PATCH] 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                   |  5 +++--
 core/SAL/bochs/{CPULoop.ah => Breakpoints.ah}        | 12 ++++++------
 core/config/AspectConfig.hpp.in                      |  2 +-
 core/config/CMakeLists.txt                           |  2 +-
 .../FaultCoverageExperiment/experiment.hpp           |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)
 rename core/SAL/bochs/{CPULoop.ah => Breakpoints.ah} (83%)

diff --git a/core/SAL/bochs/BochsController.hpp b/core/SAL/bochs/BochsController.hpp
index ca131022..ecb9381a 100644
--- a/core/SAL/bochs/BochsController.hpp
+++ b/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);
diff --git a/core/SAL/bochs/CPULoop.ah b/core/SAL/bochs/Breakpoints.ah
similarity index 83%
rename from core/SAL/bochs/CPULoop.ah
rename to core/SAL/bochs/Breakpoints.ah
index da4ce209..ef23510d 100644
--- a/core/SAL/bochs/CPULoop.ah
+++ b/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
diff --git a/core/config/AspectConfig.hpp.in b/core/config/AspectConfig.hpp.in
index 6df9d0a8..e0dc02cb 100644
--- a/core/config/AspectConfig.hpp.in
+++ b/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
diff --git a/core/config/CMakeLists.txt b/core/config/CMakeLists.txt
index 49959b15..8c4aebca 100644
--- a/core/config/CMakeLists.txt
+++ b/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)
diff --git a/core/experiments/FaultCoverageExperiment/experiment.hpp b/core/experiments/FaultCoverageExperiment/experiment.hpp
index 38d4dac9..1a8af4e3 100644
--- a/core/experiments/FaultCoverageExperiment/experiment.hpp
+++ b/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)!