christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Bochs aspects: check for BUILD_BOCHS everywhere

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1610 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-09-11 17:10:04 +00:00
parent 10d0344505
commit e24099d4a8
18 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/sal/bochs/BochsNoAbort.ah
View File

@ -1,9 +1,10 @@
#ifndef __BOCHS_NO_ABORT_AH__ #ifndef __BOCHS_NO_ABORT_AH__
#define __BOCHS_NO_ABORT_AH__ #define __BOCHS_NO_ABORT_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_BOCHS_NO_ABORT #if defined(BUILD_BOCHS) && defined(CONFIG_BOCHS_NO_ABORT)
#include "bochs.h" #include "bochs.h"
@ -37,5 +38,4 @@ aspect BochsNoAbort {
}; };
#endif // CONFIG_BOCHS_NO_ABORT #endif // CONFIG_BOCHS_NO_ABORT
#endif // __BOCHS_NO_ABORT_AH__ #endif // __BOCHS_NO_ABORT_AH__

4
src/core/sal/bochs/BochsNonVerbose.ah
View File

@ -1,9 +1,10 @@
#ifndef __BOCHS_NON_VERBOSE_AH__ #ifndef __BOCHS_NON_VERBOSE_AH__
#define __BOCHS_NON_VERBOSE_AH__ #define __BOCHS_NON_VERBOSE_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_BOCHS_NON_VERBOSE #if defined(BUILD_BOCHS) && defined(CONFIG_BOCHS_NON_VERBOSE)
#include "bochs.h" #include "bochs.h"
@ -57,5 +58,4 @@ aspect BochsNonVerbose {
}; };
#endif // CONFIG_BOCHS_NON_VERBOSE #endif // CONFIG_BOCHS_NON_VERBOSE
#endif // __BOCHS_NON_VERBOSE_AH__ #endif // __BOCHS_NON_VERBOSE_AH__

5
src/core/sal/bochs/Breakpoints.ah
View File

@ -4,8 +4,7 @@
#include "config/VariantConfig.hpp" #include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef BUILD_BOCHS #if defined(BUILD_BOCHS) && defined(CONFIG_EVENT_BREAKPOINTS)
#ifdef CONFIG_EVENT_BREAKPOINTS
#include "bochs.h" #include "bochs.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
@ -31,6 +30,4 @@ aspect Breakpoints {
}; };
#endif // CONFIG_EVENT_BREAKPOINTS #endif // CONFIG_EVENT_BREAKPOINTS
#endif // BUILD_BOCHS
#endif // __BREAKPOINTS_AH__ #endif // __BREAKPOINTS_AH__

5
src/core/sal/bochs/Credits.ah
View File

@ -1,6 +1,10 @@
#ifndef __CREDITS_AH__ #ifndef __CREDITS_AH__
#define __CREDITS_AH__ #define __CREDITS_AH__
#include "config/VariantConfig.hpp"
#ifdef BUILD_BOCHS
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@ -26,4 +30,5 @@ aspect Credits {
} }
}; };
#endif // BUILD_BOCHS
#endif // __CREDITS_AH__ #endif // __CREDITS_AH__

4
src/core/sal/bochs/DisableKeyboardInterrupt.ah
View File

@ -1,9 +1,10 @@
#ifndef __DISABLE_KEYBOARD_INTERRUPT_AH__ #ifndef __DISABLE_KEYBOARD_INTERRUPT_AH__
#define __DISABLE_KEYBOARD_INTERRUPT_AH__ #define __DISABLE_KEYBOARD_INTERRUPT_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_DISABLE_KEYB_INTERRUPTS #if defined(BUILD_BOCHS) && defined(CONFIG_DISABLE_KEYB_INTERRUPTS)
#include "iodev/iodev.h" #include "iodev/iodev.h"
#include "iodev/keyboard.h" #include "iodev/keyboard.h"
@ -22,5 +23,4 @@ aspect DisableKeyboardInterrupt {
}; };
#endif // CONFIG_DISABLE_KEYB_INTERRUPTS #endif // CONFIG_DISABLE_KEYB_INTERRUPTS
#endif // __DISABLE_KEYBOARD_INTERRUPT_AH__ #endif // __DISABLE_KEYBOARD_INTERRUPT_AH__

5
src/core/sal/bochs/DisableLogFunctions.ah
View File

