christoph/fail
1
Fork 0
Code Releases Activity

Some fixes and missing comments for restore-mechanism.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1236 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-05-16 12:02:28 +00:00
parent 08c8b05b96
commit 0d32dac7c3
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/config.h.in
View File

@ -885,7 +885,7 @@ typedef
#define BX_FLOPPY1_NAME "Floppy Disk 1"
#endif
//DANCEOS Richard Hellwig
// DanceOS
#define DANCEOS_RESTORE
#endif // _BX_CONFIG_H

8
bochs/cpu/cpu.cc
View File

@ -131,9 +131,13 @@ void BX_CPU_C::cpu_loop(Bit32u max_instr_count)
// If request to return to caller ASAP.
return;
}
}else if(sal::restore_bochs_request){ //DanceOS
return;
}
// DanceOS
#ifdef DANCEOS_RESTORE
else if(sal::restore_bochs_request) {
return;
}
#endif
bxICacheEntry_c *entry = getICacheEntry();

5
bochs/memory/misc_mem.cc
View File

@ -213,7 +213,12 @@ void BX_MEM_C::cleanup_memory()
{
unsigned idx;
// DanceOS
#ifdef DANCEOS_RESTORE
if (BX_MEM_THIS vector != NULL || sal::restore_bochs_request) {
#else
if (BX_MEM_THIS vector != NULL) {
#endif
delete [] BX_MEM_THIS actual_vector;
BX_MEM_THIS actual_vector = NULL;
BX_MEM_THIS vector = NULL;

7
bochs/pc_system.cc
View File

@ -453,10 +453,11 @@ Bit64u bx_pc_system_c::time_usec()
void bx_pc_system_c::start_timers(void) { }
//DanceOS
// DanceOS
#ifdef DANCEOS_RESTORE
void bx_pc_system_c::delete_timers(void){
numTimers = 1 + BX_SUPPORT_APIC;
void bx_pc_system_c::delete_timers(void)
{
numTimers = 1 + BX_SUPPORT_APIC;
}
#endif

16
core/SAL/bochs/failbochs.hpp
View File

@ -1,22 +1,24 @@
#ifndef FAILBOCHS_H
#define FAILBOCHS_H
#ifndef __FAILBOCHS_HPP__
#define __FAILBOCHS_HPP__
#include <string>
#include <string.h>
#include "config.h"
namespace sal{
namespace sal
{
#ifdef DANCEOS_RESTORE
extern bx_bool restore_bochs_request;
extern bx_bool save_bochs_request;
extern bx_bool reboot_bochs_request;
extern bx_bool interrupt_injection_request;
extern int interrupt_to_fire;
extern std::string sr_path;
#endif
extern bx_bool reboot_bochs_request;
extern bx_bool interrupt_injection_request;
extern int interrupt_to_fire;
}
#endif //FAILBOCHS_H
#endif /* __FAILBOCHS_HPP__ */