X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fregwin.c;h=8c4cd4d8a96b17d4aee4b0fe933b34277db75999;hb=8b2f6f3ebba84564f11f0087f257c94133c107fa;hp=92c90ce42721d3ee8679e374614537cb0b84e9d0;hpb=6a65dca9d597772744524b909f2d89b479b8bf77;p=emu8051.git diff --git a/src/regwin.c b/src/regwin.c index 92c90ce..8c4cd4d 100644 --- a/src/regwin.c +++ b/src/regwin.c @@ -1,5 +1,5 @@ /* - * regwin.cpp + * regwin.c * * Copyright (C) 1999 Jonathan St-André * Copyright (C) 1999 Hugo Villeneuve @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ #if HAVE_CONFIG_H @@ -28,126 +28,229 @@ #include "common.h" #include "reg8051.h" #include "cpu8051.h" +#include "sfr.h" +#include "memory.h" #include "regwin.h" +#include "memwin.h" +#include "pgmwin.h" +#include "instructions_8051.h" +#include "hexfile.h" +#include "emugtk.h" +static GtkWidget *reglist; -static GtkWidget *regclist; +#define LIST_VIEW_NAME "Registers" +#define DATA_ROWS SFR_REGS +enum +{ + COL_NAME = 0, + COL_VAL, + N_COLUMNS, +}; -GtkWidget * -regwin_init( int width, int height ) +/* Creating a model */ +static GtkListStore * +regwin_init_store(void) { - int i; - GtkWidget *fixed_frame; - - fixed_frame = gtk_frame_new(0); - gtk_frame_set_shadow_type( GTK_FRAME( fixed_frame ), GTK_SHADOW_ETCHED_OUT ); - gtk_widget_set_usize( GTK_WIDGET( fixed_frame ), width, height ); - - regclist = gtk_clist_new( 1 ); - gtk_clist_set_selection_mode( GTK_CLIST( regclist ), GTK_SELECTION_SINGLE ); - gtk_widget_set_usize( GTK_WIDGET( regclist ), width, height ); - gtk_clist_set_column_justification( GTK_CLIST( regclist ), 0, GTK_JUSTIFY_LEFT ); - gtk_clist_set_column_width( GTK_CLIST( regclist ), 0, width ); - -#if ( GTK_MAJOR_VERSION == 2) - PangoFontDescription *pango_font; - pango_font = pango_font_description_from_string( FIXED_FONT ); - gtk_widget_modify_font( regclist, pango_font ); -#else - { - GtkStyle *style; - /* Setting font for the widget. */ - style = gtk_style_new(); - gdk_font_unref( style->font ); - - /* Load a fixed font */ - style->font = gdk_font_load( FIXED_FONT ); - gtk_widget_set_style( GTK_WIDGET( regclist ), style ); - } -#endif + GtkTreeIter iter; + int row; + int col; + GtkListStore *store; + GType col_types[N_COLUMNS]; + + /* 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; - char *regdummy[] = { 0 }; - for ( i = 0; i < 24; i++ ) { - gtk_clist_append( GTK_CLIST( regclist ), regdummy ); - } - - gtk_container_add( GTK_CONTAINER( fixed_frame ), regclist ); + store = gtk_list_store_newv(N_COLUMNS, col_types); - return fixed_frame; + /* Add rows. */ + for (row = 0; row < DATA_ROWS; row++) + gtk_list_store_append(store, &iter); + + return store; } +static void +regwin_cell_edited(GtkCellRendererText *cell, gchar *path_string, + gchar *new_str, gpointer model) +{ + GtkTreeIter iter; + int old; + int new; + char *str; + struct regwin_infos_t *regwin_infos; + + if (!model) { + g_error("Unable to get model from cell renderer"); + } + + /* Get the iterator */ + gtk_tree_model_get_iter_from_string(model, &iter, path_string); + + /* Get register name. */ + gtk_tree_model_get(model, &iter, COL_NAME, &str, -1); + + log_info("Register: %s", str); + regwin_infos = sfr_get_infos(str); + + /* Read current (old) value. */ + gtk_tree_model_get(model, &iter, COL_VAL, &str, -1); + + old = asciihex2int(str); + + if (regwin_infos->w == 2) + log_info(" old value: $%02X", old); + else if (regwin_infos->w == 4) + log_info(" old value: $%04X", old); + + new = asciihex2int(new_str); + + if (regwin_infos->w == 2) { + if ((new < 0) || (new > 0xFF)) { + log_info(" new value: out of range"); + new = old; /* Put back old value... */ + } else { + log_info(" new value: $%02X", new); + } + } else if (regwin_infos->w == 4) { + if ((new < 0) || (new > 0xFFFF)) { + log_info(" new value: out of range"); + new = old; /* Put back old value... */ + } else { + log_info(" new value: $%04X", new); + } + } + + /* Store new value in emulator register. */ + regwin_write(regwin_infos, new); + + /* Store new value in gtk model. */ + int2asciihex(new, str, regwin_infos->w); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_VAL, str, -1); + + /* + * Make sure to update all windows. + * For example, R0-R7 values depends on internal memory values. + */ + emugtk_UpdateDisplay(); +}; + +static void +regwin_init_columns(void) +{ + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + + /* Columns and cell renderers */ + renderer = gtk_cell_renderer_text_new(); + + /* Add Register column */ + column = gtk_tree_view_column_new_with_attributes( + "Name", renderer, "text", COL_NAME, NULL); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + gtk_tree_view_append_column(GTK_TREE_VIEW(reglist), column); + + /* Add Value column */ + + /* Create new renderer for value column (editable). */ + 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(regwin_cell_edited), + gtk_tree_view_get_model(GTK_TREE_VIEW(reglist))); + + column = gtk_tree_view_column_new_with_attributes( + "Value", renderer, "text", COL_VAL, NULL); + gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + gtk_tree_view_append_column(GTK_TREE_VIEW(reglist), column); +} + +GtkWidget * +regwin_init(void) +{ + GtkWidget *frame; + GtkWidget *scrollwin; + GtkListStore *store; + + frame = gtk_frame_new(LIST_VIEW_NAME); + + 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 = regwin_init_store(); + + /* Creating the view component */ + reglist = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(reglist), TRUE); + gtk_container_add(GTK_CONTAINER(scrollwin), reglist); + + regwin_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; +} /* Show registers. */ void -regwin_Show( void ) +regwin_refresh(void) { - char TextTmp[255]; - int row = 0; - unsigned char PSW = cpu8051_ReadD( _PSW_ ); - unsigned char Rbank; - - gtk_clist_freeze( GTK_CLIST( regclist ) ); - - // Main registers - sprintf( TextTmp , "PC = %.4X", cpu8051.pc ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "SP = %.2X", cpu8051_ReadD( _SP_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "A = %.2X", cpu8051_ReadD( _ACC_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "B = %.2X", cpu8051_ReadD( _B_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "DPTR = %.4X", ( cpu8051_ReadD( _DPTRHIGH_ ) << 8 ) + cpu8051_ReadD( _DPTRLOW_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - - // Program Status Word - sprintf( TextTmp , "PSW = %.2X",PSW); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - - // Ports registers - sprintf( TextTmp , "P0 = %.2X", cpu8051_ReadD( _P0_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "P1 = %.2X", cpu8051_ReadD( _P1_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "P2 = %.2X", cpu8051_ReadD( _P2_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "P3 = %.2X", cpu8051_ReadD( _P3_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - - // Misc Registers - sprintf( TextTmp , "TCON = %.2X", cpu8051_ReadD( _TCON_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "TMOD = %.2X", cpu8051_ReadD( _TMOD_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "SCON = %.2X", cpu8051_ReadD( _SCON_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "IE = %.2X", cpu8051_ReadD( _IE_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "IP = %.2X", cpu8051_ReadD( _IP_ ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - - // R0-R7 Registers in current Bank - Rbank = cpu8051_ReadD( _PSW_ ) & 0x18; - sprintf( TextTmp , "Bank = %.2X", Rbank); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "R0 = %.2X", cpu8051_ReadD( _R0_ + Rbank ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "R1 = %.2X", cpu8051_ReadD( _R1_ + Rbank ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "R2 = %.2X", cpu8051_ReadD( _R2_ + Rbank ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "R3 = %.2X", cpu8051_ReadD( _R3_ + Rbank ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "R4 = %.2X", cpu8051_ReadD( _R4_ + Rbank ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "R5 = %.2X", cpu8051_ReadD( _R5_ + Rbank ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "R6 = %.2X", cpu8051_ReadD( _R6_ + Rbank ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - sprintf( TextTmp , "R7 = %.2X", cpu8051_ReadD( _R7_ + Rbank ) ); - gtk_clist_set_text( GTK_CLIST( regclist ), row++, 0, TextTmp ); - - gtk_clist_select_row(GTK_CLIST(regclist),0,0); - gtk_clist_thaw( GTK_CLIST( regclist ) ); + int row; + GtkListStore *store; + + store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(reglist))); + + for (row = 0; row < DATA_ROWS; row++) { + int valid; + GtkTreeIter iter; + int val; + char str[8]; + struct regwin_infos_t *regwin_infos; + + if (row == 0) { + /* Get first row in list store */ + valid = gtk_tree_model_get_iter_first( + GTK_TREE_MODEL(store), &iter); + } else { + /* Get next row in list store */ + valid = gtk_tree_model_iter_next( + GTK_TREE_MODEL(store), &iter); + } + + if (!valid) { + printf("Invalid iter...\n"); + return; + } + + regwin_infos = sfr_get_infos_from_row(row); + + val = regwin_read(row); + + /* Convert to specified number of hex digits. */ + int2asciihex(val, str, regwin_infos->w); + + gtk_list_store_set(store, &iter, + COL_NAME, regwin_infos->name, + COL_VAL, str, + -1); + } }