christoph/fail
1
Fork 0
Code Releases Activity

treat AspectConfig like other configuration headers

Browse Source 
This is temporary; we need a proper configuration tool for this.
 - AspectConfig.hpp moves to config/AspectConfig.hpp.in
 - generate configuration in build tree

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@958 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-03-08 22:54:05 +00:00
parent e5fea2dbcd
commit 97534f7a19
22 changed files with 98 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
#include <iostream>
#include <fstream>
#include "AspectConfig.hpp"
#include "config/AspectConfig.hpp"
#include "controller/ExperimentFlow.hpp"
#define INST_ADDR_FUNC_START 0x4ae6
@ -12,8 +12,8 @@
/*
// Check if aspect dependencies are satisfied:
#if CONFIG_EVENT_CPULOOP != 1 || CONFIG_EVENT_TRAP != 1 || \
CONFIG_SR_RESTORE != 1 || CONFIG_SR_SAVE != 1
#if !defined(CONFIG_EVENT_CPULOOP) || !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)!
#endif

4
core/experiments/attic/JumpAndRunExperiment/JumpAndRunExperiment.hpp
View File

@ -9,10 +9,10 @@
#include "../controller/ExperimentFlow.hpp"
#include "../SAL/SALInst.hpp"
#include "../SAL/bochs/BochsRegister.hpp"
#include "../AspectConfig.hpp"
#include "config/AspectConfig.hpp"
// Check if aspect dependencies are satisfied:
#if CONFIG_EVENT_CPULOOP != 1 || CONFIG_EVENT_JUMP != 1
#if !defined(CONFIG_EVENT_CPULOOP) || !defined(CONFIG_EVENT_JUMP)
#error Breakpoint- and jump-events needed! Enable aspects first (see AspectConfig.hpp)!
#endif

4
core/experiments/attic/MemWriteExperiment.hpp
View File

@ -8,10 +8,10 @@
#include "../controller/ExperimentFlow.hpp"
#include "../SAL/SALInst.hpp"
#include "../AspectConfig.hpp"
#include "config/AspectConfig.hpp"
// Check aspect dependencies:
#if CONFIG_EVENT_CPULOOP != 1 || CONFIG_EVENT_MEMACCESS != 1 || CONFIG_SR_SAVE != 1 || CONFIG_FI_MEM_ACCESS_BITFLIP != 1
#if !defined(CONFIG_EVENT_CPULOOP) || !defined(CONFIG_EVENT_MEMACCESS) || !defined(CONFIG_SR_SAVE) || !defined(CONFIG_FI_MEM_ACCESS_BITFLIP)
#error Event dependecies not satisfied! Enabled needed aspects in AspectConfig.hpp!
#endif

4
core/experiments/attic/SingleSteppingExperiment.hpp
View File

@ -8,11 +8,11 @@
#include "../controller/ExperimentFlow.hpp"
#include "../SAL/SALInst.hpp"
#include "../AspectConfig.hpp"
#include "config/AspectConfig.hpp"
#include "../SAL/bochs/BochsRegister.hpp"
// Check if aspect dependency is satisfied:
#if CONFIG_EVENT_CPULOOP != 1
#ifndef CONFIG_EVENT_CPULOOP
#error Breakpoint-events needed! Enable aspect first (see AspectConfig.hpp)!
#endif