projects
/
emu8051.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use macro to set name of sub window
[emu8051.git]
/
src
/
pgmwin.c
diff --git
a/src/pgmwin.c
b/src/pgmwin.c
index
b139754
..
6760b66
100644
(file)
--- a/
src/pgmwin.c
+++ b/
src/pgmwin.c
@@
-33,6
+33,7
@@
static GtkWidget *pgmlist;
static GtkWidget *pgmlist;
+#define LIST_VIEW_NAME "Program"
#define DATA_ROWS 100
enum
#define DATA_ROWS 100
enum
@@
-48,7
+49,7
@@
enum
N_COLUMNS,
};
N_COLUMNS,
};
-char *col_names[N_COLUMNS] = {
+
static
char *col_names[N_COLUMNS] = {
"BPT",
"Address",
"B0",
"BPT",
"Address",
"B0",
@@
-64,7
+65,7
@@
static GtkListStore *
pgmwin_init_store(void)
{
GtkTreeIter iter;
pgmwin_init_store(void)
{
GtkTreeIter iter;
- int row
s
;
+ int row;
int col;
GtkListStore *store;
GType col_types[N_COLUMNS];
int col;
GtkListStore *store;
GType col_types[N_COLUMNS];
@@
-75,15
+76,15
@@
pgmwin_init_store(void)
store = gtk_list_store_newv(N_COLUMNS, col_types);
store = gtk_list_store_newv(N_COLUMNS, col_types);
- /*
Initialize with rows of dummy data..
. */
- for (row
s = 0; rows < DATA_ROWS; rows
++) {
+ /*
Add rows
. */
+ for (row
= 0; row < DATA_ROWS; row
++) {
gtk_list_store_append(store, &iter);
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);
gtk_list_store_set(store, &iter, COL_COLOR, "red", -1);
- } else {
+ else
gtk_list_store_set(store, &iter, COL_COLOR, "black", -1);
gtk_list_store_set(store, &iter, COL_COLOR, "black", -1);
- }
}
return store;
}
return store;
@@
-144,7
+145,7
@@
pgmwin_sel_changed_event(GtkWidget *widget, GdkEvent *event, gpointer data)
log_debug(" row address is: $%04X", val);
ToggleBreakpoint(val);
log_debug(" row address is: $%04X", val);
ToggleBreakpoint(val);
- pgmwin_
Disasm
();
+ pgmwin_
refresh
();
g_free(str_addr);
} else {
g_free(str_addr);
} else {
@@
-162,7
+163,7
@@
pgmwin_init(void)
GtkListStore *store;
GtkTreeSelection *selection;
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),
scrollwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollwin),
@@
-205,7
+206,7
@@
pgmwin_init(void)
/* Show disassembled program. */
void
/* Show disassembled program. */
void
-pgmwin_
Disasm
(void)
+pgmwin_
refresh
(void)
{
int row;
GtkListStore *store;
{
int row;
GtkListStore *store;
@@
-219,8
+220,7
@@
pgmwin_Disasm(void)
int valid;
GtkTreeIter iter;
char str[128];
int valid;
GtkTreeIter iter;
char str[128];
- int k;
- int col_id;
+ int k; int col_id;
int InstSize;
unsigned char OpCode;
int InstSize;
unsigned char OpCode;