#include "cpu8051.h"
#include "regwin.h"
#include "memwin.h"
+#include "emugtk.h"
+#include "options.h"
+#include "app-config.h"
-static GtkWidget *memlist;
+extern struct app_config_t *cfg;
+extern struct options_t options;
-#define DATA_COLS 16 /* Must be a power of 2 */
-#define DATA_ROWS (INT_MEM_SIZE / DATA_COLS)
+static int COL_ASCII;
+static int N_COLUMNS;
enum
{
COL_ADDRESS = 0,
COL_DATA0,
- COL_ASCII = DATA_COLS + 1,
- 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;
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);
/* 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);
}
/* Store new value in emulator memory. */
- cpu8051_WriteD(address, new);
+ memory_write8(memory_id, address, new);
/* Convert to text. */
int2asciihex(new, str, 2);
* 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;
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++) {
+ 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 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));
- sprintf(col_name, "B%02d", i - COL_DATA0);
+ /* 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(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);
+}
+
+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);
+ }
+
+ return data_rows;
}
GtkWidget *
-memwin_init(void)
+memwin_init(char *title, int memory_id)
{
GtkWidget *frame;
GtkWidget *scrollwin;
GtkListStore *store;
+ GtkWidget *memlist;
+ int data_rows;
+
+ COL_ASCII = cfg->bits_per_row + 1;
+ N_COLUMNS = COL_ASCII + 1;
- 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),
gtk_container_add(GTK_CONTAINER(frame), scrollwin);
+ data_rows = compute_data_rows(memory_id);
+
/* 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
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;
+ 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 {
+ 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[16+1]; /* Maximum 16 data columns. */
int col;
if (row == 0) {
gtk_list_store_set(store, &iter, COL_ADDRESS, str, -1);
- for (col = 0; col < DATA_COLS; col++) {
+ for (col = 0; col < cfg->bits_per_row; col++) {
u_int8_t data;
- data = cpu8051_ReadD(Address + col);
+ data = memory_read8(memory_id, Address + col);
/* Display hex data */
int2asciihex(data, str, 2);
/* Display ASCII characters. */
gtk_list_store_set(store, &iter, COL_ASCII, ascii_str, -1);
- Address += DATA_COLS;
+ Address += cfg->bits_per_row;
}
}
projects / emu8051.git / blobdiff