From 300275353817da03e7bc5d1378a85f154cbd3c75 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Wed, 16 Oct 2013 22:21:46 -0400 Subject: [PATCH] Remove address parameter when dumping memwin --- src/emugtk.c | 8 ++++---- src/memwin.c | 13 +++---------- src/memwin.h | 2 +- src/regwin.c | 2 +- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/emugtk.c b/src/emugtk.c index f3e6e37..de5d48b 100644 --- a/src/emugtk.c +++ b/src/emugtk.c @@ -65,7 +65,7 @@ emugtk_stop_running() running = 0; regwin_Show(); pgmwin_Disasm(); - memwin_DumpD("00"); + memwin_DumpD(); } } @@ -118,7 +118,7 @@ emugtk_Reset(void) cpu8051_Reset(); regwin_Show(); pgmwin_Disasm(); - memwin_DumpD("00"); + memwin_DumpD(); } /* Signal ResetEvent (ResetButton) */ @@ -137,7 +137,7 @@ emugtk_Step(void) cpu8051_Exec(); regwin_Show(); pgmwin_Disasm(); - memwin_DumpD("00"); + memwin_DumpD(); } /* Signal RunEvent (RunButton) */ @@ -389,7 +389,7 @@ emugtk_UpdateDisplay(void) log_debug("UpdateDisplay()"); regwin_Show(); pgmwin_Disasm(); - memwin_DumpD("00"); + memwin_DumpD(); } void diff --git a/src/memwin.c b/src/memwin.c index 3bd54f8..8635248 100644 --- a/src/memwin.c +++ b/src/memwin.c @@ -217,22 +217,15 @@ memwin_init(void) /* Dump up to 256 bytes from Address in Memory (direct addressing) */ void -memwin_DumpD(char *MemAddress) +memwin_DumpD(void) { int row; unsigned int Address; GtkListStore *store; - log_info("memwin_DumpD, address = %s", MemAddress); + log_info("memwin_DumpD()"); - if (strlen(MemAddress) != 0) { - if (STREQ(MemAddress, "PC")) - Address = cpu8051.pc; - else - Address = Ascii2Hex(MemAddress, strlen(MemAddress)); - } else { - Address = 0; - } + Address = 0; store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(memlist))); diff --git a/src/memwin.h b/src/memwin.h index cd4700b..30fa9ce 100644 --- a/src/memwin.h +++ b/src/memwin.h @@ -28,6 +28,6 @@ GtkWidget * memwin_init(void); void -memwin_DumpD(char *Address); +memwin_DumpD(void); #endif /* MEMWIN_H */ diff --git a/src/regwin.c b/src/regwin.c index 0578781..3a9bf82 100644 --- a/src/regwin.c +++ b/src/regwin.c @@ -389,7 +389,7 @@ regwin_cell_edited(GtkCellRendererText *cell, gchar *path_string, * For example, R0-R7 values depends on internal memory values. */ regwin_Show(); - memwin_DumpD("0"); + memwin_DumpD(); }; static void -- 2.20.1