treat AspectConfig like other configuration headers

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

core/SAL/bochs/CPULoop.ah

@@ -1,9 +1,9 @@
 #ifndef __CPU_LOOP_AH__
   #define __CPU_LOOP_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_EVENT_CPULOOP == 1
+#ifdef CONFIG_EVENT_CPULOOP
 
 #include "../../../bochs/bochs.h" // for "BX_CPU_C"
 #include "../../../bochs/cpu/cpu.h" // for "bxInstruction_c"

core/SAL/bochs/GuestSysCom.ah

@@ -1,9 +1,9 @@
 #ifndef __GUESTSYS_COM_AH__
   #define __GUESTSYS_COM_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_EVENT_GUESTSYS == 1
+#ifdef CONFIG_EVENT_GUESTSYS
 
 #include "../../../bochs/bochs.h"
 #include "../../../bochs/cpu/cpu.h"

core/SAL/bochs/Interrupt.ah

@@ -1,9 +1,9 @@
 #ifndef __INTERRUPT_AH__
   #define __INTERRUPT_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_EVENT_INTERRUPT == 1
+#ifdef CONFIG_EVENT_INTERRUPT
 
 #include "../../../bochs/bochs.h"
 #include "../../../bochs/cpu/cpu.h"

core/SAL/bochs/Interrupt_suppression.ah

@@ -1,9 +1,9 @@
 #ifndef __INTERRUPT_SUPPRESSION_AH__
   #define __INTERRUPT_SUPPRESSION_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_SUPPRESS_INTERRUPTS == 1
+#ifdef CONFIG_SUPPRESS_INTERRUPTS
 
 #include "../../../bochs/bochs.h"
 #include "../../../bochs/cpu/cpu.h"

core/SAL/bochs/Jump.ah

@@ -1,9 +1,9 @@
 #ifndef __JUMP_AH__
   #define __JUMP_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_EVENT_JUMP == 1
+#ifdef CONFIG_EVENT_JUMP
 
 #include <iostream>
 #include <cstdlib>

core/SAL/bochs/JumpToPreviousCtx.ah

@@ -1,10 +1,10 @@
 #ifndef __JUMP_TO_PREVIOUS_CTX_AH__
   #define __JUMP_TO_PREVIOUS_CTX_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
 #if 0
-// #if CONFIG_SR_RESTORE == 1 || CONFIG_SR_REBOOT == 1
+// #if defined(CONFIG_SR_RESTORE) || defined(CONFIG_SR_REBOOT)
 
 #include "bochs.h"
 #include "../SALInst.hpp"
@@ -28,6 +28,6 @@ aspect jumpToPreviousCtx
 	}
 };
 
-#endif // CONFIG_SR_RESTORE == 1 || CONFIG_SR_REBOOT
+#endif // CONFIG_SR_RESTORE || CONFIG_SR_REBOOT
 
 #endif // __JUMP_TO_PREVIOUS_CTX_AH__

core/SAL/bochs/MemAccessBitFlip.ah

@@ -1,9 +1,9 @@
 #ifndef __MEM_ACCESS_BIT_FLIP_AH__
   #define __MEM_ACCESS_BIT_FLIP_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_FI_MEM_ACCESS_BITFLIP == 1
+#ifdef CONFIG_FI_MEM_ACCESS_BITFLIP
 
 #include <iostream>
 #include <cstdlib>

core/SAL/bochs/MemEvents.ah

@@ -2,9 +2,9 @@
   #define __MEM_EVENTS_AH__
 
 #include <iostream>
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_EVENT_MEMREAD == 1 || CONFIG_EVENT_MEMWRITE == 1
+#if defined(CONFIG_EVENT_MEMREAD) || defined(CONFIG_EVENT_MEMWRITE)
 
 #include "../../../bochs/bochs.h"
 #include "../../../bochs/cpu/cpu.h"
@@ -57,7 +57,7 @@ aspect MemEvents
 	//
 	// Event source: "memory write access"
 	//
-#if CONFIG_EVENT_MEMWRITE == 1
+#ifdef CONFIG_EVENT_MEMWRITE
 	advice execution (write_methods()) : after () {
 		sal::simulator.onMemoryAccessEvent(
 			*(tjp->arg<1>()), sizeof(*(tjp->arg<2>())), true,
@@ -103,7 +103,7 @@ aspect MemEvents
 	//
 	// Event source: "memory read access"
 	//
-#if CONFIG_EVENT_MEMREAD == 1
+#ifdef CONFIG_EVENT_MEMREAD
 	advice execution (read_methods()) : before () {
 		sal::simulator.onMemoryAccessEvent(
 			*(tjp->arg<1>()), sizeof(*(tjp->result())), false,
@@ -119,14 +119,14 @@ aspect MemEvents
 
 	advice execution (read_methods_RMW()) : before () {
 		rmw_address = *(tjp->arg<1>());
-#if CONFIG_EVENT_MEMREAD == 1
+#ifdef CONFIG_EVENT_MEMREAD
 		sal::simulator.onMemoryAccessEvent(
 			*(tjp->arg<1>()), sizeof(*(tjp->result())), false,
 			getCPU(tjp->that())->prev_rip);
 #endif
 	}
 
-#if CONFIG_EVENT_MEMREAD == 1
+#ifdef CONFIG_EVENT_MEMREAD
 	advice execution (read_methods_system()) : before () {
 		// We don't do anything here for now: This type of memory
 		// access is used when the hardware itself needs to access

core/SAL/bochs/Trap.ah

@@ -1,9 +1,9 @@
 #ifndef __TRAP_AH__
   #define __TRAP_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_EVENT_TRAP == 1
+#ifdef CONFIG_EVENT_TRAP
 
 #include "../../../bochs/bochs.h"
 #include "../../../bochs/cpu/cpu.h"

core/SAL/bochs/disable_keyboard_interrupt.ah

@@ -1,9 +1,9 @@
 #ifndef __DISABLE_KEYBOARD_INTERRUPT_AH__
   #define __DISABLE_KEYBOARD_INTERRUPT_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_DISABLE_KEYB_INTERRUPTS
+#ifdef CONFIG_DISABLE_KEYB_INTERRUPTS
 
 #include "../../../bochs/iodev/keyboard.h"
 

core/SAL/bochs/reboot.ah

@@ -1,10 +1,10 @@
 #ifndef __REBOOT_AH__
   #define __REBOOT_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 #include "../SALInst.hpp"
 
-#if CONFIG_SR_REBOOT == 1
+#ifdef CONFIG_SR_REBOOT
 
 #include "bochs.h"
 

core/SAL/bochs/restore.ah

@@ -2,10 +2,10 @@
   #define __RESTORE_AH__
 
 #include <iostream>
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 #include "../SALInst.hpp"
 
-#if CONFIG_SR_RESTORE == 1
+#ifdef CONFIG_SR_RESTORE
 
 #include "bochs.h"
 

core/SAL/bochs/save.ah

@@ -1,9 +1,9 @@
 #ifndef __SAVE_AH__
   #define __SAVE_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_SR_SAVE == 1
+#ifdef CONFIG_SR_SAVE
 
 #include "bochs.h"
 #include "../SALInst.hpp"

core/SAL/bochs/stfu.ah

@@ -1,9 +1,9 @@
 #ifndef __NONVERBOSE_AH__
   #define __NONVERBOSE_AH__
 
-#include "../../AspectConfig.hpp"
+#include "config/AspectConfig.hpp"
 
-#if CONFIG_STFU == 1
+#ifdef CONFIG_STFU
 
 #include "bochs.h"