#include "common.h"
#include "cpu8051.h"
+#include "memory.h"
#include "options.h"
#include "hexfile.h"
static int running;
static int running_function_tag;
-static GtkWidget *mainwin;
+static int restart_gui = true;
+
+GtkWidget *mainwin;
extern struct app_config_t *cfg;
+extern struct options_t options;
+
+void
+emugtk_UpdateDisplay(void)
+{
+ log_debug("UpdateDisplay()");
+ regwin_refresh();
+ pgmwin_refresh();
+
+ if (cfg->view_int_memory)
+ memwin_refresh(INT_MEM_ID);
+
+ if (cfg->view_ext_memory)
+ memwin_refresh(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();
}
}
{
cpu8051_Exec();
if (IsBreakpoint(cpu8051.pc)) {
-#ifdef EMU8051_DEBUG
- g_print("Breakpoint Hit, stopping!\n");
-#endif
+ log_info("Breakpoint Hit");
emugtk_stop_running();
}
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;
}
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();
}
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
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();
}
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();
}
static void
hpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data)
{
- GtkWidget *hpaned = data;
+ GtkWidget *paned = data;
- cfg->hpane_pos = gtk_paned_get_position(GTK_PANED(hpaned));
+ cfg->hpane_pos = gtk_paned_get_position(GTK_PANED(paned));
}
static void
vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data)
{
- GtkWidget *vpaned = data;
+ GtkWidget *paned = data;
+
+ cfg->vpane_pos = gtk_paned_get_position(GTK_PANED(paned));
+}
+
+static void
+main_paned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data)
+{
+ GtkWidget *paned = data;
+
+ cfg->main_pane_pos = gtk_paned_get_position(GTK_PANED(paned));
+}
+
+void
+emugtk_restart_gui(void)
+{
+ emugtk_stop_running();
+
+ gtk_widget_destroy(mainwin);
+
+ restart_gui = true;
+}
+
+void
+emugtk_quit_gui(void)
+{
+ gtk_main_quit();
+
+ restart_gui = false;
+}
+
+static GtkWidget *
+emugtk_create_memory_paned(void)
+{
+ GtkWidget *vpaned;
+ GtkWidget *scrollwin;
- cfg->vpane_pos = gtk_paned_get_position(GTK_PANED(vpaned));
+ /* Create vpaned (memory windows) only if necessary. */
+ if (cfg->view_int_memory || cfg->view_ext_memory) {
+ vpaned = gtk_vpaned_new();
+ gtk_paned_set_position(GTK_PANED(vpaned), cfg->vpane_pos);
+ g_signal_connect(G_OBJECT(vpaned), "notify::position",
+ G_CALLBACK(vpaned_notify_event), vpaned);
+
+ /* Internal memory dump frame. */
+ if (cfg->view_int_memory) {
+ scrollwin = memwin_init("Internal memory (IRAM)",
+ INT_MEM_ID);
+ gtk_paned_pack1(GTK_PANED(vpaned), scrollwin,
+ FALSE, FALSE);
+ }
+
+ /* External memory dump frame. */
+ if (cfg->view_ext_memory) {
+ scrollwin = memwin_init("External memory (XRAM)",
+ EXT_MEM_ID);
+ gtk_paned_pack2(GTK_PANED(vpaned), scrollwin,
+ TRUE, FALSE);
+ }
+
+ return vpaned;
+ } else
+ return NULL;
}
/*
* | | | |
* | |---------------------------------------------------------------| |
* | | | |
- * | | vpaned | |
+ * | | main_paned | |
* | | +---------------------------------------------------------+ | |
* | | | | | |
* | | | hpaned | | |
* | | | | | |
* | | |--------------------------***----------------------------- | |
* | | | | | |
- * | | | scrollwin | | |
+ * | | | vpaned | | |
* | | | +---------------------------------------------------+ | | |
- * | | | | Memory window | | | |
+ * | | | | | | | |
+ * | | | | scrollwin | | | |
+ * | | | | +---------------------------------------------+ | | | |
+ * | | | | | Internal memory window | | | | |
+ * | | | | +---------------------------------------------+ | | | |
+ * | | | | | | | |
+ * | | | +-----------------------***-------------------------| | | |
+ * | | | | | | | |
+ * | | | | scrollwin | | | |
+ * | | | | +---------------------------------------------+ | | | |
+ * | | | | | External memory window | | | | |
+ * | | | | +---------------------------------------------+ | | | |
+ * | | | | | | | |
* | | | +---------------------------------------------------+ | | |
* | | | | | |
* | | +---------------------------------------------------------+ | |
GtkWidget *scrollwin;
GtkWidget *hpaned;
GtkWidget *vpaned;
+ GtkWidget *main_paned;
mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(mainwin), PACKAGE);
g_signal_connect(G_OBJECT(mainwin), "configure-event",
G_CALLBACK(mainwin_configure_event), NULL);
- /*
- * vbox contains the menu bar and body_vbox (for all remaining
- * items).
- */
- vbox = gtk_vbox_new(FALSE, 1);
-
/* Creating the menu bar. */
menu_bar = AddMenu();
- /* Adding menu bar to vbox */
- gtk_box_pack_start(GTK_BOX(vbox), menu_bar, FALSE, FALSE, 1);
/* Creating the buttons bar. */
buttons_bar = AddButtons();
- /* Adding buttons bar to vbox */
- gtk_box_pack_start(GTK_BOX(vbox), buttons_bar, FALSE, FALSE, 1);
-
- /*
- * vpaned will contain:
- * Top: registers and disassembly windows.
- * Bottom: memory window
- */
- vpaned = gtk_vpaned_new();
- gtk_paned_set_position(GTK_PANED(vpaned), cfg->vpane_pos);
- g_signal_connect(G_OBJECT(vpaned), "notify::position",
- G_CALLBACK(vpaned_notify_event), vpaned);
/* hpaned will contain registers and disassembly windows. */
hpaned = gtk_hpaned_new();
scrollwin = pgmwin_init();
gtk_paned_pack2(GTK_PANED(hpaned), scrollwin, TRUE, FALSE);
- gtk_paned_pack1(GTK_PANED(vpaned), hpaned, FALSE, FALSE);
+ /*
+ * main_paned will contain two groups:
+ * group1: registers and disassembly windows.
+ * group2: memory windows
+ */
+ if (cfg->layout == UI_LAYOUT1)
+ main_paned = gtk_vpaned_new();
+ else
+ main_paned = gtk_hpaned_new();
- /* Memory dump frame. */
- scrollwin = memwin_init();
- gtk_paned_pack2(GTK_PANED(vpaned), scrollwin, TRUE, FALSE);
+ gtk_paned_set_position(GTK_PANED(main_paned), cfg->main_pane_pos);
+ g_signal_connect(G_OBJECT(main_paned), "notify::position",
+ G_CALLBACK(main_paned_notify_event), main_paned);
+ gtk_paned_pack1(GTK_PANED(main_paned), hpaned, FALSE, FALSE);
- /* Adding vpaned window to vbox */
- gtk_box_pack_start(GTK_BOX(vbox), vpaned, true, true, 1);
+ vpaned = emugtk_create_memory_paned();
+ if (vpaned != NULL)
+ gtk_paned_pack2(GTK_PANED(main_paned), vpaned,
+ TRUE, FALSE);
+
+ /*
+ * vbox contains the menu bar and body_vbox (for all remaining
+ * items).
+ */
+ vbox = gtk_vbox_new(FALSE, 1);
+ gtk_box_pack_start(GTK_BOX(vbox), menu_bar, FALSE, FALSE, 1);
+ gtk_box_pack_start(GTK_BOX(vbox), buttons_bar, FALSE, FALSE, 1);
+ gtk_box_pack_start(GTK_BOX(vbox), main_paned, true, true, 1);
/* Adding the vbox to the main window. */
gtk_container_add(GTK_CONTAINER(mainwin), vbox);
- gtk_widget_show_all(mainwin);
-}
+ g_signal_connect(mainwin, "destroy", G_CALLBACK(emugtk_quit_gui), NULL);
-static void
-emugtk_UpdateDisplay(void)
-{
-#ifdef EMU8051_DEBUG
- g_print("emugtk_UpdateDisplay()\n");
-#endif
-
- regwin_Show();
- pgmwin_Disasm();
- memwin_DumpD("00");
+ gtk_widget_show_all(mainwin);
}
void
LoadHexFile(file);
- emugtk_Reset();
+ if (cfg->clear_ram_on_file_load)
+ emugtk_Reset();
+
emugtk_UpdateDisplay();
}
int
main(int argc, char **argv)
{
- char *hex_file;
-
- ParseCommandLineOptions(argc, argv);
-
+ parse_command_line_options(argc, argv);
app_config_load();
cpu8051_init();
gtk_init(&argc, &argv);
- emugtk_window_init();
+ if (options.filename != NULL)
+ LoadHexFile(options.filename);
- hex_file = get_hex_filename();
+ cpu8051_Reset();
- if (hex_file != NULL)
- emugtk_new_file(hex_file);
+ while (restart_gui == true) {
+ log_info("Init GUI");
- gtk_main();
+ emugtk_window_init();
+ emugtk_UpdateDisplay();
+ gtk_main();
+ }
-#ifdef EMU8051_DEBUG
- printf("End of program.\n");
-#endif
+ log_info("Terminate");
app_config_save();
projects / emu8051.git / blobdiff