--- a/src/gtkui/debug_win.c Mon May 12 10:00:13 2008 +0000 +++ b/src/gtkui/debug_win.c Mon Jul 14 07:44:42 2008 +0000 @@ -29,7 +29,7 @@ #include "aica/armdasm.h" GdkColor *msg_colors[] = { &gui_colour_error, &gui_colour_error, &gui_colour_warn, - &gui_colour_normal,&gui_colour_debug, &gui_colour_trace }; + &gui_colour_normal,&gui_colour_debug, &gui_colour_trace }; const cpu_desc_t cpu_list[4] = { &sh4_cpu_desc, &arm_cpu_desc, &armt_cpu_desc, NULL }; @@ -45,9 +45,9 @@ gpointer user_data); void on_jump_pc_btn_clicked( GtkButton *button, gpointer user_data); void on_disasm_list_select_row (GtkCList *clist, gint row, gint column, - GdkEvent *event, gpointer user_data); + GdkEvent *event, gpointer user_data); void on_disasm_list_unselect_row (GtkCList *clist, gint row, gint column, - GdkEvent *event, gpointer user_data); + GdkEvent *event, gpointer user_data); gboolean on_debug_delete_event(GtkWidget *widget, GdkEvent event, gpointer user_data); struct debug_window_info { @@ -65,10 +65,10 @@ }; debug_window_t debug_window_new( const gchar *title, GtkWidget *menubar, - GtkWidget *toolbar, GtkAccelGroup *accel_group ) + GtkWidget *toolbar, GtkAccelGroup *accel_group ) { debug_window_t data = g_malloc0( sizeof(struct debug_window_info) + cpu_list[0]->regs_size ); - GtkWidget *vbox; + GtkWidget *vbox; data->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size (GTK_WINDOW (data->window), 700, 480); @@ -88,15 +88,15 @@ GtkWidget *hbox1 = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (disasm_box), hbox1, FALSE, FALSE, 3); gtk_box_pack_start (GTK_BOX (hbox1), gtk_label_new (_("Page")), FALSE, FALSE, 4); - + data->page_field = GTK_ENTRY(gtk_entry_new ()); gtk_box_pack_start (GTK_BOX (hbox1), GTK_WIDGET(data->page_field), FALSE, TRUE, 0); - + GtkWidget *jump_pc_btn = gtk_button_new_with_mnemonic (_(" Jump to PC ")); gtk_box_pack_start (GTK_BOX (hbox1), jump_pc_btn, FALSE, FALSE, 4); - + gtk_box_pack_start (GTK_BOX (hbox1), gtk_label_new(_("Mode")), FALSE, FALSE, 5); - + GtkWidget *mode_box = gtk_combo_new (); gtk_box_pack_start (GTK_BOX (hbox1), mode_box, FALSE, FALSE, 0); GList *mode_box_items = NULL; @@ -119,19 +119,19 @@ gtk_clist_set_column_width( data->disasm_list, 1, 16 ); gtk_clist_column_titles_hide (GTK_CLIST (data->disasm_list)); gtk_container_add (GTK_CONTAINER (disasm_scroll), GTK_WIDGET(data->disasm_list)); - + GtkWidget *reg_scroll = gtk_scrolled_window_new (NULL, NULL); gtk_paned_pack2 (GTK_PANED (hpaned), reg_scroll, FALSE, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (reg_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (reg_scroll), GTK_SHADOW_IN); - + data->regs_list = GTK_CLIST(gtk_clist_new (2)); gtk_container_add (GTK_CONTAINER (reg_scroll), GTK_WIDGET(data->regs_list)); gtk_clist_set_column_width (GTK_CLIST (data->regs_list), 0, 80); gtk_clist_set_column_width (GTK_CLIST (data->regs_list), 1, 80); gtk_clist_column_titles_hide (GTK_CLIST (data->regs_list)); gtk_widget_modify_font( GTK_WIDGET(data->regs_list), gui_fixed_font ); - + vbox = gtk_vbox_new(FALSE, 0); gtk_container_add( GTK_CONTAINER(data->window), vbox ); gtk_box_pack_start( GTK_BOX(vbox), menubar, FALSE, FALSE, 0 ); @@ -140,30 +140,30 @@ gtk_box_pack_start( GTK_BOX(vbox), data->statusbar, FALSE, FALSE, 0 ); g_signal_connect ((gpointer) data->page_field, "key_press_event", - G_CALLBACK (on_page_field_key_press_event), - data); + G_CALLBACK (on_page_field_key_press_event), + data); g_signal_connect ((gpointer) jump_pc_btn, "clicked", - G_CALLBACK (on_jump_pc_btn_clicked), - data); + G_CALLBACK (on_jump_pc_btn_clicked), + data); g_signal_connect ((gpointer) mode_field, "changed", - G_CALLBACK (on_mode_field_changed), - data); + G_CALLBACK (on_mode_field_changed), + data); g_signal_connect ((gpointer) data->disasm_list, "select_row", - G_CALLBACK (on_disasm_list_select_row), - data); + G_CALLBACK (on_disasm_list_select_row), + data); g_signal_connect ((gpointer) data->disasm_list, "unselect_row", - G_CALLBACK (on_disasm_list_unselect_row), - data); + G_CALLBACK (on_disasm_list_unselect_row), + data); g_signal_connect ((gpointer) data->window, "delete_event", - G_CALLBACK (on_debug_delete_event), - data); - + G_CALLBACK (on_debug_delete_event), + data); + data->disasm_from = -1; data->disasm_to = -1; data->disasm_pc = -1; data->cpu = cpu_list[0]; data->cpu_list = cpu_list; - + init_register_list( data ); gtk_object_set_data( GTK_OBJECT(data->window), "debug_data", data ); set_disassembly_pc( data, *data->cpu->pc, FALSE ); @@ -176,18 +176,18 @@ void debug_window_show( debug_window_t data, gboolean show ) { if( show ) { - gtk_widget_show( data->window ); + gtk_widget_show( data->window ); } else { - gtk_widget_hide( data->window ); + gtk_widget_hide( data->window ); } } int debug_window_get_selected_row( debug_window_t data ) { if( data->disasm_list->selection == NULL ) { - return -1; + return -1; } else { - return GPOINTER_TO_INT(data->disasm_list->selection->data); + return GPOINTER_TO_INT(data->disasm_list->selection->data); } } @@ -253,7 +253,7 @@ char *arr[4] = { addr, " ", opcode, buf }; unsigned int from = page & 0xFFFFF000; unsigned int to = from + 4096; - + gtk_clist_clear(data->disasm_list); sprintf( addr, "%08X", from ); @@ -265,26 +265,26 @@ gtk_clist_set_foreground( data->disasm_list, 0, &gui_colour_error ); } else { for( i=from; icpu->disasm_func( i, buf, sizeof(buf), opcode ); + next = data->cpu->disasm_func( i, buf, sizeof(buf), opcode ); sprintf( addr, "%08X", i ); posn = gtk_clist_append( data->disasm_list, arr ); if( buf[0] == '?' ) gtk_clist_set_foreground( data->disasm_list, posn, &gui_colour_warn ); - if( data->cpu->get_breakpoint != NULL ) { - int type = data->cpu->get_breakpoint( i ); - switch(type) { - case BREAK_ONESHOT: - gtk_clist_set_background( data->disasm_list, posn, &gui_colour_temp_break ); - break; - case BREAK_KEEP: - gtk_clist_set_background( data->disasm_list, posn, &gui_colour_break ); - break; - } - } + if( data->cpu->get_breakpoint != NULL ) { + int type = data->cpu->get_breakpoint( i ); + switch(type) { + case BREAK_ONESHOT: + gtk_clist_set_background( data->disasm_list, posn, &gui_colour_temp_break ); + break; + case BREAK_KEEP: + gtk_clist_set_background( data->disasm_list, posn, &gui_colour_break ); + break; + } + } } if( data->disasm_pc != -1 && data->disasm_pc >= from && data->disasm_pc < to ) gtk_clist_set_foreground( data->disasm_list, address_to_row(data, data->disasm_pc), - &gui_colour_pc ); + &gui_colour_pc ); } if( page != from ) { /* not a page boundary */ @@ -297,7 +297,7 @@ void jump_to_disassembly( debug_window_t data, unsigned int addr, gboolean select ) { int row; - + if( addr < data->disasm_from || addr >= data->disasm_to ) set_disassembly_region(data,addr); @@ -318,13 +318,13 @@ void set_disassembly_pc( debug_window_t data, unsigned int pc, gboolean select ) { int row; - + jump_to_disassembly( data, pc, select ); if( data->disasm_pc != -1 && data->disasm_pc >= data->disasm_from && - data->disasm_pc < data->disasm_to ) + data->disasm_pc < data->disasm_to ) gtk_clist_set_foreground( data->disasm_list, - (data->disasm_pc - data->disasm_from) / data->cpu->instr_size, - &gui_colour_normal ); + (data->disasm_pc - data->disasm_from) / data->cpu->instr_size, + &gui_colour_normal ); row = address_to_row( data, pc ); gtk_clist_set_foreground( data->disasm_list, row, &gui_colour_pc ); data->disasm_pc = pc; @@ -334,15 +334,15 @@ { int i; for( i=0; data->cpu_list[i] != NULL; i++ ) { - if( strcmp( data->cpu_list[i]->name, cpu ) == 0 ) { - if( data->cpu != data->cpu_list[i] ) { - data->cpu = data->cpu_list[i]; - data->disasm_from = data->disasm_to = -1; /* Force reload */ - set_disassembly_pc( data, *data->cpu->pc, FALSE ); - init_register_list( data ); - } - return; - } + if( strcmp( data->cpu_list[i]->name, cpu ) == 0 ) { + if( data->cpu != data->cpu_list[i] ) { + data->cpu = data->cpu_list[i]; + data->disasm_from = data->disasm_to = -1; /* Force reload */ + set_disassembly_pc( data, *data->cpu->pc, FALSE ); + init_register_list( data ); + } + return; + } } } @@ -351,11 +351,11 @@ uint32_t pc = row_to_address( data, row ); int oldType = data->cpu->get_breakpoint( pc ); if( oldType != BREAK_NONE ) { - data->cpu->clear_breakpoint( pc, oldType ); - gtk_clist_set_background( data->disasm_list, row, &gui_colour_white ); + data->cpu->clear_breakpoint( pc, oldType ); + gtk_clist_set_background( data->disasm_list, row, &gui_colour_white ); } else { - data->cpu->set_breakpoint( pc, BREAK_KEEP ); - gtk_clist_set_background( data->disasm_list, row, &gui_colour_break ); + data->cpu->set_breakpoint( pc, BREAK_KEEP ); + gtk_clist_set_background( data->disasm_list, row, &gui_colour_break ); } } @@ -382,12 +382,12 @@ int address_to_row( debug_window_t data, uint32_t address ) { if( data->disasm_from > address || data->disasm_to <= address ) - return -1; + return -1; return (address - data->disasm_from) / data->cpu->instr_size; } debug_window_t get_debug_info( GtkWidget *widget ) { - + GtkWidget *win = gtk_widget_get_toplevel(widget); debug_window_t data = (debug_window_t)gtk_object_get_data( GTK_OBJECT(win), "debug_data" ); return data; @@ -396,8 +396,8 @@ void debug_window_set_running( debug_window_t data, gboolean isRunning ) { if( data != NULL ) { - gtk_gui_enable_action( "SingleStep", !isRunning ); - gtk_gui_enable_action( "RunTo", !isRunning && dreamcast_can_run() ); + gtk_gui_enable_action( "SingleStep", !isRunning ); + gtk_gui_enable_action( "RunTo", !isRunning && dreamcast_can_run() ); } } @@ -412,7 +412,7 @@ gpointer user_data) { if( event->keyval == GDK_Return || event->keyval == GDK_Linefeed ) { - debug_window_t data = get_debug_info(widget); + debug_window_t data = get_debug_info(widget); const gchar *text = gtk_entry_get_text( GTK_ENTRY(widget) ); gchar *endptr; unsigned int val = strtoul( text, &endptr, 16 ); @@ -435,14 +435,14 @@ } void on_disasm_list_select_row (GtkCList *clist, gint row, gint column, - GdkEvent *event, gpointer user_data) + GdkEvent *event, gpointer user_data) { gtk_gui_enable_action( "SetBreakpoint", TRUE ); gtk_gui_enable_action( "RunTo", dreamcast_can_run() ); } void on_disasm_list_unselect_row (GtkCList *clist, gint row, gint column, - GdkEvent *event, gpointer user_data) + GdkEvent *event, gpointer user_data) { gtk_gui_enable_action( "SetBreakpoint", FALSE ); gtk_gui_enable_action( "RunTo", FALSE );