From: Philip K. <pa...@us...> - 2004-05-29 11:28:58
|
Update of /cvsroot/fuse-emulator/fuse/ui/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14935/ui/gtk Modified Files: debugger.c Log Message: Display the DEC if the Timex memory capability is set (as it controls dock/exrom selection). Display both DEC and HSR if SE memory capability set. Display ZXCF memory control port if ZXCF active. Index: debugger.c =================================================================== RCS file: /cvsroot/fuse-emulator/fuse/ui/gtk/debugger.c,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** debugger.c 28 May 2004 11:45:02 -0000 1.64 --- debugger.c 29 May 2004 11:28:49 -0000 1.65 *************** *** 44,50 **** --- 44,52 ---- #include "memory.h" #include "scld.h" + #include "settings.h" #include "ui/ui.h" #include "z80/z80.h" #include "z80/z80_macros.h" + #include "zxcf.h" /* The various debugger panes */ *************** *** 701,705 **** } ! if( capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_VIDEO ) { sprintf( format_string, "\nTmxDec %s", format_8_bit() ); length = strlen( buffer ); --- 703,709 ---- } ! if( capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_VIDEO || ! capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_MEMORY || ! capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_SE_MEMORY ) { sprintf( format_string, "\nTmxDec %s", format_8_bit() ); length = strlen( buffer ); *************** *** 708,712 **** } ! if( capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_MEMORY ) { sprintf( format_string, "\nTmxHsr %s", format_8_bit() ); length = strlen( buffer ); --- 712,717 ---- } ! if( capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_MEMORY || ! capabilities & LIBSPECTRUM_MACHINE_CAPABILITY_SE_MEMORY ) { sprintf( format_string, "\nTmxHsr %s", format_8_bit() ); length = strlen( buffer ); *************** *** 714,717 **** --- 719,729 ---- } + if( settings_current.zxcf_active ) { + sprintf( format_string, "\n ZXCF %s", format_8_bit() ); + length = strlen( buffer ); + snprintf( &buffer[length], 1024-length, format_string, + zxcf_last_memctl() ); + } + gtk_label_set_text( GTK_LABEL( registers[17] ), buffer ); |