[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bochs-cvs
Subject:    [Bochs-cvs] CVS: bochs main.cc,1.344,1.345
From:       Volker Ruppert <vruppert () users ! sourceforge ! net>
Date:       2006-09-23 9:07:17
Message-ID: E1GR3Th-0006HR-Mp () sc8-pr-cvs3 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/bochs/bochs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24135

Modified Files:
	main.cc 
Log Message:
- fixes for second simulation support with wxBochs
  * wxBochsStopSim flag is now reset before starting the SimThread
  * the siminterface 'init_done' flag now controls the execution of the hardware
    cleanup in bx_atexit()


Index: main.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/main.cc,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -d -r1.344 -r1.345
--- main.cc	20 Sep 2006 17:02:19 -0000	1.344
+++ main.cc	23 Sep 2006 09:07:15 -0000	1.345
@@ -1130,9 +1130,7 @@
 
 int bx_atexit(void)
 {
-  static bx_bool been_here = 0;
-  if (been_here) return 1;   // protect from reentry
-  been_here = 1;
+  if (!SIM->get_init_done()) return 1; // protect from reentry
 
   // in case we ended up in simulation mode, change back to config mode
   // so that the user can see any messages left behind on the console.
@@ -1163,6 +1161,8 @@
 #endif
 #endif
 
+  SIM->set_init_done(0);
+
   return 0;
 }
 


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]