christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

build-system: separated fast-breakpoints, added fast-watchpoints.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1899 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-11-08 13:35:22 +00:00
parent 4a6b576b18
commit ddbab2e903
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/config/CMakeLists.txt
View File

@ -20,6 +20,7 @@ OPTION(CONFIG_FIRE_INTERRUPTS "Target backend: Fire interrupts" OFF)
OPTION(CONFIG_DISABLE_KEYB_INTERRUPTS "Target backend: Suppress keyboard interrupts" OFF) OPTION(CONFIG_DISABLE_KEYB_INTERRUPTS "Target backend: Suppress keyboard interrupts" OFF)
OPTION(SERVER_PERFORMANCE_MEASURE "Performance measurement in job-server" OFF) OPTION(SERVER_PERFORMANCE_MEASURE "Performance measurement in job-server" OFF)
OPTION(CONFIG_FAST_BREAKPOINTS "Enable fast breakpoints (requires breakpoint events to be enabled)" OFF) OPTION(CONFIG_FAST_BREAKPOINTS "Enable fast breakpoints (requires breakpoint events to be enabled)" OFF)
OPTION(CONFIG_FAST_WATCHPOINTS "Enable fast watchpoints (requires memory access events to be enabled)" OFF)
SET(SERVER_COMM_HOSTNAME "localhost" CACHE STRING "Job-server hostname or IP") SET(SERVER_COMM_HOSTNAME "localhost" CACHE STRING "Job-server hostname or IP")
SET(SERVER_COMM_TCP_PORT "1111" CACHE STRING "Job-server TCP port") SET(SERVER_COMM_TCP_PORT "1111" CACHE STRING "Job-server TCP port")
SET(SERVER_PERF_LOG_PATH "perf.log" CACHE STRING "A file name for storing the server's performance log (CSV)") SET(SERVER_PERF_LOG_PATH "perf.log" CACHE STRING "A file name for storing the server's performance log (CSV)")

1
src/core/config/FailConfig.hpp.in
View File

@ -17,6 +17,7 @@
// Performance options // Performance options
#cmakedefine CONFIG_FAST_BREAKPOINTS #cmakedefine CONFIG_FAST_BREAKPOINTS
#cmakedefine CONFIG_FAST_WATCHPOINTS
// Save/restore functionality // Save/restore functionality
#cmakedefine CONFIG_SR_RESTORE #cmakedefine CONFIG_SR_RESTORE

21
src/core/sal/CMakeLists.txt
View File

@ -5,7 +5,6 @@ if(BUILD_BOCHS)
SALConfig.cc SALConfig.cc
Register.cc Register.cc
SimulatorController.cc SimulatorController.cc
perf/BreakpointBuffer.cc
bochs/BochsController.cc bochs/BochsController.cc
bochs/BochsListener.cc bochs/BochsListener.cc
) )
@ -16,7 +15,6 @@ elseif(BUILD_GEM5)
SALConfig.cc SALConfig.cc
Register.cc Register.cc
SimulatorController.cc SimulatorController.cc
perf/BreakpointBuffer.cc
gem5/Gem5Controller.cc gem5/Gem5Controller.cc
) )
elseif(BUILD_OVP) elseif(BUILD_OVP)
@ -26,7 +24,6 @@ elseif(BUILD_OVP)
SALConfig.cc SALConfig.cc
Register.cc Register.cc
SimulatorController.cc SimulatorController.cc
perf/BreakpointBuffer.cc
${VARIANT}/OVPController.cc ${VARIANT}/OVPController.cc
) )
elseif(BUILD_QEMU) elseif(BUILD_QEMU)
@ -35,7 +32,6 @@ elseif(BUILD_QEMU)
ListenerManager.cc ListenerManager.cc
SALConfig.cc SALConfig.cc
Register.cc Register.cc
perf/BreakpointBuffer.cc
SimulatorController.cc SimulatorController.cc
qemu/QEMUController.cc qemu/QEMUController.cc
qemu/wrappers.cc qemu/wrappers.cc
@ -46,13 +42,26 @@ elseif(BUILD_T32)
ListenerManager.cc ListenerManager.cc
SALConfig.cc SALConfig.cc
Register.cc Register.cc
perf/BreakpointBuffer.cc
SimulatorController.cc SimulatorController.cc
t32/T32Controller.cc t32/T32Controller.cc
t32/wrappers.cc t32/wrappers.cc
) )
endif(BUILD_BOCHS) endif(BUILD_BOCHS)
add_library(fail-sal ${SRCS}) # Don't include these sources if perf-stuff is disabled
# (reduces compiler overhead):
if(CONFIG_FAST_WATCHPOINTS)
set(SRCS ${SRCS}
perf/WatchpointBuffer.cc
)
endif(CONFIG_FAST_WATCHPOINTS)
if(CONFIG_FAST_BREAKPOINTS)
set(SRCS ${SRCS}
perf/BreakpointBuffer.cc
)
endif(CONFIG_FAST_BREAKPOINTS)
add_library(fail-sal ${SRCS})
add_dependencies(fail-sal fail-efw) add_dependencies(fail-sal fail-efw)