X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fpgmwin.c;h=0e8961bd0d51d92a65174cd08e80908d898416de;hb=359b0be02becb952016f0f79f6e608c7737378e7;hp=196d2fb0e2c525bfc3f36d2cb8ae64662986570a;hpb=6a65dca9d597772744524b909f2d89b479b8bf77;p=emu8051.git

diff --git a/src/pgmwin.c b/src/pgmwin.c
index 196d2fb..0e8961b 100644
--- a/src/pgmwin.c
+++ b/src/pgmwin.c
@@ -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
@@ -26,176 +26,274 @@
 #include <stdio.h>
 
 #include "common.h"
+#include "memory.h"
 #include "cpu8051.h"
 #include "pgmwin.h"
+#include "hexfile.h"
 
+static GtkWidget *pgmlist;
 
-static GtkWidget *pgmclist;
-static int NbBreakpoints;
-static unsigned int Breakpoints[ MAXBP ];
-static unsigned int DisasmAddresses[ 24 ];
+#define LIST_VIEW_NAME "Program"
+#define DATA_ROWS 100
 
-
-/* Disasm 24 lines from CPU */
-void
-pgmwin_Disasm( )
+enum
 {
-  char TextTmp[255];
-  int row;
-  int InstSize;
-  unsigned int Address;
-
-  Address = cpu8051.pc;
-
-  gtk_clist_freeze( GTK_CLIST( pgmclist ) );
-  for ( row = 0; row < 24; row++ ) {
-    InstSize = cpu8051_Disasm( Address, TextTmp );
-    if ( pgmwin_IsBreakpoint( Address ) ) TextTmp[0] = '*';
-    gtk_clist_set_text( GTK_CLIST( pgmclist ), row, 0, TextTmp );
-    DisasmAddresses[ row ] = Address;
-    Address += InstSize;
-  }
-  gtk_clist_select_row( GTK_CLIST( pgmclist ), 0, 0 );
-  gtk_clist_thaw( GTK_CLIST( pgmclist ) );
-}
-
-
-/* Clear Breakpoint at Address from list */
-static void
-pgmwin_ClearBreakpoint( unsigned int Address )
+	COL_BREAKPT = 0,
+	COL_ADDR,
+	COL_B0,
+	COL_B1,
+	COL_B2,
+	COL_INST,
+	COL_ARGS,
+	COL_COLOR,
+	N_COLUMNS,
+};
+
+static char *col_names[N_COLUMNS] = {
+	"BPT",
+	"Address",
+	"B0",
+	"B1",
+	"B2",
+	"Mnemonic",
+	"Arguments",
+	"COLOR", /* Not displayed, used to set foreground color of cell. */
+};
+
+/* Creating a model */
+static GtkListStore *
+pgmwin_init_store(void)
 {
-  int Index = 0;
-
-  while( Index < NbBreakpoints && Breakpoints[ Index ] != Address ) {
-    Index++;
-  }
-  if( Breakpoints[ Index ] != Address ) {
-    return;
-  }
-  Breakpoints[ Index ] = Breakpoints[ NbBreakpoints - 1 ];
-  NbBreakpoints--;
+	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;
+
+	store = gtk_list_store_newv(N_COLUMNS, col_types);
+
+	/* Add rows. */
+	for (row = 0; row < DATA_ROWS; row++) {
+		gtk_list_store_append(store, &iter);
+
+		/* Color first row in red (current instruction). */
+		if (row == 0)
+			gtk_list_store_set(store, &iter, COL_COLOR, "red", -1);
+		else
+			gtk_list_store_set(store, &iter, COL_COLOR, "black", -1);
+	}
+
+	return store;
 }
 
-
-/* Set Breakpoint at Address from list. */
 static void
-pgmwin_SetBreakpoint( unsigned int Address )
+pgmwin_init_columns(void)
 {
-  if( pgmwin_IsBreakpoint( Address ) ) {
-    return;
-  }
-  if( NbBreakpoints < MAXBP ) {
-    Breakpoints[ NbBreakpoints++ ] = Address;
-  }
+	int k;
+	GtkCellRenderer *renderer;
+
+	/* Create renderer */
+	renderer = gtk_cell_renderer_text_new();
+
+	/* Add columns, except for last one (COL_COLOR). */
+	for (k = 0; k < COL_COLOR; k++) {
+		GtkTreeViewColumn *col;
+
+		/* Create tree view column */
+		col = gtk_tree_view_column_new();
+		gtk_tree_view_column_set_title(col, col_names[k]);
+		gtk_tree_view_column_set_sizing(col,
+						GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+		gtk_tree_view_append_column(GTK_TREE_VIEW(pgmlist), col);
+
+		/* Pack cell renderer into column */
+		gtk_tree_view_column_pack_start(col, renderer, TRUE);
+
+		/* Establish connection between cell renderer and data store. */
+		gtk_tree_view_column_set_attributes(col, renderer, "text", k,
+						    "foreground", COL_COLOR,
+						    NULL);
+	}
 }
 
-/* Toggle the breakpoint at Address. */
-static void
-pgmwin_ToggleBreakpoint( unsigned int Address )
+/* Mouse button pressed in the window. */
+static gint
+pgmwin_sel_changed_event(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-  if( pgmwin_IsBreakpoint( Address ) ) {
-    pgmwin_ClearBreakpoint( Address );
-  }
-  else {
-    pgmwin_SetBreakpoint( Address );
-  }
-}
+	GtkTreeSelection *selection;
+	GtkTreeModel     *model;
+	GtkTreeIter       iter;
 
+	log_debug("pgmwin_sel_changed_event()");
 
-#ifdef dsfdsfs
-/* Show Breakpoints list. */
-static void
-pgmwin_ShowBreakpoints( )
-{
-  int Index;
+	/* This will only work in single or browse selection mode! */
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pgmlist));
 
