#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;
+
+GtkWidget *mainwin;
extern struct app_config_t *cfg;
+extern struct options_t options;
-/* Signal DestroyEvent */
-static void
-WindowDestroyEvent(GtkWidget *widget, gpointer data)
+void
+emugtk_UpdateDisplay(void)
{
-#ifdef EMU8051_DEBUG
- g_print("emugtk_DestroyEvent(...)\n");
-#endif
-
- gtk_main_quit();
+ log_debug("UpdateDisplay()");
+ regwin_Show();
+ pgmwin_Disasm();
+ memwin_DumpD(INT_MEM_ID);
+ memwin_DumpD(EXT_MEM_ID);
}
/* Step out of running state */
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();
}
/* Adding the 'Help' submenu */
HelpAddMenu(menu_bar);
- gtk_widget_show_all(GTK_WIDGET(menu_bar));
-
return menu_bar;
}
-static 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;
+
+ /*
+ * Important:
+ * Returning false allows event to propagate to children. If not, they
+ * will not be resized when we resize the main window.
+ */
+ return FALSE;
}
static void
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
* +---------------------------------------------------------------------+
* | | | | | |
* | | |--------------------------***----------------------------- | |
* | | | | | |
- * | | | scrollwin | | |
+ * | | | vpaned_mem | | |
* | | | +---------------------------------------------------+ | | |
- * | | | | Memory window | | | |
+ * | | | | | | | |
+ * | | | | scrollwin | | | |
+ * | | | | +---------------------------------------------+ | | | |
+ * | | | | | Internal memory window | | | | |
+ * | | | | +---------------------------------------------+ | | | |
+ * | | | | | | | |
+ * | | | +-----------------------***-------------------------| | | |
+ * | | | | | | | |
+ * | | | | scrollwin | | | |
+ * | | | | +---------------------------------------------+ | | | |
+ * | | | | | External memory window | | | | |
+ * | | | | +---------------------------------------------+ | | | |
+ * | | | | | | | |
* | | | +---------------------------------------------------+ | | |
* | | | | | |
* | | +---------------------------------------------------------+ | |
GtkWidget *scrollwin;
GtkWidget *hpaned;
GtkWidget *vpaned;
+ GtkWidget *vpaned_mem;
mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(mainwin), PACKAGE);
/* Window DESTROY event. */
g_signal_connect(mainwin, "destroy",
- G_CALLBACK(WindowDestroyEvent), NULL);
+ G_CALLBACK(gtk_main_quit), NULL);
g_signal_connect(G_OBJECT(mainwin), "configure-event",
G_CALLBACK(mainwin_configure_event), NULL);
/*
* 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);
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);
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)
{
int
main(int argc, char **argv)
{
- char *hex_file;
-
- ParseCommandLineOptions(argc, argv);
-
+ parse_command_line_options(argc, argv);
app_config_load();
cpu8051_init();
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();