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

List:       bochs-cvs
Subject:    [Bochs-cvs] [12079] trunk/bochs
From:       vruppert () users ! sourceforge ! net
Date:       2013-12-29 8:45:28
Message-ID: E1VxC05-0004Yi-AX () sfs-ml-4 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 12079
Author:   vruppert
Date:     2013-12-29 08:45:28 +0000 (Sun, 29 Dec 2013)
Log Message:
-----------
Some fixes and cleanups
- in wx we had two logfunctions for the siminterface (removed duplicate init)
- renamed siminterface prefix to "SIM"
- moved variable "pluginlog" to the plugin interface
- fixed / removed some forward declarations

Modified Paths:
--------------
    trunk/bochs/doc/docbook/user/user.dbk
    trunk/bochs/gui/siminterface.cc
    trunk/bochs/gui/siminterface.h
    trunk/bochs/gui/wxmain.cc
    trunk/bochs/main.cc
    trunk/bochs/plugin.cc

Modified: trunk/bochs/doc/docbook/user/user.dbk
===================================================================
--- trunk/bochs/doc/docbook/user/user.dbk	2013-12-28 15:11:13 UTC (rev 12078)
+++ trunk/bochs/doc/docbook/user/user.dbk	2013-12-29 08:45:28 UTC (rev 12079)
@@ -5995,7 +5995,7 @@
     </row>
     <row>
       <entry>siminterface</entry>
-      <entry>CTRL</entry>
+      <entry>SIM</entry>
       <entry>Simulator interface</entry>
     </row>
     <row>

Modified: trunk/bochs/gui/siminterface.cc
===================================================================
--- trunk/bochs/gui/siminterface.cc	2013-12-28 15:11:13 UTC (rev 12078)
+++ trunk/bochs/gui/siminterface.cc	2013-12-29 08:45:28 UTC (rev 12079)
@@ -310,10 +310,11 @@
 
 void bx_init_siminterface()
 {
-  siminterface_log = new logfunctions();
-  siminterface_log->put("siminterface", "CTRL");
-  if (SIM == NULL)
+  if (SIM == NULL) {
+    siminterface_log = new logfunctions();
+    siminterface_log->put("siminterface", "SIM");
     SIM = new bx_real_sim_c();
+  }
   if (root_param == NULL) {
     root_param = new bx_list_c(NULL,
       "bochs",

Modified: trunk/bochs/gui/siminterface.h
===================================================================
--- trunk/bochs/gui/siminterface.h	2013-12-28 15:11:13 UTC (rev 12078)
+++ trunk/bochs/gui/siminterface.h	2013-12-29 08:45:28 UTC (rev 12079)
@@ -780,8 +780,7 @@
 
 BOCHSAPI extern bx_simulator_interface_c *SIM;
 
-BOCHSAPI extern void bx_init_siminterface();
-BOCHSAPI extern int bx_init_main(int argc, char *argv[]);
+extern void bx_init_siminterface();
 
 #if defined(__WXMSW__) || defined(WIN32)
 // Just to provide HINSTANCE, etc. in files that have not included bochs.h.

Modified: trunk/bochs/gui/wxmain.cc
===================================================================
--- trunk/bochs/gui/wxmain.cc	2013-12-28 15:11:13 UTC (rev 12078)
+++ trunk/bochs/gui/wxmain.cc	2013-12-29 08:45:28 UTC (rev 12079)
@@ -233,7 +233,6 @@
 {
   // wxLog::AddTraceMask(wxT("mime"));
   wxLog::SetActiveTarget(new wxLogStderr());
-  bx_init_siminterface();
   // Install callback function to handle anything that occurs before the
   // simulation begins.  This is responsible for displaying any error
   // dialogs during bochsrc and command line processing.

Modified: trunk/bochs/main.cc
===================================================================
--- trunk/bochs/main.cc	2013-12-28 15:11:13 UTC (rev 12078)
+++ trunk/bochs/main.cc	2013-12-29 08:45:28 UTC (rev 12079)
@@ -58,19 +58,12 @@
 bx_bool bx_gui_sighandler = 0;
 #endif
 
-// some prototypes from iodev/
-// I want to stay away from including iodev/iodev.h here
-Bit32u bx_unmapped_io_read_handler(Bit32u address, unsigned io_len);
-void   bx_unmapped_io_write_handler(Bit32u address, Bit32u value,
-                                    unsigned io_len);
-
+int  bx_init_main(int argc, char *argv[]);
 void bx_init_hardware(void);
 void bx_init_options(void);
 void bx_init_bx_dbg(void);
 
 static const char *divider = "========================================================================";
-static logfunctions thePluginLog;
-logfunctions *pluginlog = &thePluginLog;
 
 bx_startup_flags_t bx_startup_flags;
 bx_bool bx_user_quit;

Modified: trunk/bochs/plugin.cc
===================================================================
--- trunk/bochs/plugin.cc	2013-12-28 15:11:13 UTC (rev 12078)
+++ trunk/bochs/plugin.cc	2013-12-29 08:45:28 UTC (rev 12079)
@@ -46,6 +46,8 @@
 #define PLUGIN_FILENAME_FORMAT "bx_%s.dll"
 #endif
 
+logfunctions *pluginlog;
+
 extern "C" {
 
 void  (*pluginRegisterIRQ)(unsigned irq, const char* name) = 0;


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
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]