X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fmemwin.c;h=58ce1d2e6b7f87fae080c4fe57d1b2202a78c3d3;hb=5905b40585298defb8e4230adfe90dfbccb465b9;hp=135588a26c55bd2b298d0e26ba2de1897d35a70d;hpb=fc3c2b3dbd1b840445dc5bd9f2d3e99ac68837e6;p=emu8051.git diff --git a/src/memwin.c b/src/memwin.c index 135588a..58ce1d2 100644 --- a/src/memwin.c +++ b/src/memwin.c @@ -24,106 +24,323 @@ #endif #include +#include /* For isprint */ #include "common.h" #include "memory.h" #include "hexfile.h" #include "cpu8051.h" -#include "gtksizes.h" +#include "regwin.h" #include "memwin.h" +#include "emugtk.h" +#include "options.h" +#include "app-config.h" -static GtkWidget *memclist; +extern struct app_config_t *cfg; +extern struct options_t options; -GtkWidget * -memwin_init(int width, int height) +static int COL_ASCII; +static int N_COLUMNS; + +enum +{ + COL_ADDRESS = 0, + COL_DATA0, +}; + +static GtkWidget *memlist_internal; +static GtkWidget *memlist_external; + +/* Creating a model */ +static GtkListStore * +memwin_init_store(int data_rows) +{ + GtkTreeIter iter; + int row; + int col; + GtkListStore *store; + GType col_types[N_COLUMNS]; + + /* No need for static array, all our columns are of the same type. */ + for (col = 0; col < N_COLUMNS; col++) + col_types[col] = G_TYPE_STRING; + + store = gtk_list_store_newv(N_COLUMNS, col_types); + + /* Add rows. */ + for (row = 0; row < data_rows; row++) + gtk_list_store_append(store, &iter); + + return store; +} + +static void +memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string, + gchar *new_str, gpointer model) +{ + guint column; + guint memory_id; + gpointer columnptr; + gpointer memory_id_ptr; + 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); + + /* Memory ID is passed as renderer object data */ + memory_id_ptr = g_object_get_data(G_OBJECT(cell), "memory_id"); + memory_id = GPOINTER_TO_UINT(memory_id_ptr); + + /* 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 = memory_read8(memory_id, 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. */ + memory_write8(memory_id, 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. + */ + emugtk_UpdateDisplay(); +}; + +static void +memwin_init_columns(GtkWidget *listview, int memory_id) { int i; - GtkWidget *fixed_frame; - PangoFontDescription *pango_font; - char *memdummy[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0 }; - - fixed_frame = gtk_frame_new(0); - gtk_frame_set_shadow_type(GTK_FRAME(fixed_frame), - GTK_SHADOW_ETCHED_OUT); - gtk_widget_set_usize(GTK_WIDGET(fixed_frame), width, height); - - memclist = gtk_clist_new(18); - gtk_clist_set_selection_mode(GTK_CLIST(memclist), GTK_SELECTION_SINGLE); - gtk_widget_set_usize(GTK_WIDGET(memclist), 620, 250); - - for (i = 0; i < 18; i++) { - gtk_clist_set_column_justification( - GTK_CLIST(memclist), i, GTK_JUSTIFY_LEFT); + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + + /* Columns and cell renderers */ + renderer = gtk_cell_renderer_text_new(); + + /* Add address column */ + column = gtk_tree_view_column_new_with_attributes( + "Address", renderer, "text", COL_ADDRESS, NULL); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column); + + for (i = COL_DATA0; i < (COL_DATA0 + cfg->bits_per_row); i++) { + char col_name[8]; + + /* Create new renderer for each editable cell. */ + renderer = gtk_cell_renderer_text_new(); + + /* Allow edition, align to left side. */ + g_object_set(renderer, "editable", TRUE, "xalign", 0, NULL); + + g_signal_connect(renderer, "edited", + G_CALLBACK(memwin_cell_edited), + gtk_tree_view_get_model( + GTK_TREE_VIEW(listview))); + + /* Add column index and memory_id, used when editing the cell. */ + g_object_set_data(G_OBJECT(renderer), "column", + GUINT_TO_POINTER(i)); + g_object_set_data(G_OBJECT(renderer), "memory_id", + GUINT_TO_POINTER(memory_id)); + + /* Use two digits only if DATA_ROWS > 10 */ + if (cfg->bits_per_row < 10) + sprintf(col_name, "B%1d", i - COL_DATA0); + else + sprintf(col_name, "B%02d", i - COL_DATA0); + + column = gtk_tree_view_column_new_with_attributes( + col_name, renderer, "text", i, NULL); + gtk_tree_view_column_set_sizing(column, + GTK_TREE_VIEW_COLUMN_AUTOSIZE); + gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column); + } + + /* Add ASCII column, using fixed-font. */ + renderer = gtk_cell_renderer_text_new(); + g_object_set(renderer, "family", "Monospace", NULL); + column = gtk_tree_view_column_new_with_attributes( + "ASCII", renderer, "text", COL_ASCII, NULL); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column); +} + +static int +compute_data_rows(int memory_id) +{ + int data_rows; + + if (memory_id == INT_MEM_ID) { + data_rows = options.iram_size / cfg->bits_per_row; + } else if (memory_id == EXT_MEM_ID) { + data_rows = options.xram_size / cfg->bits_per_row; + } else { + log_fail("Invalid memory type"); + exit(1); } - gtk_clist_set_column_width(GTK_CLIST(memclist), 0, - 5 * FIXED_FONT_SYMBOL_WIDTH); + return data_rows; +} + +GtkWidget * +memwin_init(char *title, int memory_id) +{ + GtkWidget *frame; + GtkWidget *scrollwin; + GtkListStore *store; + GtkWidget *memlist; + int data_rows; - for (i = 1; i < 17; i++) - gtk_clist_set_column_width(GTK_CLIST(memclist), i, - 2 * FIXED_FONT_SYMBOL_WIDTH); + COL_ASCII = cfg->bits_per_row + 1; + N_COLUMNS = COL_ASCII + 1; - gtk_clist_set_column_width(GTK_CLIST(memclist), 17, - 16 * FIXED_FONT_SYMBOL_WIDTH); + frame = gtk_frame_new(title); - pango_font = pango_font_description_from_string(FIXED_FONT); - gtk_widget_modify_font(memclist, pango_font); + scrollwin = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin), + GTK_SHADOW_ETCHED_OUT); - for (i = 0; i < 16; i++) - gtk_clist_append(GTK_CLIST(memclist), memdummy); + /* Automatically add scrollbars when necessary. */ + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(fixed_frame), memclist); + gtk_container_add(GTK_CONTAINER(frame), scrollwin); - return fixed_frame; + data_rows = compute_data_rows(memory_id); + + /* Creating a model */ + store = memwin_init_store(data_rows); + + /* Creating the view component */ + memlist = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(memlist), TRUE); + gtk_container_add(GTK_CONTAINER(scrollwin), memlist); + + if (memory_id == INT_MEM_ID) { + memlist_internal = memlist; + } else if (memory_id == EXT_MEM_ID) { + memlist_external = memlist; + } else { + log_fail("Invalid memory type"); + exit(1); + } + + memwin_init_columns(memlist, memory_id); + + /* + * The tree view has acquired its own reference to the model, so we can + * drop ours. That way the model will be freed automatically when the + * tree view is destroyed. + */ + g_object_unref(store); + + return frame; } -/* Dump 16 rows of 16 bytes from Address in Memory (direct addressing) */ +/* Dump internal or external memory. */ void -memwin_DumpD(char *MemAddress) +memwin_refresh(int memory_id) { - char TextTmp[1024]; - int row, column, TextLength; + int row; unsigned int Address; + GtkListStore *store; + GtkWidget *memlist; + int data_rows; - if (strlen(MemAddress) != 0) { - if (STREQ(MemAddress, "PC")) - Address = cpu8051.pc; - else - Address = Ascii2Hex(MemAddress, strlen(MemAddress)); + Address = 0; + + data_rows = compute_data_rows(memory_id); + + if (memory_id == INT_MEM_ID) { + memlist = memlist_internal; + } else if (memory_id == EXT_MEM_ID) { + memlist = memlist_external; } else { - Address = 0; + log_fail("Invalid memory type"); + exit(1); } - gtk_clist_freeze(GTK_CLIST(memclist)); + store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(memlist))); - for (row = 0; row < 16; row++) { - sprintf(TextTmp, "%.4X", Address); - gtk_clist_set_text(GTK_CLIST(memclist), row, 0, TextTmp); + for (row = 0; row < data_rows; row++) { + int valid; + GtkTreeIter iter; + char str[4+1]; /* Maximum str len is for address column (4 digits) */ + char ascii_str[16+1]; /* Maximum 16 data columns. */ + int col; - for (column = 0; column < 16; column++) { - sprintf(TextTmp, "%.2X", - (int) cpu8051_ReadD(Address + column)); - gtk_clist_set_text(GTK_CLIST(memclist), row, - column + 1, TextTmp); + if (row == 0) { + /* Get first row in list store */ + valid = gtk_tree_model_get_iter_first( + GTK_TREE_MODEL(store), &iter); + } else { + /* Get next row in list store */ + valid = gtk_tree_model_iter_next( + GTK_TREE_MODEL(store), &iter); } - TextLength = 0; - for (column = 0; column < 16; column++) { - if (((int) cpu8051_ReadD(Address + column) >= 32) && - ((int) cpu8051_ReadD(Address + column) <= 126)) - TextLength += sprintf( - &TextTmp[TextLength], - "%c", cpu8051_ReadD(Address + column)); - else - TextLength += - sprintf(&TextTmp[TextLength], "."); + if (!valid) { + printf("Invalid iter...\n"); + return; } - gtk_clist_set_text(GTK_CLIST(memclist), row, 17, TextTmp); - Address += 16; - } + /* Display base address. */ + int2asciihex(Address, str, 4); + + gtk_list_store_set(store, &iter, COL_ADDRESS, str, -1); - gtk_clist_select_row(GTK_CLIST(memclist), 0, 0); - gtk_clist_thaw(GTK_CLIST(memclist)); + for (col = 0; col < cfg->bits_per_row; col++) { + u_int8_t data; + + data = memory_read8(memory_id, Address + col); + + /* Display hex data */ + int2asciihex(data, str, 2); + + gtk_list_store_set(store, &iter, col + 1, str, -1); + + /* Append to ASCII string (if applicable). */ + if (!isprint(data)) + data = '.'; + sprintf(&ascii_str[col], "%c", data); + } + + /* Display ASCII characters. */ + gtk_list_store_set(store, &iter, COL_ASCII, ascii_str, -1); + + Address += cfg->bits_per_row; + } }