X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fmemwin.c;h=d8441fb4bb5f72d634940c7a911237d9ea47a5d4;hb=45be0d02186f8c48dc3705de2a71ade93705ae1d;hp=24d3071f1db71049f9ff3b778d05c4113325b3f2;hpb=4093ad22ec961792db9bac0877d42c055e5dcaf6;p=emu8051.git diff --git a/src/memwin.c b/src/memwin.c index 24d3071..d8441fb 100644 --- a/src/memwin.c +++ b/src/memwin.c @@ -32,11 +32,11 @@ #include "cpu8051.h" #include "regwin.h" #include "memwin.h" - -static GtkWidget *memlist; +#include "emugtk.h" #define DATA_COLS 16 /* Must be a power of 2 */ -#define DATA_ROWS (INT_MEM_SIZE / DATA_COLS) +#define DATA_ROWS_INT (INT_MEM_SIZE / DATA_COLS) +#define DATA_ROWS_EXT (1024 / DATA_COLS) enum { @@ -46,37 +46,40 @@ enum N_COLUMNS, }; +static GtkWidget *memlist_internal; +static GtkWidget *memlist_external; + /* Creating a model */ static GtkListStore * -memwin_init_store(void) +memwin_init_store(int data_rows) { GtkTreeIter iter; - int rows; + int row; int col; GtkListStore *store; GType col_types[N_COLUMNS]; - for (col = 0; col < N_COLUMNS; col++) { + /* 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); - /* Initialize with rows of dummy data... */ - for (rows = 0; rows < DATA_ROWS; rows++) { - /* Add new row. */ + /* 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) + gchar *new_str, gpointer model) { guint column; + guint memory_id; gpointer columnptr; + gpointer memory_id_ptr; GtkTreeIter iter; int address; u_int8_t old; @@ -91,6 +94,10 @@ memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string, 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); @@ -100,7 +107,7 @@ memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string, /* Convert column number (1, 2, 3...) to index (0, 1, 2...) */ address += (column - COL_DATA0); - old = cpu8051_ReadD(address); + old = memory_read8(memory_id, address); log_info("Address: $%02X", address); log_info(" old value: $%02X", old); @@ -115,7 +122,7 @@ memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string, } /* Store new value in emulator memory. */ - cpu8051_WriteD(address, new); + memory_write8(memory_id, address, new); /* Convert to text. */ int2asciihex(new, str, 2); @@ -127,11 +134,11 @@ memwin_cell_edited(GtkCellRendererText *cell, gchar *path_string, * Make sure to update all registers and memory. * For example, BANKed registers depends on internal memory. */ - regwin_Show(); + emugtk_UpdateDisplay(); }; static void -memwin_init_columns(void) +memwin_init_columns(GtkWidget *listview, int memory_id) { int i; GtkCellRenderer *renderer; @@ -144,7 +151,7 @@ memwin_init_columns(void) 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(memlist), column); + gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column); for (i = COL_DATA0; i < (COL_DATA0 + DATA_COLS); i++) { char col_name[8]; @@ -157,36 +164,45 @@ memwin_init_columns(void) g_signal_connect(renderer, "edited", G_CALLBACK(memwin_cell_edited), - gtk_tree_view_get_model(GTK_TREE_VIEW(memlist))); + gtk_tree_view_get_model( + GTK_TREE_VIEW(listview))); - /* Add column index, used when editing the cell. */ + /* 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)); - sprintf(col_name, "B%02d", i - COL_DATA0); + /* Use two digits only if DATA_ROWS > 10 */ + if (DATA_COLS < 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(memlist), column); + gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column); } /* Add ASCII column */ 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(memlist), column); + gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column); } GtkWidget * -memwin_init(void) +memwin_init(char *title, int memory_id) { GtkWidget *frame; GtkWidget *scrollwin; GtkListStore *store; + GtkWidget *memlist; + int data_rows; - frame = gtk_frame_new("Internal memory"); + frame = gtk_frame_new(title); scrollwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin), @@ -199,15 +215,33 @@ memwin_init(void) gtk_container_add(GTK_CONTAINER(frame), scrollwin); + if (memory_id == INT_MEM_ID) { + data_rows = DATA_ROWS_INT; + } else if (memory_id == EXT_MEM_ID) { + data_rows = DATA_ROWS_EXT; + } else { + log_fail("Invalid memory type"); + exit(1); + } + /* Creating a model */ - store = memwin_init_store(); + 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); - memwin_init_columns(); + 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 @@ -219,25 +253,36 @@ memwin_init(void) return frame; } -/* Dump up to 256 bytes from Address in Memory (direct addressing) */ +/* Dump internal or external memory. */ void -memwin_DumpD(void) +memwin_refresh(int memory_id) { int row; unsigned int Address; GtkListStore *store; - - log_info("memwin_DumpD()"); + GtkWidget *memlist; + int data_rows; Address = 0; + if (memory_id == INT_MEM_ID) { + memlist = memlist_internal; + data_rows = DATA_ROWS_INT; + } else if (memory_id == EXT_MEM_ID) { + memlist = memlist_external; + data_rows = DATA_ROWS_EXT; + } else { + log_fail("Invalid memory type"); + exit(1); + } + store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(memlist))); - for (row = 0; row < DATA_ROWS; row++) { + for (row = 0; row < data_rows; row++) { int valid; GtkTreeIter iter; - char str[4 + 2]; /* Maximum str len is for address column (4 digits) */ - char ascii_str[DATA_COLS]; + char str[4+1]; /* Maximum str len is for address column (4 digits) */ + char ascii_str[DATA_COLS+1]; int col; if (row == 0) { @@ -263,7 +308,7 @@ memwin_DumpD(void) for (col = 0; col < DATA_COLS; col++) { u_int8_t data; - data = cpu8051_ReadD(Address + col); + data = memory_read8(memory_id, Address + col); /* Display hex data */ int2asciihex(data, str, 2);