X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fmemwin.c;h=4c8cc221b0d30e348feb42da902c2a917754c8b1;hb=ca2a000a22e5b5121a61833198966f001aa2a77f;hp=f5945bf0182167f868e4c6687d0e0682dce84a37;hpb=1e334b447fea096671d90dd364cd830eae17514e;p=emu8051.git

diff --git a/src/memwin.c b/src/memwin.c
index f5945bf..4c8cc22 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,23 +94,26 @@ 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);
 
 	/* Get base address. */
 	gtk_tree_model_get(model, &iter, COL_ADDRESS, &str, -1);
-	sscanf(str, "%x", &address);
+	address = asciihex2int(str);
 
 	/* 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);
 
 	/* Convert new value (asciihex) to integer. */
-	sscanf(new_str, "%x", &new);
-
+	new = asciihex2int(new_str);
 	if ((new < 0) || (new > 255)) {
 		log_info("  new value: out of range");
 		new = old; /* Put back old value... */
@@ -116,10 +122,10 @@ 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. */
-	sprintf(str, "%.2X", new);
+	int2asciihex(new, str, 2);
 
 	/* Store new value in gtk model. */
         gtk_list_store_set(GTK_LIST_STORE(model), &iter, column, str, -1);
@@ -128,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;
@@ -145,45 +151,60 @@ 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];
+
 		/* 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);
+		/* 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(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));
+
+		/* 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(
-			"Val", renderer, "text", i, NULL);
+			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 */
+	/* 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(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),
@@ -196,15 +217,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
@@ -216,32 +255,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(char *MemAddress)
+memwin_refresh(int memory_id)
 {
 	int row;
 	unsigned int Address;
 	GtkListStore *store;
+	GtkWidget *memlist;
+	int data_rows;
 
-	log_info("memwin_DumpD, address = %s", MemAddress);
+	Address = 0;
 
-	if (strlen(MemAddress) != 0) {
-		if (STREQ(MemAddress, "PC"))
-			Address = cpu8051.pc;
-		else
-			Address = Ascii2Hex(MemAddress, strlen(MemAddress));
+	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 {
-		Address = 0;
+		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) {
@@ -260,16 +303,18 @@ 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++) {
 			u_int8_t data;
 
-			data = cpu8051_ReadD(Address + col);
+			data = memory_read8(memory_id, 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). */