Refactor code for memwin and pgmwin modify

[emu8051.git] / src / memwin.c

diff --git a/src/memwin.c b/src/memwin.c
index 5f9170c..3bd54f8 100644 (file)
--- a/src/memwin.c
+++ b/src/memwin.c
@@ -30,6 +30,7 @@
 #include "memory.h"
 #include "hexfile.h"
 #include "cpu8051.h"
+#include "regwin.h"
 #include "memwin.h"
 
 static GtkWidget *memlist;
@@ -40,6 +41,7 @@ static GtkWidget *memlist;
 enum
 {
        COL_ADDRESS = 0,
+       COL_DATA0,
        COL_ASCII = DATA_COLS + 1,
        N_COLUMNS,
 };
@@ -69,6 +71,65 @@ memwin_init_store(void)
        return store;
 }
 
+static void
+memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string,
+           gchar *new_str, gpointer model)
+{
+       guint column;
+       gpointer columnptr;
+       GtkTreeIter iter;
+       int address;
+       u_int8_t old;
+       int new;
+       char *str;
+
+       if (!model) {
+               g_error("Unable to get model from cell renderer");
+       }
+
+       /* Column number is passed as renderer object data */
+        columnptr = g_object_get_data(G_OBJECT(cell), "column");
+        column = GPOINTER_TO_UINT(columnptr);
+
+       /* Get the iterator */
+        gtk_tree_model_get_iter_from_string(model, &iter, path_string);
+
+       /* Get base address. */
+       gtk_tree_model_get(model, &iter, COL_ADDRESS, &str, -1);
+       address = asciihex2int(str);
+
+       /* Convert column number (1, 2, 3...) to index (0, 1, 2...) */
+       address += (column - COL_DATA0);
+       old = cpu8051_ReadD(address);
+
+       log_info("Address: $%02X", address);
+       log_info("  old value: $%02X", old);
+
+       /* Convert new value (asciihex) to integer. */
+       new = asciihex2int(new_str);
+       if ((new < 0) || (new > 255)) {
+               log_info("  new value: out of range");
+               new = old; /* Put back old value... */
+       } else {
+               log_info("  new value: $%02X", new);
+       }
+
+       /* Store new value in emulator memory. */
+       cpu8051_WriteD(address, new);
+
+       /* Convert to text. */
+       int2asciihex(new, str, 2);
+
+       /* Store new value in gtk model. */
+        gtk_list_store_set(GTK_LIST_STORE(model), &iter, column, str, -1);
+
+       /*
+        * Make sure to update all registers and memory.
+        * For example, BANKed registers depends on internal memory.
+        */
+       regwin_Show();
+};
+
 static void
 memwin_init_columns(void)
 {
@@ -85,7 +146,21 @@ memwin_init_columns(void)
        gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
        gtk_tree_view_append_column(GTK_TREE_VIEW(memlist), column);
 
-       for (i = 1; i < (DATA_COLS + 1); i++) {
+       for (i = COL_DATA0; i < (COL_DATA0 + DATA_COLS); i++) {
+               /* Create new renderer for each editable cell. */
+               renderer = gtk_cell_renderer_text_new();
+
+               /* Allow edition, align to right side. */
+               g_object_set(renderer, "editable", TRUE, "xalign", 1.0, NULL);
+
+               g_signal_connect(renderer, "edited",
+                                G_CALLBACK(memwin_cell_edited),
+                                gtk_tree_view_get_model(GTK_TREE_VIEW(memlist)));
+
+               /* Add column index, used when editing the cell. */
+               g_object_set_data(G_OBJECT(renderer), "column",
+                                 GUINT_TO_POINTER(i));
+
                column = gtk_tree_view_column_new_with_attributes(
                        "Val", renderer, "text", i, NULL);
                gtk_tree_view_column_set_sizing(column,
@@ -184,7 +259,8 @@ memwin_DumpD(char *MemAddress)
                }
 
                /* Display base address. */
-               sprintf(str, "%.4X", Address);
+               int2asciihex(Address, str, 4);
+
                gtk_list_store_set(store, &iter, COL_ADDRESS, str, -1);
 
                for (col = 0; col < DATA_COLS; col++) {
@@ -193,7 +269,8 @@ memwin_DumpD(char *MemAddress)
                        data = cpu8051_ReadD(Address + col);
 
                        /* Display hex data */
-                       sprintf(str, "%.2X", (u_int8_t) data);
+                       int2asciihex(data, str, 2);
+
                        gtk_list_store_set(store, &iter, col + 1, str, -1);
 
                        /* Append to ASCII string (if applicable). */