From ac3702b5e87677946b639b7f1d8c282204c0e45c Mon Sep 17 00:00:00 2001 From: hellwig Date: Thu, 31 Jan 2013 14:32:03 +0000 Subject: [PATCH] Rename: CONFIG_EVENT_RANGEBREAKPOINTS -> CONFIG_EVENT_BREAKPOINTS_RANGE git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@2037 8c4709b5-6ec9-48aa-a5cd-a96041d1645a --- simulators/gem5/src/cpu/simple/base.cc | 2 +- src/core/config/CMakeLists.txt | 2 +- src/core/config/FailConfig.hpp.in | 2 +- src/core/sal/gem5/Gem5Listener.ah | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/simulators/gem5/src/cpu/simple/base.cc b/simulators/gem5/src/cpu/simple/base.cc index aff10ed0..1eb98e0d 100644 --- a/simulators/gem5/src/cpu/simple/base.cc +++ b/simulators/gem5/src/cpu/simple/base.cc @@ -378,7 +378,7 @@ BaseSimpleCPU::preExecute() TheISA::PCState pcState = thread->pcState(); // FAIL* - #if defined(CONFIG_EVENT_BREAKPOINTS) && defined(CONFIG_EVENT_RANGEBREAKPOINTS) + #if defined(CONFIG_EVENT_BREAKPOINTS) && defined(CONFIG_EVENT_BREAKPOINTS_RANGE) fail::ConcreteCPU* cpu = &fail::simulator.getCPU(cpuId()); fail::simulator.onBreakpoint(cpu, instAddr(), -1); #endif diff --git a/src/core/config/CMakeLists.txt b/src/core/config/CMakeLists.txt index d91da3e9..929ca21a 100644 --- a/src/core/config/CMakeLists.txt +++ b/src/core/config/CMakeLists.txt @@ -3,7 +3,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/VariantConfig.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/VariantConfig.hpp) OPTION(CONFIG_EVENT_BREAKPOINTS "Event source: Breakpoints" OFF) -OPTION(CONFIG_EVENT_RANGEBREAKPOINTS "Event source: Range Breakpoints" OFF) +OPTION(CONFIG_EVENT_BREAKPOINTS_RANGE "Event source: Range 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/src/core/config/FailConfig.hpp.in b/src/core/config/FailConfig.hpp.in index 7c7db78d..8c5a2f31 100644 --- a/src/core/config/FailConfig.hpp.in +++ b/src/core/config/FailConfig.hpp.in @@ -7,7 +7,7 @@ // Event sources #cmakedefine CONFIG_EVENT_BREAKPOINTS -#cmakedefine CONFIG_EVENT_RANGEBREAKPOINTS +#cmakedefine CONFIG_EVENT_BREAKPOINTS_RANGE #cmakedefine CONFIG_EVENT_MEMREAD #cmakedefine CONFIG_EVENT_MEMWRITE #cmakedefine CONFIG_EVENT_GUESTSYS diff --git a/src/core/sal/gem5/Gem5Listener.ah b/src/core/sal/gem5/Gem5Listener.ah index 0f909d73..193c3bf7 100644 --- a/src/core/sal/gem5/Gem5Listener.ah +++ b/src/core/sal/gem5/Gem5Listener.ah @@ -4,7 +4,7 @@ #include "config/FailConfig.hpp" #include "config/VariantConfig.hpp" -#if defined(BUILD_GEM5) && defined(CONFIG_EVENT_BREAKPOINTS) && !defined(CONFIG_EVENT_RANGEBREAKPOINTS) +#if defined(BUILD_GEM5) && defined(CONFIG_EVENT_BREAKPOINTS) && !defined(CONFIG_EVENT_BREAKPOINTS_RANGE) #include "../SALInst.hpp" @@ -42,6 +42,6 @@ aspect Gem5Listener { }; }; -#endif // defined(BUILD_GEM5) && defined(CONFIG_EVENT_BREAKPOINTS) && !defined(CONFIG_EVENT_RANGEBREAKPOINTS) +#endif // defined(BUILD_GEM5) && defined(CONFIG_EVENT_BREAKPOINTS) && !defined(CONFIG_EVENT_BREAKPOINTS_RANGE) #endif // __GEM5_LISTENER_AH__