Previous 15994 Revisions Next

r3564 Wednesday 26th November, 2008 at 04:57:42 UTC by R. Belmont
[SDLMESS] Sync with SDLMAME u4. OS X debugger is only lightly tested, so be careful.
[src/osd/sdl]debug-intf.c debug-intf.h debugosx.c debugwin.c

src/osd/sdl/debugwin.c
r3563r3564
22//
33//  debugwin.c - SDL/GTK+ debug window handling
44//
5//  Copyright (c) 1996-2007, Nicola Salmoria and the MAME Team.
5//  Copyright (c) 1996-2009, Nicola Salmoria and the MAME Team.
66//  Visit http://mamedev.org for licensing and usage restrictions.
77//
88//  SDLMAME by Olivier Galibert and R. Belmont
r3563r3564
1414#include <gdk/gdkkeysyms.h>
1515#include <gtk/gtk.h>
1616
17#include "dview.h"
1718#include "debug-intf.h"
1819#include "debug-sup.h"
1920#include "debug-cb.h"
2021
21#include "dview.h"
22#include "deprecat.h"
23
2422typedef struct hentry {
2523   struct hentry *h;
2624   char *e;
r3563r3564
3129   struct hentry *h, *ch;
3230   char *hold;
3331   int keep_last;
34   void (*cb)(const char *, void *);
32   void (*cb)(running_machine *,const char *, void *);
3533   void *cbp;
34   running_machine *machine;
3635} edit;
3736
3837typedef struct {
r3563r3564
4342   debug_view *disasm;
4443   debug_view *registers;
4544   int cpu;
45   running_machine *machine;
4646} debugmain_i;
4747
4848typedef struct memorywin_i {
r3563r3564
5252   edit ed;
5353   GtkComboBox *zone_w;
5454   debug_view *memory;
55   running_machine *machine;
5556} memorywin_i;
5657
5758typedef struct disasmwin_i {
r3563r3564
6162   edit ed;
6263   GtkComboBox *cpu_w;
6364   debug_view *disasm;
65   running_machine *machine;
6466} disasmwin_i;
6567
6668typedef struct logwin_i {
r3563r3564
6870   GtkWidget *win;
6971   DView *log_w;
7072   debug_view *log;
73   running_machine *machine;
7174} logwin_i;
7275
7376typedef struct memorycombo_item
r3563r3564
8184   UINT8               offset_xor;
8285   UINT8               little_endian;
8386   UINT8               prefsize;
87   running_machine *machine;
8488} memorycombo_item;
8589
8690
r3563r3564
9195
9296static memorycombo_item *memorycombo;
9397
94static void debugmain_init(void);
98static void debugmain_init(running_machine *machine);
9599
96100static void debugwin_show(int show)
97101{
r3563r3564
125129   // first add all the CPUs' address spaces
126130   for (cpunum = 0; cpunum < MAX_CPU; cpunum++)
127131   {
128      const debug_cpu_info *cpuinfo = debug_get_cpu_info(cpunum);
129      if (cpuinfo->valid)
132      if (machine->cpu[cpunum] != NULL)
133      {
134                const cpu_debug_data *cpuinfo = cpu_get_debug_data(machine->cpu[cpunum]);
135
130136         for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
137         {
131138            if (cpuinfo->space[spacenum].databytes)
132139            {
133140               memorycombo_item *ci = malloc_or_die(sizeof(*ci));
134141               memset(ci, 0, sizeof(*ci));
135142               ci->cpunum = cpunum;
136143               ci->spacenum = spacenum;
144               ci->machine = machine;
137145               ci->prefsize = MIN(cpuinfo->space[spacenum].databytes, 8);
138146
139               snprintf(ci->name, ARRAY_LENGTH(ci->name), "CPU #%d \"%s\" (%s) %s memory", cpunum, machine->config->cpu[cpunum].tag, cpunum_name(cpunum), address_space_names[spacenum]);
147               snprintf(ci->name, ARRAY_LENGTH(ci->name), "CPU #%d \"%s\" (%s) %s memory", cpunum, machine->config->cpu[cpunum].tag, cpu_get_name(machine->cpu[cpunum]), address_space_names[spacenum]);
140148
141149               *tail = ci;
142150               tail = &ci->next;
143151            }
152         }
153      }
144154   }
145155
146156   // then add all the memory regions
r3563r3564
157167      ci->prefsize = MIN(width, 8);
158168      ci->offset_xor = width - 1;
159169      ci->little_endian = little_endian;
170      ci->machine = machine;
160171
161172      snprintf(ci->name, ARRAY_LENGTH(ci->name), "Region \"%s\"", rgntag);
162173
r3563r3564
185196         ci->length = valcount * valsize;
186197         ci->prefsize = MIN(valsize, 8);
187198         ci->little_endian = TRUE;
199         ci->machine = machine;
188200         strcpy(ci->name, strrchr(name, '/') + 1);
189201         *tail = ci;
190202         tail = &ci->next;
r3563r3564
225237   edit *e = user_data;
226238   const char *text = gtk_entry_get_text(e->edit_w);
227239   edit_add_hist(e, text);
228   e->cb(text, e->cbp);
240   e->cb(e->machine, text, e->cbp);
229241   edit_set_field(e);
230242   
231243}
r3563r3564
283295
284296static gboolean edit_key(GtkWidget *item, GdkEventKey *k, gpointer user_data)
285297{
298   edit *e = (edit *)user_data;
299
286300   switch(k->keyval) {
287301   case GDK_Up:
288      edit_hist_back((edit *)user_data);
302      edit_hist_back(e);
289303      return TRUE;
290304   case GDK_Down:
291      edit_hist_forward((edit *)user_data);
305      edit_hist_forward(e);
292306      return TRUE;
293307   }
294308   return FALSE;
295309}
296310
297static void edit_init(edit *e, GtkWidget *w, const char *ft, int kl, void (*cb)(const char *, void *), void *cbp)
311static void edit_init(running_machine *machine, edit *e, GtkWidget *w, const char *ft, int kl, void (*cb)(running_machine *, const char *, void *), void *cbp)
298312{
299313   e->edit_w = GTK_ENTRY(w);
300314   e->h = 0;
r3563r3564
303317   e->keep_last = kl;
304318   e->cb = cb;
305319   e->cbp = cbp;
320   e->machine = machine;
306321   if(ft)
307322      edit_add_hist(e, ft);
308323   edit_set_field(e);
r3563r3564
370385      debug_view_set_property_UINT32(dmain->registers, DVP_REGS_CPUNUM, cpunum);
371386
372387      // then update the caption
373      sprintf(title, "Debug: %s - CPU #%d \"%s\" (%s)", machine->gamedrv->name, cpunum, machine->config->cpu[cpunum].tag, cpunum_name(cpunum));
388      sprintf(title, "Debug: %s - CPU #%d \"%s\" (%s)", machine->gamedrv->name, cpunum, machine->config->cpu[cpunum].tag, cpu_get_name(machine->cpu[cpunum]));
374389      gtk_window_set_title(GTK_WINDOW(dmain->win), title);
375390      debugmain_update_checks(dmain);
376391   }
r3563r3564
385400   if(!dmain) {
386401      // GTK init should probably be done earlier
387402      gtk_init(0, 0);
388      debugmain_init();
403      debugmain_init(machine);
389404   }
390405
391406   // update the views in the console to reflect the current CPU
392   debugmain_set_cpunum(machine, cpu_getactivecpu());
407   debugmain_set_cpunum(machine, cpunum_get_active());
393408
394409   debugwin_show(1);
395410   gtk_main_iteration();
r3563r3564
401416      gtk_main_iteration_do(FALSE);
402417}
403418
404static void debugmain_process_string(const char *str, void *dmp)
419static void debugmain_process_string(running_machine *machine, const char *str, void *dmp)
405420{
406421   if(!str[0])
407      debug_cpu_single_step(1);
422      debug_cpu_single_step(machine, 1);
408423   else
409      debug_console_execute_command(Machine, str, 1);
424      debug_console_execute_command(machine, str, 1);
410425}
411426
412427static void debugmain_destroy(GtkObject *obj, gpointer user_data)
413428{
414   mame_schedule_exit(Machine);
429   debugmain_i *dmain = (debugmain_i *)user_data;
430
431   mame_schedule_exit(dmain->machine);
415432}
416433
417static void debugmain_init(void)
434static void debugmain_init(running_machine *machine)
418435{
419436   dmain = malloc(sizeof(*dmain));
420437   memset(dmain, 0, sizeof(*dmain));
421   dmain->win = create_debugmain();
438   dmain->win = create_debugmain(machine);
422439   dmain->cpu = -1;
440   dmain->machine = machine;
423441
424442   dmain->console_w   = DVIEW(lookup_widget(dmain->win, "console"));
425443   dmain->disasm_w    = DVIEW(lookup_widget(dmain->win, "disasm"));
426444   dmain->registers_w = DVIEW(lookup_widget(dmain->win, "registers"));
427445
428   dmain->console   = debug_view_alloc(DVT_CONSOLE);
429   dmain->disasm    = debug_view_alloc(DVT_DISASSEMBLY);
430   dmain->registers = debug_view_alloc(DVT_REGISTERS);
446   dmain->console   = debug_view_alloc(machine, DVT_CONSOLE);
447   dmain->disasm    = debug_view_alloc(machine, DVT_DISASSEMBLY);
448   dmain->registers = debug_view_alloc(machine, DVT_REGISTERS);
431449
432450   dview_set_debug_view(dmain->console_w,   dmain->console);
433451   dview_set_debug_view(dmain->disasm_w,    dmain->disasm);
r3563r3564
435453
436454   dview_this_one_is_stupidly_autoscrolling(dmain->console_w);
437455
438   edit_init(&dmain->ed, lookup_widget(dmain->win, "edit"), 0, 0, debugmain_process_string, &dmain);
456   edit_init(machine, &dmain->ed, lookup_widget(dmain->win, "edit"), 0, 0, debugmain_process_string, &dmain);
439457
440458   debug_view_begin_update(dmain->disasm);
441459   debug_view_set_property_string(dmain->disasm, DVP_DASM_EXPRESSION, "curpc");
442460   debug_view_set_property_UINT32(dmain->disasm, DVP_DASM_TRACK_LIVE, 1);
443461   debug_view_end_update(dmain->disasm);
444462
445   g_signal_connect(dmain->win, "destroy", G_CALLBACK(debugmain_destroy), 0);
463   g_signal_connect(dmain->win, "destroy", G_CALLBACK(debugmain_destroy), dmain);
446464   g_signal_connect(lookup_widget(dmain->win, "raw_opcodes"), "activate", G_CALLBACK(debugmain_raw_opcodes_activate), dmain);
447465   g_signal_connect(lookup_widget(dmain->win, "enc_opcodes"), "activate", G_CALLBACK(debugmain_enc_opcodes_activate), dmain);
448466   g_signal_connect(lookup_widget(dmain->win, "comments"),    "activate", G_CALLBACK(debugmain_comments_activate), dmain);
r3563r3564
483501   memorywin_update_selection(mem, ci);
484502}
485503
486static void memorywin_process_string(const char *str, void *memp)
504static void memorywin_process_string(running_machine *machine, const char *str, void *memp)
487505{
488506   memorywin_i *mem = memp;
489507   debug_view_set_property_string(mem->memory, DVP_MEM_EXPRESSION, str);
r3563r3564
506524static void memorywin_new(running_machine *machine)
507525{
508526   memorywin_i *mem;
509   int item, cursel, curcpu = cpu_getactivecpu();
527   int item, cursel, curcpu = cpunum_get_active();
510528   memorycombo_item *ci, *selci = NULL;
511529
512530   mem = malloc(sizeof(*mem));
513531   memset(mem, 0, sizeof(*mem));
514532   mem->next = memorywin_list;
515533   memorywin_list = mem;
516   mem->win = create_memorywin();
534   mem->win = create_memorywin(machine);
535   mem->machine = machine;
517536
518537   mem->memory_w = DVIEW(lookup_widget(mem->win, "memoryview"));
519538   mem->zone_w   = GTK_COMBO_BOX(lookup_widget(mem->win, "zone"));
520539
521   mem->memory = debug_view_alloc(DVT_MEMORY);
540   mem->memory = debug_view_alloc(machine, DVT_MEMORY);
522541
523542   dview_set_debug_view(mem->memory_w, mem->memory);
524543
525   edit_init(&mem->ed, lookup_widget(mem->win, "edit"), "0", 1, memorywin_process_string, mem);
544   edit_init(machine, &mem->ed, lookup_widget(mem->win, "edit"), "0", 1, memorywin_process_string, mem);
526545
527546   debug_view_begin_update(mem->memory);
528547   debug_view_set_property_string(mem->memory, DVP_MEM_EXPRESSION, "0");
r3563r3564
578597
579598   disasmwin_update_checks(info);
580599
581   sprintf(title, "Disassembly: CPU #%d \"%s\" (%s)", cpunum, Machine->config->cpu[cpunum].tag, cpunum_name(cpunum));
600   sprintf(title, "Disassembly: CPU #%d \"%s\" (%s)", cpunum, info->machine->config->cpu[cpunum].tag, cpu_get_name(info->machine->cpu[cpunum]));
582601   gtk_window_set_title(GTK_WINDOW(info->win), title);
583602}
584603
r3563r3564
589608   item = 0;
590609   for (cpunum = 0; cpunum < MAX_CPU; cpunum++)
591610   {
592      const debug_cpu_info *cpuinfo = debug_get_cpu_info(cpunum);
593      if (cpuinfo->valid)
611      if (dis->machine->cpu[cpunum] != NULL)
612      {
613         const cpu_debug_data *cpuinfo = cpu_get_debug_data(dis->machine->cpu[cpunum]);
614
594615         if (cpuinfo->space[ADDRESS_SPACE_PROGRAM].databytes)
595616         {
596617            if(item == sel) {
r3563r3564
599620            }
600621            item++;
601622         }
623      }
602624   }
603625}
604626
r3563r3564
632654   }
633655}
634656
635static void disasmwin_process_string(const char *str, void *disp)
657static void disasmwin_process_string(running_machine *machine, const char *str, void *disp)
636658{
637659   disasmwin_i *dis = disp;
638660   debug_view_set_property_string(dis->disasm, DVP_DASM_EXPRESSION, str);
r3563r3564
652674   free(dis);
653675}
654676
655static void disasmwin_new(void)
677static void disasmwin_new(running_machine *machine)
656678{
657679   disasmwin_i *dis;
658   int cpunum, curcpu = cpu_getactivecpu();
680   int cpunum, curcpu = cpunum_get_active();
659681   int item, citem;
660682
661683   dis = malloc(sizeof(*dis));
662684   memset(dis, 0, sizeof(*dis));
663685   dis->next = disasmwin_list;
664686   disasmwin_list = dis;
665   dis->win = create_disasmwin();
687   dis->win = create_disasmwin(machine);
688   dis->machine = machine;
666689
667690   dis->disasm_w = DVIEW(lookup_widget(dis->win, "disasmview"));
668691   dis->cpu_w    = GTK_COMBO_BOX(lookup_widget(dis->win, "cpu"));
669692
670   dis->disasm = debug_view_alloc(DVT_DISASSEMBLY);
693   dis->disasm = debug_view_alloc(machine, DVT_DISASSEMBLY);
671694
672695   dview_set_debug_view(dis->disasm_w, dis->disasm);
673696
674   edit_init(&dis->ed, lookup_widget(dis->win, "edit"), "curpc", 1, disasmwin_process_string, dis);
697   edit_init(machine, &dis->ed, lookup_widget(dis->win, "edit"), "curpc", 1, disasmwin_process_string, dis);
675698
676699   debug_view_begin_update(dis->disasm);
677700   debug_view_set_property_string(dis->disasm, DVP_DASM_EXPRESSION, "curpc");
r3563r3564
683706   citem = -1;
684707   for (cpunum = 0; cpunum < MAX_CPU; cpunum++)
685708   {
686      const debug_cpu_info *cpuinfo = debug_get_cpu_info(cpunum);
687      if (cpuinfo->valid)
709      if (machine->cpu[cpunum] != NULL)
710      {
711         const cpu_debug_data *cpuinfo = cpu_get_debug_data(machine->cpu[cpunum]);
688712         if (cpuinfo->space[ADDRESS_SPACE_PROGRAM].databytes)
689713         {
690714            char name[100];
691            sprintf(name, "CPU #%d \"%s\" (%s)", cpunum, Machine->config->cpu[cpunum].tag, cpunum_name(cpunum));
715            sprintf(name, "CPU #%d \"%s\" (%s)", cpunum, machine->config->cpu[cpunum].tag, cpu_get_name(machine->cpu[cpunum]));
692716            gtk_combo_box_append_text(dis->cpu_w, name);
693717            if(cpunum == curcpu)
694718               citem = item;
695719            item++;
696720         }
721      }
697722   }
698723
699724   if(citem == -1) {
r3563r3564
727752   free(log);
728753}
729754
730static void logwin_new(void)
755static void logwin_new(running_machine *machine)
731756{
732757   logwin_i *log;
733758
r3563r3564
735760   memset(log, 0, sizeof(*log));
736761   log->next = logwin_list;
737762   logwin_list = log;
738   log->win = create_logwin();
763   log->win = create_logwin(machine);
764   log->machine = machine;
739765
740766   log->log_w = DVIEW(lookup_widget(log->win, "logview"));
741767
742   log->log = debug_view_alloc(DVT_LOG);
768   log->log = debug_view_alloc(machine, DVT_LOG);
743769
744770   dview_this_one_is_stupidly_autoscrolling(log->log_w);
745771   dview_set_debug_view(log->log_w, log->log);
r3563r3564
750776
751777void on_new_mem_activate(GtkMenuItem *item, gpointer user_data)
752778{
753   memorywin_new(Machine);
779   memorywin_new((running_machine *)user_data);
754780}
755781
756782void on_new_disasm_activate(GtkMenuItem *item, gpointer user_data)
757783{
758   disasmwin_new();
784   disasmwin_new((running_machine *)user_data);
759785}
760786
761787void on_new_errorlog_activate(GtkMenuItem *item, gpointer user_data)
762788{
763   logwin_new();
789   logwin_new((running_machine *)user_data);
764790}
765791
766792void on_run_activate(GtkMenuItem *item, gpointer user_data)
767793{
768   debug_cpu_go(~0);
794   debug_cpu_go((running_machine *)user_data, ~0);
769795}
770796
771797void on_run_h_activate(GtkMenuItem *item, gpointer user_data)
772798{
773799   debugwin_show(0);
774   debug_cpu_go(~0);
800   debug_cpu_go((running_machine *)user_data, ~0);
775801}
776802
777803void on_run_cpu_activate(GtkMenuItem *item, gpointer user_data)
778804{
779   debug_cpu_next_cpu();
805   debug_cpu_next_cpu((running_machine *)user_data);
780806}
781807
782808void on_run_irq_activate(GtkMenuItem *item, gpointer user_data)
783809{
784   debug_cpu_go_interrupt(-1);
810   debug_cpu_go_interrupt((running_machine *)user_data, -1);
785811}
786812
787813void on_run_vbl_activate(GtkMenuItem *item, gpointer user_data)
788814{
789   debug_cpu_go_vblank();
815   debug_cpu_go_vblank((running_machine *)user_data);
790816}
791817
792818void on_step_into_activate(GtkMenuItem *item, gpointer user_data)
793819{
794   debug_cpu_single_step(1);
820   debug_cpu_single_step((running_machine *)user_data, 1);
795821}
796822
797823void on_step_over_activate(GtkMenuItem *item, gpointer user_data)
798824{
799   debug_cpu_single_step_over(1);
825   debug_cpu_single_step_over((running_machine *)user_data, 1);
800826}
801827
802828void on_step_out_activate(GtkMenuItem *item, gpointer user_data)
803829{
804   debug_cpu_single_step_out();
830   debug_cpu_single_step_out((running_machine *)user_data);
805831}
806832
807833void on_hard_reset_activate(GtkMenuItem *item, gpointer user_data)
808834{
809   mame_schedule_hard_reset(Machine);
835   mame_schedule_hard_reset((running_machine *)user_data);
810836}
811837
812838void on_soft_reset_activate(GtkMenuItem *item, gpointer user_data)
813839{
814   mame_schedule_soft_reset(Machine);
815   debug_cpu_go(~0);
840   mame_schedule_soft_reset((running_machine *)user_data);
841   debug_cpu_go((running_machine *)user_data, ~0);
816842}
817843
818844void on_exit_activate(GtkMenuItem *item, gpointer user_data)
819845{
820   mame_schedule_exit(Machine);
846   mame_schedule_exit((running_machine *)user_data);
821847}
822848
823849void on_chunks_1_activate(GtkMenuItem *item, gpointer user_data)
src/osd/sdl/debugosx.c
r3563r3564
22//
33//  debugosx.c - MacOS X debug window handling
44//
5//  Copyright (c) 1996-2007, Nicola Salmoria and the MAME Team.
5//  Copyright (c) 1996-2008, Nicola Salmoria and the MAME Team.
66//  Visit http://mamedev.org for licensing and usage restrictions.
77//
88//============================================================
r3563r3564
4040#include "window.h"
4141#include "video.h"
4242#include "config.h"
43#include "deprecat.h"
4443
4544#define OSX_POPUP_COMMAND      'popu'
46#define OSX_BASE_ID            'cmd0'
45#define OSX_BASE_ID             'cmd0'
4746
4847enum
4948{
r3563r3564
5655   KEY_F7         = 0x62,
5756   KEY_F8         = 0x64,
5857   KEY_F9         = 0x65,
59   KEY_F10          = 0x6D,
58   KEY_F10             = 0x6D,
6059   KEY_F11         = 0x67,
61   KEY_F12          = 0x6F,
60   KEY_F12             = 0x6F,
6261   KEY_F13         = 0x69,
6362   KEY_F14         = 0x6B,
6463   KEY_F15         = 0x71
r3563r3564
194193   
195194   MenuRef               contextualMenu;
196195   HIViewRef            contentView;
196
197   running_machine            *machine;
197198};
198199
199200
r3563r3564
247248//  PROTOTYPES
248249//============================================================
249250
250static int debugwin_init_windows(void);
251static debugwin_info *debug_window_create(const char * title, void *unused);
251static int debugwin_init_windows(running_machine *machine);
252static debugwin_info *debug_window_create(running_machine *machine, const char * title, void *unused);
252253static void debug_window_free(debugwin_info *info);
253254static OSStatus debug_window_proc(EventHandlerCallRef inHandler, EventRef inEvent, void * inUserData);
254255
r3563r3564
273274static int memory_handle_command(debugwin_info *info, EventRef inEvent);
274275static int memory_handle_key(debugwin_info *info, EventRef inEvent);
275276
276static void disasm_create_window(void);
277static void disasm_create_window(running_machine *machine);
277278static void disasm_recompute_children(debugwin_info *info);
278279static void disasm_process_string(debugwin_info *info, const char *string);
279280static void disasm_update_checkmarks(debugwin_info *info);
r3563r3564
298299//  OSX stubs
299300//============================================================
300301
301INLINE void osx_init_debugger( void )
302INLINE void osx_init_debugger(running_machine *machine)
302303{
303304   if ( osx_inited_debugger == 0 )
304305   {
305      if ( debugwin_init_windows() != 0 )
306      if ( debugwin_init_windows(machine) != 0 )
306307      {
307308         mame_printf_error( "Could not init debugger\n" );
308309         exit( -1 );
r3563r3564
371372   EventRef      message;
372373   EventTargetRef   target = GetEventDispatcherTarget();
373374
374   osx_init_debugger();
375   osx_init_debugger(machine);
375376
376377   // create a console window
377378   if (!main_console)
r3563r3564
379380
380381   // update the views in the console to reflect the current CPU
381382   if (main_console)
382      console_set_cpunum(machine, cpu_getactivecpu());
383      console_set_cpunum(machine, cpunum_get_active());
383384
384385   // make sure the debug windows are visible
385386   waiting_for_debugger = TRUE;
r3563r3564
403404//  debugwin_init_windows
404405//============================================================
405406
406static int debugwin_init_windows(void)
407static int debugwin_init_windows(running_machine *machine)
407408{
408409   SInt32      val;
409410
r3563r3564
483484
484485void debugwin_update_during_game(running_machine *machine)
485486{
486   osx_init_debugger();
487   osx_init_debugger(machine);
487488
489   if (!machine->debugcpu_data) return;
490
488491   // if we're running live, do some checks
489492   if ( ! debug_cpu_is_stopped(machine) )
490493   {
r3563r3564
525528//  debug_window_create
526529//============================================================
527530
528static debugwin_info *debug_window_create(const char *title, void *unused)
531static debugwin_info *debug_window_create(running_machine *machine, const char *title, void *unused)
529532{
530533   CGDirectDisplayID   mainID = CGMainDisplayID();
531534
r3563r3564
541544   memset(info, 0, sizeof(*info));
542545
543546   info->wnd = NULL;
547   info->machine = machine;
544548
545549   // create the window
546550   work_bounds.top = work_bounds.left = 0;
r3563r3564
796800            if (main_console && main_console->wnd == info->wnd)
797801            {
798802               smart_show_all(FALSE);
799               debug_cpu_go(~0);
803               debug_cpu_go(info->machine, ~0);
800804               return noErr;
801805            }
802806           
r3563r3564
903907   SetControlProperty(view->vscroll, 'MAME', 'info', sizeof( view ), &view );
904908
905909   // create the debug view
906   view->view = debug_view_alloc(type);
910   view->view = debug_view_alloc(info->machine, type);
907911   if (!view->view)
908912      goto cleanup;
909913
r3563r3564
971975   viscols = debug_view_get_property_UINT32(view->view, DVP_VISIBLE_COLS);
972976   viewdata = debug_view_get_property_ptr(view->view, DVP_VIEW_DATA);
973977
978   if (!viewdata) return;
979
974980   // set the font
975981   CGContextSelectFont(dc, OSX_DEBUGGER_FONT_NAME, OSX_DEBUGGER_FONT_SIZE, kCGEncodingMacRoman);
976982   CGContextSetTextDrawingMode(dc,kCGTextFill);
r3563r3564
18331839   return eventNotHandledErr;
18341840}
18351841
1836#if 0
1837//============================================================
1838//  generic_create_window
1839//============================================================
18401842
1841static void generic_create_window(int type)
1842{
1843   debugwin_info *info;
1844   char title[256];
1845   Rect   bounds;
1846
1847   // create the window
1848   snprintf(title, ARRAY_LENGTH(title), "Debug: %s [%s]", Machine->gamedrv->description, Machine->gamedrv->name);
1849   info = debug_window_create(title, NULL);
1850   if (!info || !debug_view_create(info, 0, type))
1851      return;
1852
1853   // set the child function
1854   info->recompute_children = generic_recompute_children;
1855
1856   // recompute the children once to get the maxwidth
1857   generic_recompute_children(info);
1858
1859   // position the window and recompute children again
1860   bounds.top = bounds.left = 100;
1861   bounds.right = bounds.left + info->maxwidth;
1862   bounds.bottom = bounds.top + 200;
1863   
1864   SetWindowBounds(info->wnd, kWindowStructureRgn, &bounds );
1865   ShowWindow(info->wnd);
1866   SelectWindow(info->wnd);
1867   
1868   generic_recompute_children(info);
1869}
1870#endif
1871
1872
18731843//============================================================
18741844//  generic_recompute_children
18751845//============================================================
r3563r3564
19221892
19231893   // create the window
19241894   snprintf(title, ARRAY_LENGTH(title), "Errorlog: %s [%s]", machine->gamedrv->description, machine->gamedrv->name);
1925   info = debug_window_create(title, NULL);
1895   info = debug_window_create(machine, title, NULL);
19261896   if (!info || !debug_view_create(info, 0, DVT_LOG))
19271897      return;
19281898   info->view->is_textbuf = TRUE;
r3563r3564
19741944   // first add all the CPUs' address spaces
19751945   for (cpunum = 0; cpunum < MAX_CPU; cpunum++)
19761946   {
1977      const debug_cpu_info *cpuinfo = debug_get_cpu_info(cpunum);
1978      if (cpuinfo->valid)
1947      if (machine->cpu[cpunum] != NULL)
1948      {
1949                const cpu_debug_data *cpuinfo = cpu_get_debug_data(machine->cpu[cpunum]);
19791950         for (spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
1951         {
19801952            if (cpuinfo->space[spacenum].databytes)
19811953            {
19821954               memorycombo_item *ci = malloc_or_die(sizeof(*ci));
r3563r3564
19841956               ci->cpunum = cpunum;
19851957               ci->spacenum = spacenum;
19861958               ci->prefsize = MIN(cpuinfo->space[spacenum].databytes, 8);
1987               snprintf(ci->name, ARRAY_LENGTH(ci->name), "CPU #%d \"%s\" (%s) %s memory", cpunum, machine->config->cpu[cpunum].tag, cpunum_name(cpunum), address_space_names[spacenum]);
1959               snprintf(ci->name, ARRAY_LENGTH(ci->name), "CPU #%d \"%s\" (%s) %s memory", cpunum, machine->config->cpu[cpunum].tag, cpu_get_name(machine->cpu[cpunum]), address_space_names[spacenum]);
19881960               *tail = ci;
19891961               tail = &ci->next;
19901962            }
1963         }
1964      }
19911965   }
19921966
19931967   // then add all the memory regions
r3563r3564
20722046
20732047static void memory_create_window(running_machine *machine)
20742048{
2075   int curcpu = cpu_getactivecpu(), cursel = 0;
2049   int curcpu = cpunum_get_active(), cursel = 0;
20762050   memorycombo_item *ci, *selci = NULL;
20772051   debugwin_info *info;
20782052   MenuRef optionsmenu,popupmenu;
r3563r3564
20832057   ControlButtonContentInfo   content;
20842058
20852059   // create the window
2086   info = debug_window_create("Memory", NULL);
2060   info = debug_window_create(machine, "Memory", NULL);
20872061   if (!info || !debug_view_create(info, 0, DVT_MEMORY))
20882062      return;
20892063
r3563r3564
25812555//  disasm_create_window
25822556//============================================================
25832557
2584static void disasm_create_window(void)
2558static void disasm_create_window(running_machine *machine)
25852559{
2586   int curcpu = cpu_getactivecpu(), cursel = 0;
2560   int curcpu = cpunum_get_active(), cursel = 0;
25872561   debugwin_info *info;
25882562   MenuRef optionsmenu, popupmenu;
25892563   UINT32 cpunum;
r3563r3564
25942568   ControlButtonContentInfo   content;
25952569
25962570   // create the window
2597   info = debug_window_create("Disassembly", NULL);
2571   info = debug_window_create(machine, "Disassembly", NULL);
25982572   if (!info || !debug_view_create(info, 0, DVT_DISASSEMBLY))
25992573      return;
26002574
r3563r3564
26772651   // populate the combobox
26782652   for (cpunum = 0; cpunum < MAX_CPU; cpunum++)
26792653   {
2680      const debug_cpu_info *cpuinfo = debug_get_cpu_info(cpunum);
2681      if (cpuinfo->valid)
2654      if (machine->cpu[cpunum] != NULL)
2655      {
2656                const cpu_debug_data *cpuinfo = cpu_get_debug_data(machine->cpu[cpunum]);
26822657         if (cpuinfo->space[ADDRESS_SPACE_PROGRAM].databytes)
26832658         {
26842659            CFStringRef      cfName;
26852660            char         name[100];
26862661            UInt16         item;
26872662
2688            snprintf(name, ARRAY_LENGTH(name), "CPU #%d \"%s\" (%s)", cpunum, Machine->config->cpu[cpunum].tag, cpunum_name(cpunum));
2663            snprintf(name, ARRAY_LENGTH(name), "CPU #%d \"%s\" (%s)", cpunum, machine->config->cpu[cpunum].tag, cpu_get_name(machine->cpu[cpunum]));
26892664           
26902665            cfName = CFStringCreateWithCString( NULL, name, CFStringGetSystemEncoding() );
26912666            AppendMenuItemTextWithCFString( popupmenu, cfName, 0, 0, &item );
r3563r3564
26942669            if (cpunum == curcpu)
26952670               cursel = item;
26962671         }
2672      }
26972673   }
26982674   
26992675   SetControlData(info->otherwnd[0], kControlEntireControl, kControlPopupButtonOwnedMenuRefTag, sizeof(popupmenu),&popupmenu);
r3563r3564
28842860            UINT32 cpunum;
28852861            for (cpunum = 0; cpunum < MAX_CPU; cpunum++)
28862862            {
2887               const debug_cpu_info *cpuinfo = debug_get_cpu_info(cpunum);
2888               if (cpuinfo->valid)
2863               if (info->machine->cpu[cpunum] != NULL)
2864               {
2865                         const cpu_debug_data *cpuinfo = cpu_get_debug_data(info->machine->cpu[cpunum]);
28892866                  if (cpuinfo->space[ADDRESS_SPACE_PROGRAM].databytes)
2867                  {
28902868                     if (--sel == 0)
28912869                     {
28922870                        debug_view_begin_update(info->view[0].view);
r3563r3564
28942872                        debug_view_end_update(info->view[0].view);
28952873                        disasm_update_caption(info);
28962874                     }
2875                  }
2876               }
28972877            }
28982878
28992879            // reset the focus
r3563r3564
29322912         {
29332913            active_address = debug_view_get_property_UINT32(info->view[0].view, DVP_DASM_ACTIVE_ADDRESS);
29342914            sprintf(command, "go %X", active_address);
2935            debug_console_execute_command(Machine, command, 1);
2915            debug_console_execute_command(info->machine, command, 1);
29362916         }
29372917         return 1;
29382918
r3563r3564
29402920         if (debug_view_get_property_UINT32(info->view[0].view, DVP_CURSOR_VISIBLE))
29412921         {
29422922            UINT32 cpu_num = 0;
2943            debug_cpu_info *cpuinfo ;
2923            cpu_debug_data *cpuinfo ;
29442924            debug_cpu_breakpoint *bp;
29452925            INT8 bp_exists = 0;
29462926            UINT32 bp_num = 0;
r3563r3564
29502930
29512931            /* is there already a breakpoint there? */
29522932            cpu_num = debug_view_get_property_UINT32(info->view[0].view, DVP_DASM_CPUNUM);
2953            cpuinfo = (debug_cpu_info*)debug_get_cpu_info(cpu_num);
2933            cpuinfo = (cpu_debug_data*)cpu_get_debug_data(info->machine->cpu[cpu_num]);
29542934
29552935            for (bp = cpuinfo->bplist; bp; bp = bp->next)
29562936            {
r3563r3564
29662946               sprintf(command, "bpset %X", BYTE2ADDR(active_address, cpuinfo, ADDRESS_SPACE_PROGRAM));
29672947            else
29682948               sprintf(command, "bpclear %X", bp_num);
2969            debug_console_execute_command(Machine, command, 1);
2949            debug_console_execute_command(info->machine, command, 1);
29702950         }
29712951         return 1;
29722952   }
r3563r3564
30263006            {
30273007               active_address = debug_view_get_property_UINT32(info->view[0].view, DVP_DASM_ACTIVE_ADDRESS);
30283008               sprintf(command, "go %X", active_address);
3029               debug_console_execute_command(Machine, command, 1);
3009               debug_console_execute_command(info->machine, command, 1);
30303010            }
30313011            return 1;
30323012         
r3563r3564
30343014            if (debug_view_get_property_UINT32(info->view[0].view, DVP_CURSOR_VISIBLE))
30353015            {
30363016               UINT32 cpu_num = 0;
3037               debug_cpu_info *cpuinfo ;
3017               cpu_debug_data *cpuinfo ;
30383018               debug_cpu_breakpoint *bp;
30393019               INT8 bp_exists = 0;
30403020               UINT32 bp_num = 0;
r3563r3564
30443024
30453025               /* is there already a breakpoint there? */
30463026               cpu_num = debug_view_get_property_UINT32(info->view[0].view, DVP_DASM_CPUNUM);
3047               cpuinfo = (debug_cpu_info*)debug_get_cpu_info(cpu_num);
3027               cpuinfo = (cpu_debug_data*)cpu_get_debug_data(info->machine->cpu[cpu_num]);
30483028
30493029               for (bp = cpuinfo->bplist; bp; bp = bp->next)
30503030               {
r3563r3564
30603040                  sprintf(command, "bpset %X", BYTE2ADDR(active_address, cpuinfo, ADDRESS_SPACE_PROGRAM));
30613041               else
30623042                  sprintf(command, "bpclear %X", bp_num);
3063               debug_console_execute_command(Machine, command, 1);
3043               debug_console_execute_command(info->machine, command, 1);
30643044            }
30653045            return 1;
30663046      }
r3563r3564
30693049      {
30703050         if (debug_view_get_property_UINT32(info->view[0].view, DVP_CURSOR_VISIBLE))
30713051         {
3072            debug_cpu_single_step(1);
3052            debug_cpu_single_step(info->machine, 1);
30733053            return 1;
30743054         }
30753055      }
r3563r3564
30943074   cpunum = debug_view_get_property_UINT32(info->view[0].view, DVP_DASM_CPUNUM);
30953075
30963076   // then update the caption
3097   snprintf(title, ARRAY_LENGTH(title), "Disassembly: CPU #%d \"%s\" (%s)", cpunum, Machine->config->cpu[cpunum].tag, cpunum_name(cpunum));
3077   snprintf(title, ARRAY_LENGTH(title), "Disassembly: CPU #%d \"%s\" (%s)", cpunum, info->machine->config->cpu[cpunum].tag, cpu_get_name(info->machine->cpu[cpunum]));
30983078
30993079   cftitle = CFStringCreateWithCString( NULL, title, CFStringGetSystemEncoding() );
31003080   
r3563r3564
31253105   ControlButtonContentInfo   content;
31263106
31273107   // create the window
3128   info = debug_window_create("Debug", NULL);
3108   info = debug_window_create(machine, "Debug", NULL);
31293109   if (!info)
31303110      return;
31313111   main_console = info;
3132   console_set_cpunum(Machine, 0);
3112   console_set_cpunum(machine, 0);
31333113
31343114   // create the views
31353115   if (!debug_view_create(info, 0, DVT_DISASSEMBLY))
r3563r3564
32173197   info->minwidth = 0;
32183198   info->maxwidth = 0;
32193199   for (cpunum = MAX_CPU - 1; (INT32)cpunum >= 0; cpunum--)
3220      if (Machine->config->cpu[cpunum].type != CPU_DUMMY)
3200      if (machine->config->cpu[cpunum].type != CPU_DUMMY)
32213201      {
32223202         UINT32 regchars, dischars, conchars;
32233203         UINT32 minwidth, maxwidth;
r3563r3564
33763356
33773357   // an empty string is a single step
33783358   if (string[0] == 0)
3379      debug_cpu_single_step(1);
3359      debug_cpu_single_step(info->machine, 1);
33803360
33813361   // otherwise, just process the command
33823362   else
3383      debug_console_execute_command(Machine, string, 1);
3363      debug_console_execute_command(info->machine, string, 1);
33843364
33853365   // clear the edit text box
33863366   SetControlData(info->editwnd, kControlEntireControl, kControlEditTextTextTag, 0, &buffer);
r3563r3564
34043384      debug_view_set_property_UINT32(main_console->view[1].view, DVP_REGS_CPUNUM, cpunum);
34053385
34063386   // then update the caption
3407   snprintf(title, ARRAY_LENGTH(title), "Debug: %s - CPU #%d \"%s\" (%s)", machine->gamedrv->name, cpu_getactivecpu(), machine->config->cpu[cpu_getactivecpu()].tag, activecpu_name());
3387   snprintf(title, ARRAY_LENGTH(title), "Debug: %s - CPU #%d \"%s\" (%s)", machine->gamedrv->name, cpunum, machine->config->cpu[cpunum].tag, cpu_get_name(machine->cpu[cpunum]));
34083388   
34093389   cftitle = CFStringCreateWithCString( NULL, title, CFStringGetSystemEncoding() );
34103390   
r3563r3564
34823462   switch( cmd.commandID )
34833463   {
34843464      case ID_NEW_MEMORY_WND:
3485         memory_create_window(Machine);
3465         memory_create_window(info->machine);
34863466         return 1;
34873467
34883468      case ID_NEW_DISASM_WND:
3489         disasm_create_window();
3469         disasm_create_window(info->machine);
34903470         return 1;
34913471
34923472      case ID_NEW_LOG_WND:
3493         log_create_window(Machine);
3473         log_create_window(info->machine);
34943474         return 1;
34953475
34963476      case ID_RUN_AND_HIDE:
34973477         smart_show_all(FALSE);
34983478      case ID_RUN:
3499         debug_cpu_go(~0);
3479         debug_cpu_go(info->machine, ~0);
35003480         return 1;
35013481
35023482      case ID_NEXT_CPU:
3503         debug_cpu_next_cpu();
3483         debug_cpu_next_cpu(info->machine);
35043484         return 1;
35053485
35063486      case ID_RUN_VBLANK:
3507         debug_cpu_go_vblank();
3487         debug_cpu_go_vblank(info->machine);
35083488         return 1;
35093489
35103490      case ID_RUN_IRQ:
3511         debug_cpu_go_interrupt(-1);
3491         debug_cpu_go_interrupt(info->machine, -1);
35123492         return 1;
35133493
35143494      case ID_STEP:
3515         debug_cpu_single_step(1);
3495         debug_cpu_single_step(info->machine, 1);
35163496         return 1;
35173497
35183498      case ID_STEP_OVER:
3519         debug_cpu_single_step_over(1);
3499         debug_cpu_single_step_over(info->machine, 1);
35203500         return 1;
35213501
35223502      case ID_STEP_OUT:
3523         debug_cpu_single_step_out();
3503         debug_cpu_single_step_out(info->machine);
35243504         return 1;
35253505
35263506      case ID_HARD_RESET:
3527         mame_schedule_hard_reset(Machine);
3507         mame_schedule_hard_reset(info->machine);
35283508         return 1;
35293509
35303510      case ID_SOFT_RESET:
3531         mame_schedule_soft_reset(Machine);
3532         debug_cpu_go(~0);
3511         mame_schedule_soft_reset(info->machine);
3512         debug_cpu_go(info->machine, ~0);
35333513         return 1;
35343514
35353515      case ID_EXIT:
3536         mame_schedule_exit(Machine);
3516         mame_schedule_exit(info->machine);
35373517         return 1;
35383518   }
35393519   
r3563r3564
35523532   int ignoreme;
35533533
35543534   /* ignore any keys that are received while the debug key is down */
3555   ignoreme = ui_input_pressed(Machine, IPT_UI_DEBUG_BREAK);
3535   ignoreme = ui_input_pressed(info->machine, IPT_UI_DEBUG_BREAK);
35563536   if (ignoreme)
35573537      return 1;
35583538
r3563r3564
35623542      {
35633543         case KEY_F3:
35643544            if ( event.modifiers & shiftKey )
3565               mame_schedule_hard_reset(Machine);
3545               mame_schedule_hard_reset(info->machine);
35663546            else
35673547            {
3568               mame_schedule_soft_reset(Machine);
3569               debug_cpu_go(~0);
3548               mame_schedule_soft_reset(info->machine);
3549               debug_cpu_go(info->machine,~0);
35703550            }
35713551            return 1;
35723552         
35733553         case KEY_F4:
35743554            if ( event.modifiers & optionKey )
3575               mame_schedule_exit(Machine);
3555               mame_schedule_exit(info->machine);
35763556            return 1;
35773557           
35783558         case KEY_F5:
3579            debug_cpu_go(~0);
3559            debug_cpu_go(info->machine, ~0);
35803560            return 1;
35813561         
35823562         case KEY_F6:
3583            debug_cpu_next_cpu();
3563            debug_cpu_next_cpu(info->machine);
35843564            return 1;
35853565         
35863566         case KEY_F7:
3587            debug_cpu_go_interrupt(-1);
3567            debug_cpu_go_interrupt(info->machine, -1);
35883568            return 1;
35893569         
35903570         case KEY_F8:
3591            debug_cpu_go_vblank();
3571            debug_cpu_go_vblank(info->machine);
35923572            return 1;
35933573         
35943574         case KEY_F10:
3595            debug_cpu_single_step_over(1);
3575            debug_cpu_single_step_over(info->machine, 1);
35963576            return 1;
35973577         
35983578         case KEY_F11:
35993579            if ( event.modifiers & shiftKey )
3600               debug_cpu_single_step_out();
3580               debug_cpu_single_step_out(info->machine);
36013581            else
3602               debug_cpu_single_step(1);
3582               debug_cpu_single_step(info->machine, 1);
36033583            return 1;
36043584         
36053585         case KEY_F12:
36063586            smart_show_all(FALSE);
3607            debug_cpu_go(~0);
3587            debug_cpu_go(info->machine, ~0);
36083588            return 1;
36093589      }
36103590     
r3563r3564
36143594         {
36153595            case 'm':
36163596            case 'M':
3617               memory_create_window(Machine);
3597               memory_create_window(info->machine);
36183598               return 1;
36193599           
36203600            case 'd':
36213601            case 'D':
3622               disasm_create_window();
3602               disasm_create_window(info->machine);
36233603               return 1;
36243604           
36253605            case 'l':
36263606            case 'L':
3627               log_create_window(Machine);
3607               log_create_window(info->machine);
36283608               return 1;
36293609         }
36303610      }
src/osd/sdl/debug-intf.c
r3563r3564
1515#include <gdk/gdkkeysyms.h>
1616#include <gtk/gtk.h>
1717
18#include "driver.h"
1819#include "debug-cb.h"
1920#include "debug-intf.h"
2021#include "debug-sup.h"
r3563r3564
2930  g_object_set_data (G_OBJECT (component), name, widget)
3031
3132GtkWidget*
32create_debugmain (void)
33create_debugmain (running_machine *machine)
3334{
3435  GtkWidget *debugmain;
3536  GtkWidget *vbox1;
r3563r3564
298299
299300  g_signal_connect ((gpointer) new_mem, "activate",
300301                    G_CALLBACK (on_new_mem_activate),
301                    NULL);
302                    machine);
302303  g_signal_connect ((gpointer) new_disasm, "activate",
303304                    G_CALLBACK (on_new_disasm_activate),
304                    NULL);
305                    machine);
305306  g_signal_connect ((gpointer) new_errorlog, "activate",
306307                    G_CALLBACK (on_new_errorlog_activate),
307                    NULL);
308                    machine);
308309  g_signal_connect ((gpointer) run, "activate",
309310                    G_CALLBACK (on_run_activate),
310                    NULL);
311                    machine);
311312  g_signal_connect ((gpointer) run_h, "activate",
312313                    G_CALLBACK (on_run_h_activate),
313                    NULL);
314                    machine);
314315  g_signal_connect ((gpointer) run_cpu, "activate",
315316                    G_CALLBACK (on_run_cpu_activate),
316                    NULL);
317                    machine);
317318  g_signal_connect ((gpointer) run_irq, "activate",
318319                    G_CALLBACK (on_run_irq_activate),
319                    NULL);
320                    machine);
320321  g_signal_connect ((gpointer) run_vbl, "activate",
321322                    G_CALLBACK (on_run_vbl_activate),
322                    NULL);
323                    machine);
323324  g_signal_connect ((gpointer) step_into, "activate",
324325                    G_CALLBACK (on_step_into_activate),
325                    NULL);
326                    machine);
326327  g_signal_connect ((gpointer) step_over, "activate",
327328                    G_CALLBACK (on_step_over_activate),
328                    NULL);
329                    machine);
329330  g_signal_connect ((gpointer) step_out, "activate",
330331                    G_CALLBACK (on_step_out_activate),
331                    NULL);
332                    machine);
332333  g_signal_connect ((gpointer) soft_reset, "activate",
333334                    G_CALLBACK (on_soft_reset_activate),
334                    NULL);
335                    machine);
335336  g_signal_connect ((gpointer) hard_reset, "activate",
336337                    G_CALLBACK (on_hard_reset_activate),
337                    NULL);
338                    machine);
338339  g_signal_connect ((gpointer) exit, "activate",
339340                    G_CALLBACK (on_exit_activate),
340                    NULL);
341                    machine);
341342
342343  /* Store pointers to all widgets, for use by lookup_widget(). */
343344  GLADE_HOOKUP_OBJECT_NO_REF (debugmain, debugmain, "debugmain");
r3563r3564
381382}
382383
383384GtkWidget*
384create_memorywin (void)
385create_memorywin (running_machine *machine)
385386{
386387  GtkWidget *memorywin;
387388  GtkWidget *vbox3;
r3563r3564
673674
674675  g_signal_connect ((gpointer) new_mem, "activate",
675676                    G_CALLBACK (on_new_mem_activate),
676                    NULL);
677          machine);
677678  g_signal_connect ((gpointer) new_disasm, "activate",
678679                    G_CALLBACK (on_new_disasm_activate),
679                    NULL);
680          machine);
680681  g_signal_connect ((gpointer) new_errorlog, "activate",
681682                    G_CALLBACK (on_new_errorlog_activate),
682                    NULL);
683          machine);
683684  g_signal_connect ((gpointer) run, "activate",
684685                    G_CALLBACK (on_run_activate),
685                    NULL);
686          machine);
686687  g_signal_connect ((gpointer) run_h, "activate",
687688                    G_CALLBACK (on_run_h_activate),
688                    NULL);
689          machine);
689690  g_signal_connect ((gpointer) run_cpu, "activate",
690691                    G_CALLBACK (on_run_cpu_activate),
691                    NULL);
692          machine);
692693  g_signal_connect ((gpointer) run_irq, "activate",
693694                    G_CALLBACK (on_run_irq_activate),
694                    NULL);
695          machine);
695696  g_signal_connect ((gpointer) run_vbl, "activate",
696697                    G_CALLBACK (on_run_vbl_activate),
697                    NULL);
698          machine);
698699  g_signal_connect ((gpointer) step_into, "activate",
699700                    G_CALLBACK (on_step_into_activate),
700                    NULL);
701          machine);
701702  g_signal_connect ((gpointer) step_over, "activate",
702703                    G_CALLBACK (on_step_over_activate),
703                    NULL);
704          machine);
704705  g_signal_connect ((gpointer) step_out, "activate",
705706                    G_CALLBACK (on_step_out_activate),
706                    NULL);
707          machine);
707708  g_signal_connect ((gpointer) soft_reset, "activate",
708709                    G_CALLBACK (on_soft_reset_activate),
709                    NULL);
710          machine);
710711  g_signal_connect ((gpointer) hard_reset, "activate",
711712                    G_CALLBACK (on_hard_reset_activate),
712                    NULL);
713          machine);
713714  g_signal_connect ((gpointer) exit, "activate",
714715                    G_CALLBACK (on_exit_activate),
715                    NULL);
716          machine);
716717
717718  /* Store pointers to all widgets, for use by lookup_widget(). */
718719  GLADE_HOOKUP_OBJECT_NO_REF (memorywin, memorywin, "memorywin");
r3563r3564
758759}
759760
760761GtkWidget*
761create_disasmwin (void)
762create_disasmwin (running_machine *machine)
762763{
763764  GtkWidget *disasmwin;
764765  GtkWidget *vbox4;
r3563r3564
10091010
10101011  g_signal_connect ((gpointer) menuitem6, "activate",
10111012                    G_CALLBACK (on_new_mem_activate),
1012                    NULL);
1013          machine);
10131014  g_signal_connect ((gpointer) menuitem7, "activate",
10141015                    G_CALLBACK (on_new_disasm_activate),
1015                    NULL);
1016          machine);
10161017  g_signal_connect ((gpointer) menuitem8, "activate",
10171018                    G_CALLBACK (on_new_errorlog_activate),
1018                    NULL);
1019          machine);
10191020  g_signal_connect ((gpointer) menuitem9, "activate",
10201021                    G_CALLBACK (on_run_activate),
1021                    NULL);
1022          machine);
10221023  g_signal_connect ((gpointer) menuitem10, "activate",
10231024                    G_CALLBACK (on_run_h_activate),
1024                    NULL);
1025          machine);
10251026  g_signal_connect ((gpointer) menuitem11, "activate",
10261027                    G_CALLBACK (on_run_cpu_activate),
1027                    NULL);
1028          machine);
10281029  g_signal_connect ((gpointer) menuitem12, "activate",
10291030                    G_CALLBACK (on_run_irq_activate),
1030                    NULL);
1031          machine);
10311032  g_signal_connect ((gpointer) menuitem13, "activate",
10321033                    G_CALLBACK (on_run_vbl_activate),
1033                    NULL);
1034          machine);
10341035  g_signal_connect ((gpointer) menuitem14, "activate",
10351036                    G_CALLBACK (on_step_into_activate),
1036                    NULL);
1037          machine);
10371038  g_signal_connect ((gpointer) menuitem15, "activate",
10381039                    G_CALLBACK (on_step_over_activate),
1039                    NULL);
1040          machine);
10401041  g_signal_connect ((gpointer) menuitem16, "activate",
10411042                    G_CALLBACK (on_step_out_activate),
1042                    NULL);
1043          machine);
10431044  g_signal_connect ((gpointer) menuitem17, "activate",
10441045                    G_CALLBACK (on_soft_reset_activate),
1045                    NULL);
1046          machine);
10461047  g_signal_connect ((gpointer) menuitem18, "activate",
10471048                    G_CALLBACK (on_hard_reset_activate),
1048                    NULL);
1049          machine);
10491050  g_signal_connect ((gpointer) menuitem19, "activate",
10501051                    G_CALLBACK (on_exit_activate),
1051                    NULL);
1052          machine);
10521053
10531054  /* Store pointers to all widgets, for use by lookup_widget(). */
10541055  GLADE_HOOKUP_OBJECT_NO_REF (disasmwin, disasmwin, "disasmwin");
r3563r3564
10891090}
10901091
10911092GtkWidget*
1092create_logwin (void)
1093create_logwin (running_machine *machine)
10931094{
10941095  GtkWidget *logwin;
10951096  GtkWidget *vbox5;
r3563r3564
12771278
12781279  g_signal_connect ((gpointer) menuitem27, "activate",
12791280                    G_CALLBACK (on_new_mem_activate),
1280                    NULL);
1281          machine);
12811282  g_signal_connect ((gpointer) menuitem28, "activate",
12821283                    G_CALLBACK (on_new_disasm_activate),
1283                    NULL);
1284          machine);
12841285  g_signal_connect ((gpointer) menuitem29, "activate",
12851286                    G_CALLBACK (on_new_errorlog_activate),
1286                    NULL);
1287          machine);
12871288  g_signal_connect ((gpointer) menuitem30, "activate",
12881289                    G_CALLBACK (on_run_activate),
1289                    NULL);
1290          machine);
12901291  g_signal_connect ((gpointer) menuitem31, "activate",
12911292                    G_CALLBACK (on_run_h_activate),
1292                    NULL);
1293          machine);
12931294  g_signal_connect ((gpointer) menuitem32, "activate",
12941295                    G_CALLBACK (on_run_cpu_activate),
1295                    NULL);
1296          machine);
12961297  g_signal_connect ((gpointer) menuitem33, "activate",
12971298                    G_CALLBACK (on_run_irq_activate),
1298                    NULL);
1299          machine);
12991300  g_signal_connect ((gpointer) menuitem34, "activate",
13001301                    G_CALLBACK (on_run_vbl_activate),
1301                    NULL);
1302          machine);
13021303  g_signal_connect ((gpointer) menuitem35, "activate",
13031304                    G_CALLBACK (on_step_into_activate),
1304                    NULL);
1305          machine);
13051306  g_signal_connect ((gpointer) menuitem36, "activate",
13061307                    G_CALLBACK (on_step_over_activate),
1307                    NULL);
1308          machine);
13081309  g_signal_connect ((gpointer) menuitem37, "activate",
13091310                    G_CALLBACK (on_step_out_activate),
1310                    NULL);
1311          machine);
13111312  g_signal_connect ((gpointer) menuitem38, "activate",
13121313                    G_CALLBACK (on_soft_reset_activate),
1313                    NULL);
1314          machine);
13141315  g_signal_connect ((gpointer) menuitem39, "activate",
13151316                    G_CALLBACK (on_hard_reset_activate),
1316                    NULL);
1317          machine);
13171318  g_signal_connect ((gpointer) menuitem40, "activate",
13181319                    G_CALLBACK (on_exit_activate),
1319                    NULL);
1320          machine);
13201321
13211322  /* Store pointers to all widgets, for use by lookup_widget(). */
13221323  GLADE_HOOKUP_OBJECT_NO_REF (logwin, logwin, "logwin");
src/osd/sdl/debug-intf.h
r3563r3564
22 * DO NOT EDIT THIS FILE - it is generated by Glade.
33 */
44
5GtkWidget* create_debugmain (void);
6GtkWidget* create_memorywin (void);
7GtkWidget* create_disasmwin (void);
8GtkWidget* create_logwin (void);
5GtkWidget* create_debugmain (running_machine *machine);
6GtkWidget* create_memorywin (running_machine *machine);
7GtkWidget* create_disasmwin (running_machine *machine);
8GtkWidget* create_logwin (running_machine *machine);

Previous 15994 Revisions Next


© 1998-2018 The MESS Team