projects
/
emu8051.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increase dissassembled instructions lines from 24 to 100
[emu8051.git]
/
src
/
emugtk.c
diff --git
a/src/emugtk.c
b/src/emugtk.c
index
328fd42
..
de5d48b
100644
(file)
--- a/
src/emugtk.c
+++ b/
src/emugtk.c
@@
-49,23
+49,23
@@
static int running;
static int running_function_tag;
static int running;
static int running_function_tag;
-static GtkWidget *mainwin;
+
+GtkWidget *mainwin;
extern struct app_config_t *cfg;
extern struct app_config_t *cfg;
+extern struct options_t options;
/* Step out of running state */
static void
emugtk_stop_running()
{
if (running) {
/* 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();
g_source_remove(running_function_tag);
running = 0;
regwin_Show();
pgmwin_Disasm();
- memwin_DumpD(
"00"
);
+ memwin_DumpD();
}
}
}
}
@@
-75,9
+75,7
@@
emugtk_running(gpointer data)
{
cpu8051_Exec();
if (IsBreakpoint(cpu8051.pc)) {
{
cpu8051_Exec();
if (IsBreakpoint(cpu8051.pc)) {
-#ifdef EMU8051_DEBUG
- g_print("Breakpoint Hit, stopping!\n");
-#endif
+ log_info("Breakpoint Hit");
emugtk_stop_running();
}
emugtk_stop_running();
}
@@
-89,9
+87,7
@@
static void
emugtk_start_running(void)
{
if (!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;
}
running_function_tag = g_idle_add(emugtk_running, 0);
running = 1;
}
@@
-122,16
+118,14
@@
emugtk_Reset(void)
cpu8051_Reset();
regwin_Show();
pgmwin_Disasm();
cpu8051_Reset();
regwin_Show();
pgmwin_Disasm();
- memwin_DumpD(
"00"
);
+ memwin_DumpD();
}
/* Signal ResetEvent (ResetButton) */
static void
emugtk_ResetEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
{
}
/* 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_stop_running();
emugtk_Reset();
}
@@
-143,16
+137,15
@@
emugtk_Step(void)
cpu8051_Exec();
regwin_Show();
pgmwin_Disasm();
cpu8051_Exec();
regwin_Show();
pgmwin_Disasm();
- memwin_DumpD(
"00"
);
+ memwin_DumpD();
}
/* Signal RunEvent (RunButton) */
static void
emugtk_RunEvent(GtkWidget *widget, GdkEvent *event, gpointer data)
{
}
/* 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
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)
{
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();
}
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)
{
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();
}
emugtk_stop_running();
emugtk_Step();
}
@@
-397,13
+386,10
@@
emugtk_window_init(void)
static void
emugtk_UpdateDisplay(void)
{
static void
emugtk_UpdateDisplay(void)
{
-#ifdef EMU8051_DEBUG
- g_print("emugtk_UpdateDisplay()\n");
-#endif
-
+ log_debug("UpdateDisplay()");
regwin_Show();
pgmwin_Disasm();
regwin_Show();
pgmwin_Disasm();
- memwin_DumpD(
"00"
);
+ memwin_DumpD();
}
void
}
void
@@
-429,10
+415,7
@@
emugtk_new_file(char *file)
int
main(int argc, char **argv)
{
int
main(int argc, char **argv)
{
- char *hex_file;
-
- ParseCommandLineOptions(argc, argv);
-
+ parse_command_line_options(argc, argv);
app_config_load();
cpu8051_init();
app_config_load();
cpu8051_init();
@@
-443,16
+426,14
@@
main(int argc, char **argv)
emugtk_window_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();
gtk_main();
-#ifdef EMU8051_DEBUG
- printf("End of program.\n");
-#endif
+ log_info("Terminate");
app_config_save();
app_config_save();