-  for ( Index = 0; Index < NbBreakpoints ; Index++ ) {
-    printf( "Breakpoint at Address = %.4X\n", Breakpoints[ Index ] );
-  }
-}
-#endif
+	if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+		char *str_addr;
+		int val;
 
+		gtk_tree_model_get(model, &iter, COL_ADDR, &str_addr, -1);
 
-/* Is the a breakpoint at Address. */
-int
-pgmwin_IsBreakpoint( unsigned int Address )
-{
-  int Index = 0;
-  while( Index < NbBreakpoints && Breakpoints[ Index ] != Address ) {
-    Index++;
-  }
+		/* Convert hex address in ASCII to integer. */
+		val = asciihex2int(str_addr);
 
-  return ( Breakpoints[ Index ] == Address && Index < NbBreakpoints );
-}
+		log_debug("  row address is: $%04X", val);
 
+		ToggleBreakpoint(val);
+		pgmwin_refresh();
 
-/* Mouse button pressed in the window. */
-static gint
-pgmwin_ButtonPressEvent( GtkWidget *widget, GdkEvent *event, gpointer data )
-{
-  gint row, column;
-  char TextTmp[ 255 ];
-
-  //g_print( "pgmwin_ButtonPressEvent(...)\n" );
-
-  gtk_clist_get_selection_info( GTK_CLIST( pgmclist ), ( int )event->button.x ,( int )event->button.y, &row, &column );
-  if (row >= 24 || row < 0)
-    return TRUE;
-  if (column >= 1 || column < 0)
-    return TRUE;
-  sprintf( TextTmp, "pgmwin_ButtonPressEvent( ) at %d,%d\n", column, row );
-  g_print( TextTmp );
-  pgmwin_ToggleBreakpoint( DisasmAddresses[ row ] );
-  pgmwin_Disasm();
-  
-  return FALSE;
-}
+		g_free(str_addr);
+	} else {
+		log_debug("  no row selected");
+	}
 
+	return FALSE;
+}
 
 GtkWidget *
-pgmwin_init( int width, int height )
+pgmwin_init(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 );
-
-  pgmclist = gtk_clist_new( 1 );
-  gtk_clist_set_selection_mode( GTK_CLIST( pgmclist ), GTK_SELECTION_SINGLE );
-  gtk_widget_set_usize( GTK_WIDGET( pgmclist ), width, height );
-  gtk_clist_set_column_justification( GTK_CLIST( pgmclist ), 0, GTK_JUSTIFY_LEFT );
-  gtk_clist_set_column_width( GTK_CLIST( pgmclist ), 0, width-10 );
-
-#if ( GTK_MAJOR_VERSION == 2)
-  PangoFontDescription *pango_font;
-  pango_font = pango_font_description_from_string( FIXED_FONT );
-  gtk_widget_modify_font( pgmclist, 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( pgmclist ), style );
-  }
-#endif
+	GtkWidget *frame;
+	GtkWidget *scrollwin;
+	GtkListStore *store;
+	GtkTreeSelection *selection;
+
+	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);
 
-  char *pgmdummy[] = { 0 };
-  for( i = 0; i < 24; i++ ) {
-    gtk_clist_append( GTK_CLIST( pgmclist ), pgmdummy );
-  }
+	gtk_container_add(GTK_CONTAINER(frame), scrollwin);
 
-  gtk_container_add( GTK_CONTAINER( fixed_frame ), pgmclist );
+	/* Creating a model */
+	store = pgmwin_init_store();
 
-  NbBreakpoints = 0;
+	/* Creating the view component */
+	pgmlist = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(pgmlist), TRUE);
+	gtk_container_add(GTK_CONTAINER(scrollwin), pgmlist);
 
-  gtk_signal_connect( GTK_OBJECT( pgmclist ), "button-press-event",
-		      GTK_SIGNAL_FUNC( pgmwin_ButtonPressEvent ), NULL );
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pgmlist));
 
-  return fixed_frame;
+	/* Only one row can be selected at a time. */
+	gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
+
+	g_signal_connect(selection, "changed",
+		G_CALLBACK(pgmwin_sel_changed_event), NULL);
+
+	pgmwin_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 disassembled program. */
+void
+pgmwin_refresh(void)
+{
+	int row;
+	GtkListStore *store;
+	unsigned int Address;
+
+	Address = cpu8051.pc;
+
+	store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(pgmlist)));
+
+	for (row = 0; row < DATA_ROWS; row++) {
+		int valid;
+		GtkTreeIter iter;
+		char str[128];
+		int k;
+		int col_id;
+		int InstSize;
+		unsigned char OpCode;
+
+		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;
+		}
+
+		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);
+
+			/* Display base address. */
+			int2asciihex(Address, str, 4);
+
+			gtk_list_store_set(store, &iter, COL_ADDR, str, -1);
+
+			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 < 3; k++, col_id++) {
+				if (k < InstSize)
+					int2asciihex(memory_read8(PGM_MEM_ID,
+								  Address + k),
+						     str, 2);
+				else
+					str[0] = '\0';
+
+				gtk_list_store_set(store, &iter, col_id, str, -1);
+			}
+
+			/* Display instruction menmonic. */
+			cpu8051_disasm_mnemonic(OpCode, str);
+			gtk_list_store_set(store, &iter, COL_INST, 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);
+
+			Address += InstSize;
+		}
+	}
 }