#endif
#include <stdio.h>
+#include <ctype.h> /* For isprint */
#include "common.h"
#include "memory.h"
#include "hexfile.h"
#include "cpu8051.h"
+#include "regwin.h"
#include "memwin.h"
static GtkWidget *memlist;
enum
{
COL_ADDRESS = 0,
+ COL_DATA0,
COL_ASCII = DATA_COLS + 1,
N_COLUMNS,
};
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);
+ sscanf(str, "%x", &address);
+
+ /* 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. */
+ sscanf(new_str, "%x", &new);
+
+ 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. */
+ sprintf(str, "%.2X", new);
+
+ /* 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)
{
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,
GtkWidget *
memwin_init(void)
{
+ GtkWidget *frame;
GtkWidget *scrollwin;
GtkListStore *store;
+ frame = gtk_frame_new("Internal memory");
+
scrollwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin),
GTK_SHADOW_ETCHED_OUT);
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
+ gtk_container_add(GTK_CONTAINER(frame), scrollwin);
+
/* Creating a model */
store = memwin_init_store();
-
-
/* 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);
*/
g_object_unref(store);
- return scrollwin;
+ return frame;
}
/* Dump up to 256 bytes from Address in Memory (direct addressing) */
unsigned int Address;
GtkListStore *store;
-#ifdef EMU8051_DEBUG
- printf("memwin_DumpD, address = %s\n", MemAddress);
-#endif
+ log_info("memwin_DumpD, address = %s", MemAddress);
if (strlen(MemAddress) != 0) {
if (STREQ(MemAddress, "PC"))
for (row = 0; row < DATA_ROWS; row++) {
int valid;
GtkTreeIter iter;
- char TextTmp[1024];
- int column, TextLength;
+ char str[4 + 2]; /* Maximum str len is for address column (4 digits) */
+ char ascii_str[DATA_COLS];
+ int col;
if (row == 0) {
/* Get first row in list store */
GTK_TREE_MODEL(store), &iter);
} else {
/* Get next row in list store */
- valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
+ valid = gtk_tree_model_iter_next(
+ GTK_TREE_MODEL(store), &iter);
}
if (!valid) {
return;
}
- sprintf(TextTmp, "%.4X", Address);
- gtk_list_store_set(store, &iter, COL_ADDRESS, TextTmp, -1);
+ /* Display base address. */
+ sprintf(str, "%.4X", Address);
+ gtk_list_store_set(store, &iter, COL_ADDRESS, str, -1);
- for (column = 0; column < DATA_COLS; column++) {
- sprintf(TextTmp, "%.2X",
- (int) cpu8051_ReadD(Address + column));
+ for (col = 0; col < DATA_COLS; col++) {
+ u_int8_t data;
- gtk_list_store_set(store, &iter, column + 1, TextTmp,
- -1);
- }
+ data = cpu8051_ReadD(Address + col);
+
+ /* Display hex data */
+ sprintf(str, "%.2X", (u_int8_t) data);
+ gtk_list_store_set(store, &iter, col + 1, str, -1);
- TextLength = 0;
- for (column = 0; column < DATA_COLS; 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], ".");
+ /* Append to ASCII string (if applicable). */
+ if (!isprint(data))
+ data = '.';
+ sprintf(&ascii_str[col], "%c", data);
}
- gtk_list_store_set(store, &iter, COL_ASCII, TextTmp, -1);
+ /* Display ASCII characters. */
+ gtk_list_store_set(store, &iter, COL_ASCII, ascii_str, -1);
Address += DATA_COLS;
}
projects / emu8051.git / blobdiff