christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Namespaces unified (sal+fi -> fail), Code cleanups (-> coding-style.txt), Doxygen-comments fixed.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1319 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
adrian
2012-06-07 17:47:19 +00:00
parent cdd5379e19
commit b7d904140e
136 changed files with 1487 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/cpu/cpu.cc
View File

@ -134,7 +134,7 @@ void BX_CPU_C::cpu_loop(Bit32u max_instr_count)
}
// DanceOS
#ifdef DANCEOS_RESTORE
else if(sal::restore_bochs_request) {
else if(fail::restore_bochs_request) {
return;
}
#endif
@ -454,7 +454,7 @@ unsigned BX_CPU_C::handleAsyncEvent(void)
//DanceOS
#ifdef DANCEOS_RESTORE
if (sal::restore_bochs_request) {
if (fail::restore_bochs_request) {
return 1;
}
#endif

4
bochs/gui/gui.cc
View File

@ -668,8 +668,8 @@ void bx_gui_c::restore_handler(void)
bx_param_string_c::SELECT_FOLDER_DLG);
if ((ret >= 0) && (strcmp(temp_path, "none"))) {
sal::restore_bochs_request = true;
sal::sr_path = temp_path;
fail::restore_bochs_request = true;
fail::sr_path = temp_path;
}
}

10
bochs/main.cc
View File

@ -304,7 +304,7 @@ marke:
//DanceOS
#ifdef DANCEOS_RESTORE
if(sal::restore_bochs_request){
if(fail::restore_bochs_request){
bx_devices.exit();
@ -656,10 +656,10 @@ int bx_init_main(int argc, char *argv[])
}
//DanceOS
#ifdef DANCEOS_RESTORE
if(sal::restore_bochs_request){
if(fail::restore_bochs_request){
SIM->get_param_bool(BXPN_RESTORE_FLAG)->set(1);
SIM->get_param_enum(BXPN_BOCHS_START)->set(BX_QUICK_START);
SIM->get_param_string(BXPN_RESTORE_PATH)->set(sal::sr_path.c_str());
SIM->get_param_string(BXPN_RESTORE_PATH)->set(fail::sr_path.c_str());
}
#endif
#if BX_WITH_CARBON
@ -980,7 +980,7 @@ int bx_begin_simulation (int argc, char *argv[])
}
//DanceOS
#ifdef DANCEOS_RESTORE
if(sal::restore_bochs_request){
if(fail::restore_bochs_request){
return 1;
}
@ -1004,7 +1004,7 @@ int bx_begin_simulation (int argc, char *argv[])
}
//DanceOS
#ifdef DANCEOS_RESTORE
if(sal::restore_bochs_request){
if(fail::restore_bochs_request){
return 1;
}

2
bochs/memory/misc_mem.cc
View File

@ -215,7 +215,7 @@ void BX_MEM_C::cleanup_memory()
// DanceOS
#ifdef DANCEOS_RESTORE
if (BX_MEM_THIS vector != NULL || sal::restore_bochs_request) {
if (BX_MEM_THIS vector != NULL || fail::restore_bochs_request) {
#else
if (BX_MEM_THIS vector != NULL) {
#endif