From ff828ba48f4711434af22bc0c5cbd7a5c872925f Mon Sep 17 00:00:00 2001 From: hellwig Date: Thu, 5 Apr 2012 09:40:39 +0000 Subject: [PATCH] comments added and corrected git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1030 8c4709b5-6ec9-48aa-a5cd-a96041d1645a --- bochs/cpu/cpu.cc | 13 +++++++------ bochs/disasm/dis_tables.h | 1 + bochs/gui/gui.cc | 6 +++--- bochs/gui/gui.h | 4 ++-- bochs/gui/siminterface.cc | 2 +- bochs/gui/siminterface.h | 2 ++ bochs/gui/textconfig.cc | 7 ++++--- bochs/gui/x.cc | 2 +- bochs/main.cc | 16 ++++++++-------- bochs/memory/memory.h | 2 +- bochs/memory/misc_mem.cc | 2 +- bochs/pc_system.cc | 2 +- bochs/pc_system.h | 2 +- 13 files changed, 33 insertions(+), 28 deletions(-) diff --git a/bochs/cpu/cpu.cc b/bochs/cpu/cpu.cc index f2d6552d..346a564b 100644 --- a/bochs/cpu/cpu.cc +++ b/bochs/cpu/cpu.cc @@ -27,8 +27,8 @@ #include "iodev/iodev.h" /**************************************************************** - * BOCHS-MODIFIED - * Author: Adrian Böckenkamp + * DanceOS - BOCHS-MODIFIED + * */ // Just a dummy function to define a join-point. This function is @@ -131,7 +131,7 @@ void BX_CPU_C::cpu_loop(Bit32u max_instr_count) // If request to return to caller ASAP. return; } - }else if(sal::restore_bochs_request){ + }else if(sal::restore_bochs_request){ //DanceOS return; } @@ -152,8 +152,8 @@ void BX_CPU_C::cpu_loop(Bit32u max_instr_count) } #endif /**************************************************************** - * BOCHS-MODIFIED - * Author: Adrian Böckenkamp + * DanceOS - BOCHS-MODIFIED + * */ defineCPULoopJoinPoint(BX_CPU_THIS, i); @@ -501,8 +501,9 @@ unsigned BX_CPU_C::handleAsyncEvent(void) // setting kill_bochs_request causes the cpu loop to return ASAP. return 1; // Return to caller of cpu_loop. } + //DanceOS #ifdef DANCEOS_RESTORE - else if (sal::restore_bochs_request) { //DanceOS Richard Hellwig + else if (sal::restore_bochs_request) { return 1; } #endif diff --git a/bochs/disasm/dis_tables.h b/bochs/disasm/dis_tables.h index 03326c8d..90069872 100755 --- a/bochs/disasm/dis_tables.h +++ b/bochs/disasm/dis_tables.h @@ -193,6 +193,7 @@ const struct BxDisasmOpcodeInfo_t #undef XX +//DanceOS // workaround for include file clash with cpu/instr.h in conjunction with AspectC++ #undef Id #undef Iq diff --git a/bochs/gui/gui.cc b/bochs/gui/gui.cc index c5dac90e..d7855a10 100644 --- a/bochs/gui/gui.cc +++ b/bochs/gui/gui.cc @@ -156,7 +156,7 @@ void bx_gui_c::init(int argc, char **argv, unsigned tilewidth, unsigned tileheig BX_GUI_THIS power_bmap_id = create_bitmap(bx_power_bmap, BX_POWER_BMAP_X, BX_POWER_BMAP_Y); BX_GUI_THIS reset_bmap_id = create_bitmap(bx_reset_bmap, BX_RESET_BMAP_X, BX_RESET_BMAP_Y); BX_GUI_THIS snapshot_bmap_id = create_bitmap(bx_snapshot_bmap, BX_SNAPSHOT_BMAP_X, BX_SNAPSHOT_BMAP_Y); - //DanceOS Richard Hellwig + //DanceOS #ifdef DANCEOS_RESTORE BX_GUI_THIS restore_bmap_id = create_bitmap(bx_floppya_bmap, BX_FLOPPYA_BMAP_X, BX_FLOPPYA_BMAP_Y); #endif @@ -225,7 +225,7 @@ void bx_gui_c::init(int argc, char **argv, unsigned tilewidth, unsigned tileheig BX_GUI_THIS config_hbar_id = headerbar_bitmap(BX_GUI_THIS config_bmap_id, BX_GRAVITY_RIGHT, config_handler); BX_GUI_THIS set_tooltip(BX_GUI_THIS config_hbar_id, "Runtime config dialog"); - //DanceOS Richard Hellwig + //DanceOS // Fake-Restore button #ifdef DANCEOS_RESTORE BX_GUI_THIS restore_hbar_id = headerbar_bitmap(BX_GUI_THIS restore_bmap_id, @@ -653,7 +653,7 @@ void bx_gui_c::save_restore_handler(void) -//DanceOS Richard Hellwig +//DanceOS #ifdef DANCEOS_RESTORE void bx_gui_c::restore_handler(void) { diff --git a/bochs/gui/gui.h b/bochs/gui/gui.h index edbb0247..008c49af 100644 --- a/bochs/gui/gui.h +++ b/bochs/gui/gui.h @@ -161,7 +161,7 @@ protected: static void copy_handler(void); static void paste_handler(void); static void snapshot_handler(void); - //DanceOS Richard Hellwig + //DanceOS #ifdef DANCEOS_RESTORE static void restore_handler(void); #endif @@ -183,7 +183,7 @@ protected: unsigned copy_bmap_id, copy_hbar_id; unsigned paste_bmap_id, paste_hbar_id; unsigned snapshot_bmap_id, snapshot_hbar_id; - //DanceOS Richard Hellwig + //DanceOS #ifdef DANCEOS_RESTORE unsigned restore_bmap_id, restore_hbar_id; #endif diff --git a/bochs/gui/siminterface.cc b/bochs/gui/siminterface.cc index 5d7d39a6..965ba0a6 100644 --- a/bochs/gui/siminterface.cc +++ b/bochs/gui/siminterface.cc @@ -68,7 +68,7 @@ class bx_real_sim_c : public bx_simulator_interface_c { bx_bool wx_debug_gui; public: bx_real_sim_c(); - //DanceOS Richard Hellwig + //DanceOS #ifdef DANCEOS_RESTORE virtual ~bx_real_sim_c() {root_param = NULL;} #else diff --git a/bochs/gui/siminterface.h b/bochs/gui/siminterface.h index 77d55610..4e61113d 100644 --- a/bochs/gui/siminterface.h +++ b/bochs/gui/siminterface.h @@ -123,6 +123,7 @@ ////////////////////////////////////////////////////// +//DanceOS #ifndef BX_SIMINTERFACE_H # define BX_SIMINTERFACE_H 1 @@ -746,4 +747,5 @@ BOCHSAPI extern bx_startup_flags_t bx_startup_flags; BOCHSAPI extern bx_bool bx_user_quit; BOCHSAPI extern Bit8u bx_cpu_count; +//DanceOS #endif /* BX_SIMINTERFACE_H */ diff --git a/bochs/gui/textconfig.cc b/bochs/gui/textconfig.cc index b34ddd0c..41344e18 100644 --- a/bochs/gui/textconfig.cc +++ b/bochs/gui/textconfig.cc @@ -31,6 +31,7 @@ // isn't even defined in this context. // +//DanceOS // workaround for include file ordering problem in conjunction with AspectC++ #include "bochs.h" @@ -59,7 +60,7 @@ extern "C" { #define CI_PATH_LENGTH 512 -//DanceOS Richard Hellwig +//DanceOS #ifdef DANCEOS_RESTORE bool raus = false; #endif @@ -424,7 +425,7 @@ int bx_config_interface(int menu) return 0; case BX_CI_START_SIMULATION: // we don't expect it to return, but if it does, quit - //DanceOS Richard Hellwig + //DanceOS #ifdef DANCEOS_RESTORE if(SIM->begin_simulation(bx_startup_flags.argc, bx_startup_flags.argv)){ raus = true; @@ -562,7 +563,7 @@ int bx_config_interface(int menu) fprintf(stderr, "Unknown config interface menu type.\n"); assert(menu >=0 && menu < BX_CI_N_MENUS); } - //DanceOS Richard Hellwig + //DanceOS #ifdef DANCEOS_RESTORE if(raus){ return 1; diff --git a/bochs/gui/x.cc b/bochs/gui/x.cc index d1f5f046..c6d5ff38 100644 --- a/bochs/gui/x.cc +++ b/bochs/gui/x.cc @@ -1817,7 +1817,7 @@ void bx_x_gui_c::exit(void) if (bx_x_display) XCloseDisplay (bx_x_display); - //DanceOS Richard Hellwig + //DanceOS #ifdef DANCEOS_RESTORE bx_bitmap_left_xorigin = 0; diff --git a/bochs/main.cc b/bochs/main.cc index b58b48da..87ddfbba 100644 --- a/bochs/main.cc +++ b/bochs/main.cc @@ -27,8 +27,6 @@ #endif #include "cpu/cpu.h" #include "iodev/iodev.h" -//DanceOS Richard Hellwig -//#include "failbochs.h" #ifdef HAVE_LOCALE_H #include @@ -257,7 +255,7 @@ void print_tree(bx_param_c *node, int level) int bxmain (void) { - //DanceOS Sprungmarke + //DanceOS #ifdef DANCEOS_RESTORE marke: #endif @@ -304,7 +302,7 @@ marke: ci_param->set_enabled(0); int status = SIM->configuration_interface(ci_name, CI_START); - //DanceOS Richard Hellwig + //DanceOS #ifdef DANCEOS_RESTORE if(sal::restore_bochs_request){ @@ -656,8 +654,8 @@ int bx_init_main(int argc, char *argv[]) } arg++; } -#ifdef DANCEOS_RESTORE - //DanceOS Richard Hellwig +//DanceOS +#ifdef DANCEOS_RESTORE if(sal::restore_bochs_request){ SIM->get_param_bool(BXPN_RESTORE_FLAG)->set(1); SIM->get_param_enum(BXPN_BOCHS_START)->set(BX_QUICK_START); @@ -980,9 +978,10 @@ int bx_begin_simulation (int argc, char *argv[]) if (bx_pc_system.kill_bochs_request){ break; } +//DanceOS #ifdef DANCEOS_RESTORE if(sal::restore_bochs_request){ - //DanceOS Richard Hellwig + return 1; } #endif @@ -1003,9 +1002,10 @@ int bx_begin_simulation (int argc, char *argv[]) if (bx_pc_system.kill_bochs_request){ break; } + //DanceOS #ifdef DANCEOS_RESTORE if(sal::restore_bochs_request){ - //DanceOS Richard Hellwig + return 1; } #endif diff --git a/bochs/memory/memory.h b/bochs/memory/memory.h index 493a569b..f14b7f53 100644 --- a/bochs/memory/memory.h +++ b/bochs/memory/memory.h @@ -79,7 +79,7 @@ public: BX_MEM_C(); ~BX_MEM_C(); - //DanceOS Richard Hellwig + //DanceOS #ifdef DANCEOS_RESTORE BX_MEM_SMF void new_init(void); #endif diff --git a/bochs/memory/misc_mem.cc b/bochs/memory/misc_mem.cc index 90015f96..ddea34b3 100644 --- a/bochs/memory/misc_mem.cc +++ b/bochs/memory/misc_mem.cc @@ -47,7 +47,7 @@ BX_MEM_C::BX_MEM_C() memory_handlers = NULL; } -//DanceOS Richard Hellwig +//DanceOS #ifdef DANCEOS_RESTORE void BX_MEM_C::new_init(){ diff --git a/bochs/pc_system.cc b/bochs/pc_system.cc index 82cbae88..76d51b71 100644 --- a/bochs/pc_system.cc +++ b/bochs/pc_system.cc @@ -453,7 +453,7 @@ Bit64u bx_pc_system_c::time_usec() void bx_pc_system_c::start_timers(void) { } -//DanceOS Richard Hellwig +//DanceOS #ifdef DANCEOS_RESTORE void bx_pc_system_c::delete_timers(void){ numTimers = 1 + BX_SUPPORT_APIC; diff --git a/bochs/pc_system.h b/bochs/pc_system.h index 95ff2e7f..45db9370 100644 --- a/bochs/pc_system.h +++ b/bochs/pc_system.h @@ -93,7 +93,7 @@ public: bx_bool unregisterTimer(unsigned timerID); void start_timers(void); - //DanceOS Richard Hellwig + //DanceOS #ifdef DANCEOS_RESTORE void delete_timers(void); #endif