@ -1,6 +1,10 @@
#ifndef __DISABLE_ADD_REMOVE_LOGFN_AH__ #ifndef __DISABLE_ADD_REMOVE_LOGFN_AH__
#define __DISABLE_ADD_REMOVE_LOGFN_AH__ #define __DISABLE_ADD_REMOVE_LOGFN_AH__
#include "config/VariantConfig.hpp"
#ifdef BUILD_BOCHS
/* Hack to prevent Bochs' logfunctions list (bochs.h) to overflow if the /* Hack to prevent Bochs' logfunctions list (bochs.h) to overflow if the
* experiment restores simulator state more than ~1000 times. * experiment restores simulator state more than ~1000 times.
* *
@ -16,4 +20,5 @@ aspect DisableLogFunctions {
advice execution (add_remove_logfn()) : around () { } advice execution (add_remove_logfn()) : around () { }
}; };
#endif // BUILD_BOCHS
#endif // __DISABLE_ADD_REMOVE_LOGFN_AH__ #endif // __DISABLE_ADD_REMOVE_LOGFN_AH__

5
src/core/sal/bochs/FailBochsInit.ah
View File

@ -1,6 +1,10 @@
#ifndef __FAIL_BOCHS_INIT_AH__ #ifndef __FAIL_BOCHS_INIT_AH__
#define __FAIL_BOCHS_INIT_AH__ #define __FAIL_BOCHS_INIT_AH__
#include "config/VariantConfig.hpp"
#ifdef BUILD_BOCHS
#include "../SALInst.hpp" #include "../SALInst.hpp"
aspect FailBochsInit { aspect FailBochsInit {
@ -10,4 +14,5 @@ aspect FailBochsInit {
} }
}; };
#endif
#endif // __FAIL_BOCHS_INIT_AH__ #endif // __FAIL_BOCHS_INIT_AH__

4
src/core/sal/bochs/FireInterrupt.ah
View File

@ -1,9 +1,10 @@
#ifndef __FIREINTERRUPT_AH__ #ifndef __FIREINTERRUPT_AH__
#define __FIREINTERRUPT_AH__ #define __FIREINTERRUPT_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_FIRE_INTERRUPTS #if defined(BUILD_BOCHS) && defined(CONFIG_FIRE_INTERRUPTS)
#include "bochs.h" #include "bochs.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
@ -41,5 +42,4 @@ aspect InterruptDone {
}; };
#endif // CONFIG_FIRE_INTERRUPTS #endif // CONFIG_FIRE_INTERRUPTS
#endif // __FIREINTERRUPT_AH__ #endif // __FIREINTERRUPT_AH__

4
src/core/sal/bochs/GuestSysCom.ah
View File

@ -1,9 +1,10 @@
#ifndef __GUEST_SYS_COM_AH__ #ifndef __GUEST_SYS_COM_AH__
#define __GUEST_SYS_COM_AH__ #define __GUEST_SYS_COM_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_EVENT_GUESTSYS #if defined(BUILD_BOCHS) && defined(CONFIG_EVENT_GUESTSYS)
#include "bochs.h" #include "bochs.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
@ -29,5 +30,4 @@ aspect GuestSysCom {
}; };
#endif // CONFIG_EVENT_GUESTSYS #endif // CONFIG_EVENT_GUESTSYS
#endif // __GUEST_SYS_COM_AH__ #endif // __GUEST_SYS_COM_AH__

4
src/core/sal/bochs/IOPortCom.ah
View File

@ -1,9 +1,10 @@
#ifndef __IOPORT_COM_AH__ #ifndef __IOPORT_COM_AH__
#define __IOPORT_COM_AH__ #define __IOPORT_COM_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_EVENT_IOPORT #if defined(BUILD_BOCHS) && defined(CONFIG_EVENT_IOPORT)
#include "bochs.h" #include "bochs.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
@ -35,5 +36,4 @@ aspect IOPortCom {
}; };
#endif // CONFIG_EVENT_IOPORT #endif // CONFIG_EVENT_IOPORT
#endif // __IOPORT_COM_AH__ #endif // __IOPORT_COM_AH__

4
src/core/sal/bochs/Interrupt.ah
View File

@ -1,9 +1,10 @@
#ifndef __INTERRUPT_AH__ #ifndef __INTERRUPT_AH__
#define __INTERRUPT_AH__ #define __INTERRUPT_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_EVENT_INTERRUPT #if defined(BUILD_BOCHS) && defined(CONFIG_EVENT_INTERRUPT)
#include "bochs.h" #include "bochs.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
@ -35,5 +36,4 @@ aspect Interrupt {
}; };
#endif // CONFIG_EVENT_INTERRUPT #endif // CONFIG_EVENT_INTERRUPT
#endif // __INTERRUPT_AH__ #endif // __INTERRUPT_AH__

4
src/core/sal/bochs/InterruptSuppression.ah
View File

@ -1,9 +1,10 @@
#ifndef __INTERRUPT_SUPPRESSION_AH__ #ifndef __INTERRUPT_SUPPRESSION_AH__
#define __INTERRUPT_SUPPRESSION_AH__ #define __INTERRUPT_SUPPRESSION_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_SUPPRESS_INTERRUPTS #if defined(BUILD_BOCHS) && defined(CONFIG_SUPPRESS_INTERRUPTS)
#include "bochs.h" #include "bochs.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
@ -23,5 +24,4 @@ aspect InterruptSuppression {
}; };
#endif // CONFIG_SUPPRESS_INTERRUPTS #endif // CONFIG_SUPPRESS_INTERRUPTS
#endif // __INTERRUPT_SUPPRESSION_AH__ #endif // __INTERRUPT_SUPPRESSION_AH__

5
src/core/sal/bochs/Jump.ah
View File

@ -1,9 +1,10 @@
#ifndef __JUMP_AH__ #ifndef __JUMP_AH__
#define __JUMP_AH__ #define __JUMP_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_EVENT_JUMP #if defined(BUILD_BOCHS) && defined(CONFIG_EVENT_JUMP)
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
@ -135,6 +136,4 @@ aspect Jump {
}; };
#endif // CONFIG_EVENT_JUMP #endif // CONFIG_EVENT_JUMP
#endif // __JUMP_AH__ #endif // __JUMP_AH__

4
src/core/sal/bochs/MemAccess.ah
View File

@ -1,8 +1,10 @@
#ifndef __MEM_ACCESS_AH__ #ifndef __MEM_ACCESS_AH__
#define __MEM_ACCESS_AH__ #define __MEM_ACCESS_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef BUILD_BOCHS
#if defined(CONFIG_EVENT_MEMREAD) || defined(CONFIG_EVENT_MEMWRITE) #if defined(CONFIG_EVENT_MEMREAD) || defined(CONFIG_EVENT_MEMWRITE)
#include <iostream> #include <iostream>
@ -156,5 +158,5 @@ aspect MemAccess {
}; };
#endif // CONFIG_EVENT_MEMACCESS #endif // CONFIG_EVENT_MEMACCESS
#endif // BUILD_BOCHS
#endif // __MEM_ACCESS_AH__ #endif // __MEM_ACCESS_AH__

4
src/core/sal/bochs/Reboot.ah
View File

@ -1,9 +1,10 @@
#ifndef __REBOOT_AH__ #ifndef __REBOOT_AH__
#define __REBOOT_AH__ #define __REBOOT_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_SR_REBOOT #if defined(BUILD_BOCHS) && defined(CONFIG_SR_REBOOT)
#include "bochs.h" #include "bochs.h"
#include "../SALInst.hpp" #include "../SALInst.hpp"
@ -25,5 +26,4 @@ aspect Reboot {
}; };
#endif // CONFIG_SR_REBOOT #endif // CONFIG_SR_REBOOT
#endif // __REBOOT_AH__ #endif // __REBOOT_AH__

5
src/core/sal/bochs/RestoreState.ah
View File

@ -4,8 +4,7 @@
#include "config/VariantConfig.hpp" #include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef BUILD_BOCHS #if defined(BUILD_BOCHS) && defined(CONFIG_SR_RESTORE)
#ifdef CONFIG_SR_RESTORE
#include <iostream> #include <iostream>
@ -25,6 +24,4 @@ aspect RestoreState {
}; };
#endif // CONFIG_SR_RESTORE #endif // CONFIG_SR_RESTORE
#endif // BUILD_BOCHS
#endif // __RESTORE_STATE_AH__ #endif // __RESTORE_STATE_AH__

5
src/core/sal/bochs/SaveState.ah
View File

@ -4,8 +4,7 @@
#include "config/VariantConfig.hpp" #include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef BUILD_BOCHS #if defined(BUILD_BOCHS) && defined(CONFIG_SR_SAVE)
#ifdef CONFIG_SR_SAVE
#include "bochs.h" #include "bochs.h"
@ -31,6 +30,4 @@ aspect SaveState {
}; };
#endif // CONFIG_SR_SAVE #endif // CONFIG_SR_SAVE
#endif // BUILD_BOCHS
#endif // _SAVE_STATE_AH__ #endif // _SAVE_STATE_AH__

4
src/core/sal/bochs/Trap.ah
View File

@ -1,9 +1,10 @@
#ifndef __TRAP_AH__ #ifndef __TRAP_AH__
#define __TRAP_AH__ #define __TRAP_AH__
#include "config/VariantConfig.hpp"
#include "config/FailConfig.hpp" #include "config/FailConfig.hpp"
#ifdef CONFIG_EVENT_TRAP #if defined(BUILD_BOCHS) && defined(CONFIG_EVENT_TRAP)
#include "bochs.h" #include "bochs.h"
#include "cpu/cpu.h" #include "cpu/cpu.h"
@ -22,5 +23,4 @@ aspect Trap {
}; };
#endif // CONFIG_EVENT_TRAP #endif // CONFIG_EVENT_TRAP
#endif // __TRAP_AH__ #endif // __TRAP_AH__