X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=f4f9301000c64fa793e45f69174f70c099b7f934;hb=1aa4da2dd777823a4aa5f40cf8cf7b1c09401a34;hp=656a07e249763b4e7ba6c3880aa68f39bbb54255;hpb=7b400e8dd6a3f1a50247b74283c76e34f9e20ba1;p=emu8051.git

diff --git a/src/emugtk.c b/src/emugtk.c
index 656a07e..f4f9301 100644
--- a/src/emugtk.c
+++ b/src/emugtk.c
@@ -29,6 +29,7 @@
 
 #include "common.h"
 #include "cpu8051.h"
+#include "memory.h"
 #include "options.h"
 #include "hexfile.h"
 
@@ -55,19 +56,25 @@ GtkWidget *mainwin;
 extern struct app_config_t *cfg;
 extern struct options_t options;
 
+void
+emugtk_UpdateDisplay(void)
+{
+	log_debug("UpdateDisplay()");
+	regwin_Show();
+	pgmwin_Disasm();
+	memwin_DumpD(INT_MEM_ID);
+	memwin_DumpD(EXT_MEM_ID);
+}
+
 /* 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();
-		pgmwin_Disasm();
-		memwin_DumpD("00");
+		emugtk_UpdateDisplay();
 	}
 }
 
@@ -77,9 +84,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();
 	}
 
@@ -91,9 +96,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;
 	}
@@ -122,18 +125,14 @@ static void
 emugtk_Reset(void)
 {
 	cpu8051_Reset();
-	regwin_Show();
-	pgmwin_Disasm();
-	memwin_DumpD("00");
+	emugtk_UpdateDisplay();
 }
 
 /* Signal ResetEvent (ResetButton) */
 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();
 }
@@ -143,18 +142,15 @@ static void
 emugtk_Step(void)
 {
 	cpu8051_Exec();
-	regwin_Show();
-	pgmwin_Disasm();
-	memwin_DumpD("00");
+	emugtk_UpdateDisplay();
 }
 
 /* Signal RunEvent (RunButton) */
 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
@@ -165,9 +161,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();
 }
 
@@ -175,9 +169,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();
 }
@@ -269,6 +261,14 @@ vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data)
 	cfg->vpane_pos = gtk_paned_get_position(GTK_PANED(vpaned));
 }
 
+static void
+vpaned_mem_notify_event(GtkWindow *window, GdkEvent *event, gpointer data)
+{
+	GtkWidget *vpaned = data;
+
+	cfg->vpane_mem_pos = gtk_paned_get_position(GTK_PANED(vpaned));
+}
+
 /*
  *  mainwin
  * +---------------------------------------------------------------------+
@@ -305,9 +305,21 @@ vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data)
  * |  |  |                                                         |  |  |
  * |  |  |--------------------------***-----------------------------  |  |
  * |  |  |                                                         |  |  |
- * |  |  |  scrollwin                                              |  |  |
+ * |  |  |  vpaned_mem                                             |  |  |
  * |  |  |  +---------------------------------------------------+  |  |  |
- * |  |  |  | Memory window                                     |  |  |  |
+ * |  |  |  |                                                   |  |  |  |
+ * |  |  |  |  scrollwin                                        |  |  |  |
+ * |  |  |  |  +---------------------------------------------+  |  |  |  |
+ * |  |  |  |  | Internal memory window                      |  |  |  |  |
+ * |  |  |  |  +---------------------------------------------+  |  |  |  |
+ * |  |  |  |                                                   |  |  |  |
+ * |  |  |  +-----------------------***-------------------------|  |  |  |
+ * |  |  |  |                                                   |  |  |  |
+ * |  |  |  |  scrollwin                                        |  |  |  |
+ * |  |  |  |  +---------------------------------------------+  |  |  |  |
+ * |  |  |  |  | External memory window                      |  |  |  |  |
+ * |  |  |  |  +---------------------------------------------+  |  |  |  |
+ * |  |  |  |                                                   |  |  |  |
  * |  |  |  +---------------------------------------------------+  |  |  |
  * |  |  |                                                         |  |  |
  * |  |  +---------------------------------------------------------+  |  |
@@ -327,6 +339,7 @@ emugtk_window_init(void)
 	GtkWidget *scrollwin;
 	GtkWidget *hpaned;
 	GtkWidget *vpaned;
+	GtkWidget *vpaned_mem;
 
 	mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(mainwin), PACKAGE);
@@ -360,7 +373,7 @@ emugtk_window_init(void)
 	/*
 	 * vpaned will contain:
 	 *   Top:    registers and disassembly windows.
-	 *   Bottom: memory window
+	 *   Bottom: memory windows
 	 */
 	vpaned = gtk_vpaned_new();
 	gtk_paned_set_position(GTK_PANED(vpaned), cfg->vpane_pos);
@@ -383,9 +396,20 @@ emugtk_window_init(void)
 
 	gtk_paned_pack1(GTK_PANED(vpaned), hpaned, FALSE, FALSE);
 
-	/* Memory dump frame. */
-	scrollwin = memwin_init();
-	gtk_paned_pack2(GTK_PANED(vpaned), scrollwin, TRUE, FALSE);
+	vpaned_mem = gtk_vpaned_new();
+	gtk_paned_set_position(GTK_PANED(vpaned_mem), cfg->vpane_mem_pos);
+	g_signal_connect(G_OBJECT(vpaned_mem), "notify::position",
+			 G_CALLBACK(vpaned_mem_notify_event), vpaned_mem);
+
+	/* Internal memory dump frame. */
+	scrollwin = memwin_init("Internal memory (IRAM)", INT_MEM_ID);
+	gtk_paned_pack1(GTK_PANED(vpaned_mem), scrollwin, FALSE, FALSE);
+
+	/* External memory dump frame. */
+	scrollwin = memwin_init("External memory (XRAM)", EXT_MEM_ID);
+	gtk_paned_pack2(GTK_PANED(vpaned_mem), scrollwin, TRUE, FALSE);
+
+	gtk_paned_pack2(GTK_PANED(vpaned), vpaned_mem, TRUE, FALSE);
 
 	/* Adding vpaned window to vbox */
 	gtk_box_pack_start(GTK_BOX(vbox), vpaned, true, true, 1);
@@ -396,18 +420,6 @@ emugtk_window_init(void)
 	gtk_widget_show_all(mainwin);
 }
 
-static void
-emugtk_UpdateDisplay(void)
-{
-#ifdef EMU8051_DEBUG
-	g_print("emugtk_UpdateDisplay()\n");
-#endif
-
-	regwin_Show();
-	pgmwin_Disasm();
-	memwin_DumpD("00");
-}
-
 void
 AddMenuSeparator(GtkWidget *menu)
 {
@@ -449,9 +461,7 @@ main(int argc, char **argv)
 
 	gtk_main();
 
-#ifdef EMU8051_DEBUG
-	printf("End of program.\n");
-#endif
+	log_info("Terminate");
 
 	app_config_save();