static GtkWidget *pgmlist;
+#define LIST_VIEW_NAME "Program"
#define DATA_ROWS 100
enum
N_COLUMNS,
};
-char *col_names[N_COLUMNS] = {
+static char *col_names[N_COLUMNS] = {
"BPT",
"Address",
"B0",
pgmwin_init_store(void)
{
GtkTreeIter iter;
- int rows;
+ int row;
int col;
GtkListStore *store;
GType col_types[N_COLUMNS];
store = gtk_list_store_newv(N_COLUMNS, col_types);
- /* Initialize with rows of dummy data... */
- for (rows = 0; rows < DATA_ROWS; rows++) {
+ /* Add rows. */
+ for (row = 0; row < DATA_ROWS; row++) {
gtk_list_store_append(store, &iter);
- if (rows == 0) {
- /* Color first row in red (current instruction). */
+
+ /* Color first row in red (current instruction). */
+ if (row == 0)
gtk_list_store_set(store, &iter, COL_COLOR, "red", -1);
- } else {
+ else
gtk_list_store_set(store, &iter, COL_COLOR, "black", -1);
- }
}
return store;
log_debug(" row address is: $%04X", val);
ToggleBreakpoint(val);
- pgmwin_Disasm();
+ pgmwin_refresh();
g_free(str_addr);
} else {
GtkListStore *store;
GtkTreeSelection *selection;
- frame = gtk_frame_new("Program");
+ frame = gtk_frame_new(LIST_VIEW_NAME);
scrollwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin),
/* Show disassembled program. */
void
-pgmwin_Disasm(void)
+pgmwin_refresh(void)
{
int row;
GtkListStore *store;
return;
}
- /* Display breakpoints. */
- if (IsBreakpoint(Address))
- sprintf(str, "*");
- else
- str[0] = '\0';
+ if (Address > 0xFFFF) {
+ /*
+ * Not the most elegant solution, but it works to not
+ * display instructions past last address, 0xFFFF.
+ */
+ gtk_list_store_set(store, &iter,
+ COL_BREAKPT, NULL,
+ COL_ADDR, NULL,
+ COL_B0, NULL,
+ COL_B1, NULL,
+ COL_B2, NULL,
+ COL_INST, NULL,
+ COL_ARGS, NULL,
+ COL_COLOR, NULL,
+ -1);
+ } else {
+ /* Display breakpoints. */
+ if (IsBreakpoint(Address))
+ sprintf(str, "*");
+ else
+ str[0] = '\0';
- gtk_list_store_set(store, &iter, COL_BREAKPT, str, -1);
+ gtk_list_store_set(store, &iter, COL_BREAKPT, str, -1);
- /* Display base address. */
- int2asciihex(Address, str, 4);
+ /* Display base address. */
+ int2asciihex(Address, str, 4);
- gtk_list_store_set(store, &iter, COL_ADDR, str, -1);
+ gtk_list_store_set(store, &iter, COL_ADDR, str, -1);
- OpCode = memory_read8(PGM_MEM_ID, Address);
- InstSize = cpu8051_get_instruction_size(OpCode);
+ OpCode = memory_read8(PGM_MEM_ID, Address);
+ InstSize = cpu8051_get_instruction_size(OpCode);
- /* Display instruction hex bytes. */
- for (k = 0, col_id = COL_B0; k < InstSize; k++, col_id++) {
- int2asciihex(memory_read8(PGM_MEM_ID, Address + k),
- str, 2);
- gtk_list_store_set(store, &iter, col_id, str, -1);
- }
+ /* Display instruction hex bytes. */
+ for (k = 0, col_id = COL_B0; k < 3; k++, col_id++) {
+ if (k < InstSize)
+ int2asciihex(memory_read8(PGM_MEM_ID,
+ Address + k),
+ str, 2);
+ else
+ str[0] = '\0';
- /* Display instruction menmonic. */
- cpu8051_disasm_mnemonic(OpCode, str);
- gtk_list_store_set(store, &iter, COL_INST, str, -1);
+ gtk_list_store_set(store, &iter, col_id, str, -1);
+ }
- /* Display instruction arguments (if applicable). */
- str[0] = '\0';
- cpu8051_disasm_args(Address, str);
- gtk_list_store_set(store, &iter, COL_ARGS, str, -1);
+ /* Display instruction menmonic. */
+ cpu8051_disasm_mnemonic(OpCode, str);
+ gtk_list_store_set(store, &iter, COL_INST, str, -1);
- Address += InstSize;
+ /* Display instruction arguments (if applicable). */
+ str[0] = '\0';
+ cpu8051_disasm_args(Address, str);
+ gtk_list_store_set(store, &iter, COL_ARGS, str, -1);
+
+ Address += InstSize;
+ }
}
}