#endif
#include <stdio.h>
+#include <ctype.h> /* For isprint */
#include "common.h"
#include "memory.h"
static GtkWidget *memlist;
+#define DATA_COLS 16 /* Must be a power of 2 */
+#define DATA_ROWS (INT_MEM_SIZE / DATA_COLS)
+
enum
{
COL_ADDRESS = 0,
- COL_ASCII = 17,
+ COL_ASCII = DATA_COLS + 1,
N_COLUMNS,
};
-GtkWidget *
-memwin_init(void)
+/* Creating a model */
+static GtkListStore *
+memwin_init_store(void)
{
- int i;
+ GtkTreeIter iter;
int rows;
- GtkWidget *scrollwin;
- GtkCellRenderer *renderer;
- GtkTreeViewColumn *column;
+ int col;
GtkListStore *store;
- GtkTreeIter iter;
-
- scrollwin = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin),
- GTK_SHADOW_ETCHED_OUT);
-
- /* Automatically add scrollbars when necessary. */
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ GType col_types[N_COLUMNS];
- /* Creating a model */
- store = gtk_list_store_new(N_COLUMNS,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING);
+ for (col = 0; col < N_COLUMNS; col++) {
+ col_types[col] = G_TYPE_STRING;
+ }
- /* 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);
+ store = gtk_list_store_newv(N_COLUMNS, col_types);
- gtk_container_add(GTK_CONTAINER(scrollwin), memlist);
+ /* Initialize with rows of dummy data... */
+ for (rows = 0; rows < DATA_ROWS; rows++) {
+ /* Add new row. */
+ gtk_list_store_append(store, &iter);
+ }
- g_object_unref(store);
+ return store;
+}
+static void
+memwin_init_columns(void)
+{
+ int i;
+ GtkCellRenderer *renderer;
+ GtkTreeViewColumn *column;
/* Columns and cell renderers */
renderer = gtk_cell_renderer_text_new();
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 < 17; i++) {
+ for (i = 1; i < (DATA_COLS + 1); i++) {
column = gtk_tree_view_column_new_with_attributes(
"Val", 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);
}
+ /* 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);
+}
- /* Initialize with 16 rows of dummy data... */
- for (rows = 0; rows < 16; rows++) {
- /* Add new row. */
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, COL_ADDRESS, "0x0000", -1);
- }
+GtkWidget *
+memwin_init(void)
+{
+ GtkWidget *frame;
+ GtkWidget *scrollwin;
+ GtkListStore *store;
- return scrollwin;
+ 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);
+
+ /* 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(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);
+ gtk_container_add(GTK_CONTAINER(scrollwin), memlist);
+
+ memwin_init_columns();
+
+ /*
+ * 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 up to 256 bytes from Address in Memory (direct addressing) */
void
memwin_DumpD(char *MemAddress)
{
store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(memlist)));
- for (row = 0; row < 16; row++) {
+ 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 < 16; 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 < 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], ".");
+ /* Append to ASCII string (if applicable). */
+ if (!isprint(data))
+ data = '.';
+ sprintf(&ascii_str[col], "%c", data);
}
- gtk_list_store_set(store, &iter, 17, TextTmp, -1);
+ /* Display ASCII characters. */
+ gtk_list_store_set(store, &iter, COL_ASCII, ascii_str, -1);
- Address += 16;
+ Address += DATA_COLS;
}
}