X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=f3e6e375cd0f4b502e9c53523dd828d854e53595;hb=f3f6f52c0e9b6f42e392835502a5d19ef7abbfc5;hp=1a380f849076e04a0e6d810c77d9b6ed03856591;hpb=c9f73afe56fd33fd606be7ff5898d8588b2be0a4;p=emu8051.git

diff --git a/src/emugtk.c b/src/emugtk.c
index 1a380f8..f3e6e37 100644
--- a/src/emugtk.c
+++ b/src/emugtk.c
@@ -49,18 +49,18 @@
 
 static int running;
 static int running_function_tag;
-static GtkWidget *mainwin;
+
+GtkWidget *mainwin;
 
 extern struct app_config_t *cfg;
+extern struct options_t options;
 
 /* Step out of running state */
 static void
 emugtk_stop_running()
 {
 	if (running) {
-#ifdef EMU8051_DEBUG
-		printf("emugtk_StopRunning()\n");
-#endif
+		log_info("StopRunning()");
 		g_source_remove(running_function_tag);
 		running = 0;
 		regwin_Show();
@@ -75,9 +75,7 @@ emugtk_running(gpointer data)
 {
 	cpu8051_Exec();
 	if (IsBreakpoint(cpu8051.pc)) {
-#ifdef EMU8051_DEBUG
-		g_print("Breakpoint Hit, stopping!\n");
-#endif
+		log_info("Breakpoint Hit");
 		emugtk_stop_running();
 	}
 
@@ -89,9 +87,7 @@ static void
 emugtk_start_running(void)
 {
 	if (!running) {
-#ifdef EMU8051_DEBUG
-		printf("emugtk_StartRunning()\n");
-#endif
+		log_info("StartRunning()");
 		running_function_tag = g_idle_add(emugtk_running, 0);
 		running = 1;
 	}
@@ -129,9 +125,7 @@ emugtk_Reset(void)
 static void
 emugtk_ResetEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-#ifdef EMU8051_DEBUG
-	g_print("emugtk_ResetEvent(...)\n");
-#endif
+	log_info("ResetEvent()");
 	emugtk_stop_running();
 	emugtk_Reset();
 }
@@ -150,9 +144,8 @@ emugtk_Step(void)
 static void
 emugtk_RunEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-#ifdef EMU8051_DEBUG
-	g_print("emugtk_RunEvent(...)\n");
-#endif
+	log_info("RunEvent()");
+
 	if (running)
 		emugtk_stop_running();
 	else
@@ -163,9 +156,7 @@ emugtk_RunEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
 static void
 emugtk_StopEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-#ifdef EMU8051_DEBUG
-	g_print("emugtk_StopEvent(...)\n");
-#endif
+	log_info("StopEvent()");
 	emugtk_stop_running();
 }
 
@@ -173,9 +164,7 @@ emugtk_StopEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
 static void
 emugtk_StepEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-#ifdef EMU8051_DEBUG
-	g_print("emugtk_StepEvent(...)\n");
-#endif
+	log_info("StepEvent()");
 	emugtk_stop_running();
 	emugtk_Step();
 }
@@ -240,8 +229,6 @@ AddMenu(void)
 static int
 mainwin_configure_event(GtkWindow *window, GdkEvent *event, gpointer data)
 {
-	//event->configure.x;
-	//event->configure.y;
 	cfg->win_width = event->configure.width;
 	cfg->win_height = event->configure.height;
 
@@ -399,10 +386,7 @@ emugtk_window_init(void)
 static void
 emugtk_UpdateDisplay(void)
 {
-#ifdef EMU8051_DEBUG
-	g_print("emugtk_UpdateDisplay()\n");
-#endif
-
+	log_debug("UpdateDisplay()");
 	regwin_Show();
 	pgmwin_Disasm();
 	memwin_DumpD("00");
@@ -431,10 +415,7 @@ emugtk_new_file(char *file)
 int
 main(int argc, char **argv)
 {
-	char *hex_file;
-
-	ParseCommandLineOptions(argc, argv);
-
+	parse_command_line_options(argc, argv);
 	app_config_load();
 
 	cpu8051_init();
@@ -445,16 +426,14 @@ main(int argc, char **argv)
 
 	emugtk_window_init();
 
-	hex_file = get_hex_filename();
-
-	if (hex_file != NULL)
-		emugtk_new_file(hex_file);
+	if (options.filename != NULL)
+		emugtk_new_file(options.filename);
+	else
+		emugtk_Reset();
 
 	gtk_main();
 
-#ifdef EMU8051_DEBUG
-	printf("End of program.\n");
-#endif
+	log_info("Terminate");
 
 	app_config_save();