Previous 199869 Revisions Next

r34595 Sunday 25th January, 2015 at 02:45:00 UTC by Couriersud
Converted modules/debugger/* to new module infrastructure. (nw)
[src/emu]emu.mak
[src/osd/modules]osdmodule.c
[src/osd/modules/debugger]debug_module.h debugint.c debugint.h debugosx.h debugosx.m debugqt.c debugqt.h debugwin.c debugwin.h none.c none.h
[src/osd/modules/font]font_windows.c
[src/osd/modules/lib]osdobj_common.c osdobj_common.h
[src/osd/sdl]osdsdl.h sdl.mak sdlmain.c
[src/osd/windows]windows.mak winmain.c winmain.h

trunk/src/emu/emu.mak
r243106r243107
152152   $(EMUOBJ)/profiler.o \
153153   $(EMUOBJ)/webengine.o \
154154   $(OSDOBJ)/osdnet.o \
155   $(OSDOBJ)/modules/sound/none.o \
156   $(OSDOBJ)/modules/debugger/none.o \
157   $(OSDOBJ)/modules/debugger/debugint.o \
158155
159156EMUSOUNDOBJS = \
160157   $(EMUOBJ)/sound/filter.o \
trunk/src/osd/modules/debugger/debug_module.h
r243106r243107
66#ifndef DEBUG_MODULE_H_
77#define DEBUG_MODULE_H_
88
9#include "osdepend.h"
10#include "modules/osdmodule.h"
11#include "emu.h"
12
13//============================================================
14//  CONSTANTS
15//============================================================
16
17#define OSD_DEBUG_PROVIDER "debugger"
18
919class debug_module
1020{
1121public:
r243106r243107
1525    virtual void init_debugger(running_machine &machine) = 0;
1626    virtual void wait_for_debugger(device_t &device, bool firststop) = 0;
1727    virtual void debugger_update() = 0;
18    virtual void debugger_exit() = 0;
1928};
2029
2130
trunk/src/osd/modules/debugger/debugint.c
r243106r243107
1010*********************************************************************/
1111
1212#include "emu.h"
13#include "debugint.h"
1413#include "ui/ui.h"
1514#include "rendfont.h"
1615#include "uiinput.h"
r243106r243107
2221#include "debug/debugcon.h"
2322#include "debug/debugcpu.h"
2423
24#include "debug_module.h"
25#include "modules/osdmodule.h"
2526
27class debug_internal : public osd_module, public debug_module
28{
29public:
30    debug_internal()
31    : osd_module(OSD_DEBUG_PROVIDER, "internal"), debug_module(),
32      m_machine(NULL)
33    {
34    }
35
36    virtual ~debug_internal() { }
37
38    virtual int init() { return 0;}
39    virtual void exit();
40
41    virtual void init_debugger(running_machine &machine);
42    virtual void wait_for_debugger(device_t &device, bool firststop);
43    virtual void debugger_update();
44
45private:
46    running_machine *m_machine;
47};
48
49
50
2651/***************************************************************************
2752    CONSTANTS
2853***************************************************************************/
2954
30const osd_debugger_type OSD_DEBUGGER_INTERNAL = &osd_debugger_creator<debugger_internal>;
31
3255#define BORDER_YTHICKNESS 1
3356#define BORDER_XTHICKNESS 1
3457#define HSB_HEIGHT 20
r243106r243107
239262    LOCAL VARIABLES
240263***************************************************************************/
241264
242static render_font *    debug_font;
265static render_font *    debug_font = NULL;
243266static int              debug_font_width;
244267static int              debug_font_height;
245268static float            debug_font_aspect;
246static DView *          list;
269static DView *          list = NULL;
247270static DView *          focus_view;
248271
249272static ui_menu *        menu;
r243106r243107
841864#endif
842865}
843866
844void debugger_internal::debugger_exit()
867void debug_internal::exit()
845868{
846869   for (DView *ndv = list; ndv != NULL; )
847870   {
r243106r243107
858881      global_free(menu);
859882}
860883
861void debugger_internal::init_debugger(running_machine &machine)
884void debug_internal::init_debugger(running_machine &machine)
862885{
863886   unicode_char ch;
864887   int chw;
r243106r243107
14101433}
14111434
14121435
1413void debugger_internal::wait_for_debugger(device_t &device, bool firststop)
1436void debug_internal::wait_for_debugger(device_t &device, bool firststop)
14141437{
14151438   if (firststop && list == NULL)
14161439   {
r243106r243107
14431466
14441467}
14451468
1446void debugger_internal::debugger_update()
1469void debug_internal::debugger_update()
14471470{
1448   if (!debug_cpu_is_stopped(*m_machine) && m_machine->phase() == MACHINE_PHASE_RUNNING)
1471   if ((m_machine != NULL) && (!debug_cpu_is_stopped(*m_machine)) && (m_machine->phase() == MACHINE_PHASE_RUNNING))
14491472   {
14501473      update_views();
14511474   }
14521475}
14531476
1454//-------------------------------------------------
1455//  debugger_internal - constructor
1456//-------------------------------------------------
1457debugger_internal::debugger_internal()
1458   : debug_module(), m_machine(NULL)
1459{
1460}
1477MODULE_DEFINITION(DEBUG_INTERNAL, debug_internal)
trunk/src/osd/modules/debugger/debugint.h
r243106r243107
1/*********************************************************************
2
3    debugint.c
4
5    Internal debugger frontend using render interface.
6
7    Copyright Nicola Salmoria and the MAME Team.
8    Visit http://mamedev.org for licensing and usage restrictions.
9
10*********************************************************************/
11
12#pragma once
13
14#ifndef __DEBUGGER_INTERNAL_H__
15#define __DEBUGGER_INTERNAL_H__
16
17#include "osdepend.h"
18#include "modules/lib/osdobj_common.h"
19#include "debug_module.h"
20
21class debugger_internal : public debug_module
22{
23public:
24   // construction/destruction
25   debugger_internal();
26   virtual ~debugger_internal() { }
27
28   virtual void init_debugger(running_machine &machine);
29   virtual void wait_for_debugger(device_t &device, bool firststop);
30   virtual void debugger_update();
31   virtual void debugger_exit();
32private:
33   running_machine *m_machine;
34};
35
36extern const osd_debugger_type OSD_DEBUGGER_INTERNAL;
37
38#endif /* __DEBUGGER_INTERNAL_H__ */
trunk/src/osd/modules/debugger/debugosx.h
r243106r243107
367367
368368#endif // __OBJC__
369369
370class debugger_osx : public osd_debugger_interface
371{
372public:
373   // construction/destruction
374   debugger_osx(const osd_interface &osd);
375   virtual ~debugger_osx() { }
376
377   virtual void init_debugger(running_machine &machine);
378   virtual void wait_for_debugger(device_t &device, bool firststop);
379   virtual void debugger_update();
380   virtual void debugger_exit();
381private:
382   running_machine *m_machine;
383};
384
385extern const osd_debugger_type OSD_DEBUGGER_OSX;
386
387
388370#endif // __SDL_DEBUGOSX__
trunk/src/osd/modules/debugger/debugosx.m
r243106r243107
4242// MAMEOS headers
4343#include "debugosx.h"
4444#include "osdsdl.h"
45#include "debug_module.h"
4546
47//============================================================
48//  MODULE SUPPORT
49//============================================================
4650
51static MAMEDebugConsole *main_console = nil;
4752
53class debugger_osx : public osd_module, public debug_module
54{
55public:
56    debugger_osx()
57    : osd_module(OSD_DEBUG_PROVIDER, "osx"), debug_module(),
58      m_machine(NULL)
59    {
60    }
61
62    virtual ~debugger_osx() { }
63
64    virtual int init() { return 0;}
65    virtual void exit()
66    {
67    }
68
69    virtual void init_debugger(running_machine &machine);
70    virtual void wait_for_debugger(device_t &device, bool firststop);
71    virtual void debugger_update();
72
73private:
74    running_machine *m_machine;
75};
76
77MODULE_DEFINITION(DEBUG_OSX, debugger_osx)
78
4879//============================================================
4980//  LOCAL VARIABLES
5081//============================================================
5182
52static MAMEDebugConsole *main_console = nil;
5383
5484static BOOL waiting_for_debugger = NO;
5585
r243106r243107
6797
6898static void console_create_window(running_machine &machine);
6999
70const osd_debugger_type OSD_DEBUGGER_OSX = &osd_debugger_creator<debugger_osx>;
71
72//-------------------------------------------------
73//  debugger_osx - constructor
74//-------------------------------------------------
75debugger_osx::debugger_osx(const osd_interface &osd)
76   : osd_debugger_interface(osd), m_machine(NULL)
77{
78}
79
80100//============================================================
81101//  debugger_osx::init_debugger
82102//============================================================
r243106r243107
131151}
132152
133153//============================================================
134//  debugger_exit
135//============================================================
136
137void debugger_osx::debugger_exit()
138{
139}
140
141//============================================================
142154//  debugwin_view_update
143155//============================================================
144156
trunk/src/osd/modules/debugger/debugqt.c
r243106r243107
1111
1212#define NO_MEM_TRACKING
1313
14#include "debug_module.h"
15#include "modules/osdmodule.h"
16
17#if (USE_QTDEBUG)
18
1419#include <vector>
1520
1621#include <QtGui/QtGui>
r243106r243107
2833#include "qt/debugqtbreakpointswindow.h"
2934#include "qt/debugqtdeviceswindow.h"
3035#include "qt/debugqtdeviceinformationwindow.h"
31#include "debugqt.h"
3236
33
34debug_module *qt_osd_debugger_creator()
37class debug_qt : public osd_module, public debug_module
3538{
36   return new debugger_qt();
37}
38const osd_debugger_type OSD_DEBUGGER_QT = &qt_osd_debugger_creator;
39public:
40    debug_qt()
41    : osd_module(OSD_DEBUG_PROVIDER, "qt"), debug_module(),
42      m_machine(NULL)
43    {
44    }
3945
46    virtual ~debug_qt() { }
47
48    virtual int init() { return 0;}
49    virtual void exit() { }
50
51    virtual void init_debugger(running_machine &machine);
52    virtual void wait_for_debugger(device_t &device, bool firststop);
53    virtual void debugger_update();
54
55private:
56    running_machine *m_machine;
57};
58
4059//============================================================
4160//  "Global" variables to make QT happy
4261//============================================================
r243106r243107
4766bool oneShot = true;
4867static MainWindow* mainQtWindow = NULL;
4968
50//-------------------------------------------------
51//  debugger_qt - constructor
52//-------------------------------------------------
53debugger_qt::debugger_qt()
54   : debug_module(), m_machine(NULL)
55{
56}
57
58debugger_qt::~debugger_qt()
59{
60}
61
6269//============================================================
6370//  XML configuration save/load
6471//============================================================
r243106r243107
228235bool winwindow_qt_filter(void *message);
229236#endif
230237
231void debugger_qt::init_debugger(running_machine &machine)
238void debug_qt::init_debugger(running_machine &machine)
232239{
233240   if (qApp == NULL)
234241   {
r243106r243107
269276void winwindow_update_cursor_state(running_machine &machine);
270277#endif
271278
272void debugger_qt::wait_for_debugger(device_t &device, bool firststop)
279void debug_qt::wait_for_debugger(device_t &device, bool firststop)
273280{
274281#if defined(SDLMAME_UNIX) || defined(SDLMAME_WIN32)
275282   sdl_entered_debugger = 1;
r243106r243107
344351//  Available for video.*
345352//============================================================
346353
347void debugger_qt::debugger_update()
354void debug_qt::debugger_update()
348355{
349356   qApp->processEvents(QEventLoop::AllEvents, 1);
350357}
351358
352void debugger_qt::debugger_exit()
353{
354}
359#else /* SDLMAME_UNIX */
360    MODULE_NOT_SUPPORTED(debug_qt, OSD_DEBUG_PROVIDER, "qt")
361#endif
362
363MODULE_DEFINITION(DEBUG_QT, debug_qt)
trunk/src/osd/modules/debugger/debugqt.h
r243106r243107
1//============================================================
2//
3//  debugqt.h - SDL/QT debug window handling
4//
5//  Copyright (c) 1996-2010, Nicola Salmoria and the MAME Team.
6//  Visit http://mamedev.org for licensing and usage restrictions.
7//
8//  SDLMAME by Olivier Galibert and R. Belmont
9//
10//============================================================
11
12#pragma once
13
14#ifndef __DEBUGGER_QT_H__
15#define __DEBUGGER_QT_H__
16
17#include "emu.h"
18#include "debug_module.h"
19
20class debugger_qt : public debug_module
21{
22public:
23   // construction/destruction
24   debugger_qt();
25   virtual ~debugger_qt();
26
27   virtual void init_debugger(running_machine &machine);
28   virtual void wait_for_debugger(device_t &device, bool firststop);
29   virtual void debugger_update();
30   virtual void debugger_exit();
31
32private:
33   running_machine *m_machine;
34};
35
36extern const osd_debugger_type OSD_DEBUGGER_QT;
37
38#endif /* __DEBUGGER_QT_H__ */
trunk/src/osd/modules/debugger/debugwin.c
r243106r243107
66//
77//============================================================
88
9#include "debug_module.h"
10#include "modules/osdmodule.h"
11
12#if defined(OSD_WINDOWS) /*|| defined(SDLMAME_WIN32)*/
13
914// standard windows headers
1015#define WIN32_LEAN_AND_MEAN
1116#include <windows.h>
r243106r243107
3641#include "strconv.h"
3742#include "winutf8.h"
3843
39#include "debugwin.h"
44class debugger_windows : public osd_module, public debug_module
45{
46public:
47    debugger_windows()
48    : osd_module(OSD_DEBUG_PROVIDER, "windows"), debug_module(),
49      m_machine(NULL)
50    {
51    }
4052
41const osd_debugger_type OSD_DEBUGGER_WINDOWS = &osd_debugger_creator<debugger_windows>;
53    virtual ~debugger_windows() { }
4254
55    virtual int init() { return 0;}
56    virtual void exit();
57
58    virtual void init_debugger(running_machine &machine);
59    virtual void wait_for_debugger(device_t &device, bool firststop);
60    virtual void debugger_update();
61
62private:
63    running_machine *m_machine;
64};
4365//============================================================
4466//  PARAMETERS
4567//============================================================
r243106r243107
174196//  LOCAL VARIABLES
175197//============================================================
176198
177static debugwin_info *window_list;
199static debugwin_info *window_list = NULL;
178200static debugwin_info *main_console;
179201static UINT32 main_console_regwidth;
180202
r243106r243107
239261static void image_update_menu(debugwin_info *info);
240262
241263
242//-------------------------------------------------
243//  debugger_windows - constructor
244//-------------------------------------------------
245debugger_windows::debugger_windows(const osd_interface &osd)
246   : osd_debugger_interface(osd)
247{
248}
249
250264//============================================================
251265//  wait_for_debugger
252266//============================================================
r243106r243107
453467//  debugwin_destroy_windows
454468//============================================================
455469
456void debugger_windows::debugger_exit()
470void debugger_windows::exit()
457471{
458472   // loop over windows and free them
459473   while (window_list != NULL)
r243106r243107
30793093   for (info = window_list; info != NULL; info = info->next)
30803094      smart_show_window(info->wnd, show);
30813095}
3096#else /* not windows */
3097    MODULE_NOT_SUPPORTED(debugger_windows, OSD_DEBUG_PROVIDER, "windows")
3098#endif
3099
3100MODULE_DEFINITION(DEBUG_WINDOWS, debugger_windows)
trunk/src/osd/modules/debugger/debugwin.h
r243106r243107
1// license:BSD-3-Clause
2// copyright-holders:Aaron Giles
3//============================================================
4//
5//  debugwin.h - Win32 debug window handling
6//
7//============================================================
8
9
10#pragma once
11
12#ifndef __DEBUGGER_WINDOWS_H__
13#define __DEBUGGER_WINDOWS_H__
14
15#include "osdepend.h"
16#include "modules/lib/osdobj_common.h"
17
18class debugger_windows : public osd_debugger_interface
19{
20public:
21   // construction/destruction
22   debugger_windows(const osd_interface &osd);
23   virtual ~debugger_windows() { }
24
25   virtual void init_debugger(running_machine &machine);
26   virtual void wait_for_debugger(device_t &device, bool firststop);
27   virtual void debugger_update();
28   virtual void debugger_exit();
29private:
30   running_machine *m_machine;
31};
32
33extern const osd_debugger_type OSD_DEBUGGER_WINDOWS;
34
35#endif /* __DEBUGGER_WINDOWS_H__ */
trunk/src/osd/modules/debugger/none.c
r243106r243107
44//
55//============================================================
66
7#include "none.h"
7#include "debug_module.h"
8#include "modules/osdmodule.h"
9
810#include "debug/debugcpu.h"
911
10const osd_debugger_type OSD_DEBUGGER_NONE = &osd_debugger_creator<debugger_none>;
11
12//-------------------------------------------------
13//  debugger_none - constructor
14//-------------------------------------------------
15debugger_none::debugger_none()
16   : debug_module(), m_machine(NULL)
12class debug_none : public osd_module, public debug_module
1713{
18}
14public:
15    debug_none()
16    : osd_module(OSD_DEBUG_PROVIDER, "none"), debug_module(),
17      m_machine(NULL)
18    {
19    }
1920
20void debugger_none::init_debugger(running_machine &machine)
21    virtual ~debug_none() { }
22
23    virtual int init() { return 0;}
24    virtual void exit() { }
25
26    virtual void init_debugger(running_machine &machine);
27    virtual void wait_for_debugger(device_t &device, bool firststop);
28    virtual void debugger_update();
29
30private:
31    running_machine *m_machine;
32};
33
34void debug_none::init_debugger(running_machine &machine)
2135{
2236    m_machine = &machine;
2337}
2438
25void debugger_none::wait_for_debugger(device_t &device, bool firststop)
39void debug_none::wait_for_debugger(device_t &device, bool firststop)
2640{
2741   debug_cpu_get_visible_cpu(*m_machine)->debug()->go();
2842}
2943
30void debugger_none::debugger_update()
44void debug_none::debugger_update()
3145{
3246}
3347
34void debugger_none::debugger_exit()
35{
36}
48MODULE_DEFINITION(DEBUG_NONE, debug_none)
trunk/src/osd/modules/debugger/none.h
r243106r243107
1// license:BSD-3-Clause
2// copyright-holders:Miodrag Milanovic
3/***************************************************************************
4
5    none.h
6
7    Dummy debugger interface.
8
9*******************************************************************c********/
10
11#pragma once
12
13#ifndef __DEBUGGER_NONE_H__
14#define __DEBUGGER_NONE_H__
15
16#include "osdepend.h"
17#include "debug_module.h"
18#include "modules/lib/osdobj_common.h"
19
20class debugger_none : public debug_module
21{
22public:
23   // construction/destruction
24   debugger_none();
25   virtual ~debugger_none() { }
26
27   virtual void init_debugger(running_machine &machine);
28   virtual void wait_for_debugger(device_t &device, bool firststop);
29   virtual void debugger_update();
30   virtual void debugger_exit();
31private:
32   running_machine *m_machine;
33};
34
35extern const osd_debugger_type OSD_DEBUGGER_NONE;
36
37#endif  /* __DEBUGGER_NONE_H__ */
trunk/src/osd/modules/font/font_windows.c
r243106r243107
2626//#define POINT_SIZE 144.0
2727#define DEFAULT_FONT_HEIGHT (200)
2828
29#if 0
30//============================================================
31//  wstring_from_utf8
32//============================================================
33
34// FIXME: defined in multiple locations ... FIXME
35
36WCHAR *wstring_from_utf8(const char *utf8string)
37{
38    int char_count;
39    WCHAR *result;
40
41    // convert MAME string (UTF-8) to UTF-16
42    char_count = MultiByteToWideChar(CP_UTF8, 0, utf8string, -1, NULL, 0);
43    result = (WCHAR *)osd_malloc_array(char_count * sizeof(*result));
44    if (result != NULL)
45        MultiByteToWideChar(CP_UTF8, 0, utf8string, -1, result, char_count);
46
47    return result;
48}
49
50
51//============================================================
52//  utf8_from_wstring
53//============================================================
54
55char *utf8_from_wstring(const WCHAR *wstring)
56{
57    int char_count;
58    char *result;
59
60    // convert UTF-16 to MAME string (UTF-8)
61    char_count = WideCharToMultiByte(CP_UTF8, 0, wstring, -1, NULL, 0, NULL, NULL);
62    result = (char *)osd_malloc_array(char_count * sizeof(*result));
63    if (result != NULL)
64        WideCharToMultiByte(CP_UTF8, 0, wstring, -1, result, char_count, NULL, NULL);
65
66    return result;
67}
68#endif
69
7029//-------------------------------------------------
7130//  font_open - attempt to "open" a handle to the
7231//  font with the given name
trunk/src/osd/modules/lib/osdobj_common.c
r243106r243107
1111
1212#include "emu.h"
1313#include "osdepend.h"
14#include "modules/debugger/none.h"
15#include "modules/debugger/debugint.h"
1614#include "modules/lib/osdobj_common.h"
1715
1816extern bool g_print_verbose;
r243106r243107
123121    REGISTER_MODULE(m_mod_man, SOUND_SDL);
124122    REGISTER_MODULE(m_mod_man, SOUND_NONE);
125123
124#ifdef SDLMAME_MACOSX
125    REGISTER_MODULE(m_mod_man, DEBUG_OSX);
126#endif
127    REGISTER_MODULE(m_mod_man, DEBUG_WINDOWS);
128    REGISTER_MODULE(m_mod_man, DEBUG_QT);
129    REGISTER_MODULE(m_mod_man, DEBUG_INTERNAL);
130    REGISTER_MODULE(m_mod_man, DEBUG_NONE);
131
126132    // after initialization we know which modules are supported
127133
128134    const char *names[20];
r243106r243107
139145        dnames.append(names[i]);
140146    update_option(OSD_SOUND_PROVIDER, dnames);
141147
148    // Register debugger options and update options
149    m_mod_man.get_module_names(OSD_DEBUG_PROVIDER, 20, &num, names);
150    dnames.reset();
151    for (int i = 0; i < num; i++)
152        dnames.append(names[i]);
153    update_option(OSD_DEBUG_PROVIDER, dnames);
154
142155    // Register video options and update options
143156    video_options_add("none", NULL);
144157    video_register();
145158    update_option(OSDOPTION_VIDEO, m_video_names);
146
147    // Register debugger options and update options
148    debugger_options_add("none", OSD_DEBUGGER_NONE);
149    debugger_options_add("internal", OSD_DEBUGGER_INTERNAL);
150    debugger_register();
151    update_option(OSDOPTION_DEBUGGER, m_debugger_names);
152159}
153160
154161void osd_common_t::update_option(const char * key, dynamic_array<const char *> &values)
r243106r243107
180187   for(int i= 0; i < m_video_names.count(); ++i)
181188      osd_free(const_cast<char*>(m_video_names[i]));
182189   //m_video_options,reset();
183
184   for(int i= 0; i < m_debugger_names.count(); ++i)
185      osd_free(const_cast<char*>(m_debugger_names[i]));
186   m_debugger_options.reset();
187190}
188191
189192
r243106r243107
264267   // is active. This gives any OSD debugger interface a chance to
265268   // create all of its structures.
266269   //
267   osd_debugger_type debugger = m_debugger_options.find(options().debugger());
268   if (debugger==NULL)
269   {
270      osd_printf_warning("debugger_init: option %s not found switching to auto\n",options().debugger());
271      debugger = m_debugger_options.find("auto");
272   }
273   m_debugger = (*debugger)();
274
275270   m_debugger->init_debugger(machine());
276271}
277272
r243106r243107
297292   if (m_debugger) m_debugger->debugger_update();
298293}
299294
300void osd_common_t::debugger_exit()
301{
302   if (m_debugger)
303   {
304      m_debugger->debugger_exit();
305      global_free(m_debugger);
306      m_debugger = NULL;
307   }
308}
309295
310296//-------------------------------------------------
311297//  update_audio_stream - update the stereo audio
r243106r243107
457443    m_sound->m_sample_rate = options().sample_rate();
458444    m_sound->m_audio_latency = options().audio_latency();
459445
446    m_debugger = select_module_options<debug_module *>(options(), OSD_DEBUG_PROVIDER);
447
460448    m_mod_man.init();
461449
462450}
r243106r243107
480468{
481469}
482470
483void osd_common_t::debugger_register()
484{
485}
486
487471bool osd_common_t::input_init()
488472{
489473   return true;
r243106r243107
516500   network_exit();
517501   #endif
518502   midi_exit();
519   debugger_exit();
520503}
521504
522505void osd_common_t::video_exit()
r243106r243107
552535   m_video_names.append(core_strdup(name));
553536}
554537
555void osd_common_t::debugger_options_add(const char *name, osd_debugger_type type)
556{
557   m_debugger_options.add(name, type, false);
558   m_debugger_names.append(core_strdup(name));
559}
560
561538bool osd_common_t::midi_init()
562539{
563540    // this should be done on the OS_level
trunk/src/osd/modules/lib/osdobj_common.h
r243106r243107
105105    static const options_entry s_option_entries[];
106106};
107107
108// a osd_sound_type is simply a pointer to its alloc function
109typedef debug_module *(*osd_debugger_type)();
110
111
112108// ======================> osd_interface
113109
114110// description of the currently-running machine
r243106r243107
159155
160156
161157    virtual void debugger_update();
162    virtual void debugger_exit();
163    virtual void debugger_register();
164158
165159    virtual void init_subsystems();
166160
r243106r243107
184178    virtual void osd_exit();
185179
186180    virtual void video_options_add(const char *name, void *type);
187    virtual void debugger_options_add(const char *name, osd_debugger_type type);
188181
189182    osd_options &options() { return m_options; }
190183
r243106r243107
227220private:
228221   //tagmap_t<osd_video_type>  m_video_options;
229222   dynamic_array<const char *> m_video_names;
230   tagmap_t<osd_debugger_type>  m_debugger_options;
231   dynamic_array<const char *> m_debugger_names;
232223};
233224
234225
trunk/src/osd/modules/osdmodule.c
r243106r243107
2727    osd_module *module = mod_type();
2828    if (module->probe())
2929    {
30        osd_printf_info("===> registered module %s %s\n", module->name(), module->type());
30        osd_printf_verbose("===> registered module %s %s\n", module->name(), module->type());
3131
3232        int i;
3333        for (i = 0; m_modules[i] != NULL; i++)
r243106r243107
3636    }
3737    else
3838    {
39        osd_printf_info("===> not supported %s %s\n", module->name(), module->type());
39        osd_printf_verbose("===> not supported %s %s\n", module->name(), module->type());
4040        module->~osd_module();
4141        osd_free(module);
4242    }
trunk/src/osd/sdl/osdsdl.h
r243106r243107
189189   virtual void customize_input_type_list(simple_list<input_type_entry> &typelist);
190190
191191   virtual void video_register();
192   virtual void debugger_register();
193192
194193   virtual bool video_init();
195194   virtual bool window_init();
trunk/src/osd/sdl/sdl.mak
r243106r243107
210210BASE_TARGETOS = unix
211211SYNC_IMPLEMENTATION = tc
212212SDL_NETWORK = taptun
213#SDL_NETWORK = pcap
213214
214215ifndef NO_USE_MIDI
215216INCPATH += `pkg-config --cflags alsa`
r243106r243107
706707   $(MOC) $(MOCINCPATH) $(DEFS) $< -o $@
707708
708709DEBUGOBJS = \
709   $(OSDOBJ)/modules/debugger/debugqt.o \
710710   $(OSDOBJ)/modules/debugger/qt/debugqtview.o \
711711   $(OSDOBJ)/modules/debugger/qt/debugqtwindow.o \
712712   $(OSDOBJ)/modules/debugger/qt/debugqtlogwindow.o \
r243106r243107
725725   $(OSDOBJ)/modules/debugger/qt/debugqtbreakpointswindow.moc.o \
726726   $(OSDOBJ)/modules/debugger/qt/debugqtdeviceswindow.moc.o \
727727   $(OSDOBJ)/modules/debugger/qt/debugqtdeviceinformationwindow.moc.o
728
729DEFS += -DUSE_QTDEBUG=1
730   
731else
732DEFS += -DUSE_QTDEBUG=0
728733endif
729734
735DEBUGOBJS += \
736   $(OSDOBJ)/modules/debugger/none.o \
737   $(OSDOBJ)/modules/debugger/debugint.o \
738   $(OSDOBJ)/modules/debugger/debugwin.o \
739   $(OSDOBJ)/modules/debugger/debugqt.o \
740
730741ifeq ($(NO_DEBUGGER),1)
731742DEFS += -DNO_DEBUGGER
732743else
trunk/src/osd/sdl/sdlmain.c
r243106r243107
5757#include "osdsdl.h"
5858#include "modules/lib/osdlib.h"
5959
60#if !defined(NO_DEBUGGER)
61#include "modules/debugger/debugqt.h"
62#endif
63#include "modules/debugger/none.h"
64#if defined(SDLMAME_MACOSX)
65#include "modules/debugger/debugosx.h"
66#endif
6760// we override SDL's normal startup on Win32
6861// please see sdlprefix.h as well
6962
r243106r243107
531524}
532525
533526//============================================================
534//  debugger_register
535//============================================================
536
537void sdl_osd_interface::debugger_register()
538{
539#if defined(NO_DEBUGGER)
540   debugger_options_add("auto", OSD_DEBUGGER_NONE);
541#else
542#if defined(SDLMAME_MACOSX)
543   debugger_options_add("osx", OSD_DEBUGGER_OSX);
544   debugger_options_add("auto", OSD_DEBUGGER_OSX); // making OSX debugger default one
545#else
546   debugger_options_add("qt", OSD_DEBUGGER_QT);
547   debugger_options_add("auto", OSD_DEBUGGER_QT); // making QT debugger default one
548#endif // SDLMAME_MACOSX
549#endif // NO_DEBUGGER
550}
551
552//============================================================
553527//  init
554528//============================================================
555529
trunk/src/osd/windows/windows.mak
r243106r243107
408408
409409# add debug-specific files
410410OSDOBJS += \
411   $(OSDOBJ)/modules/debugger/debugwin.o
411   $(OSDOBJ)/modules/debugger/debugwin.o \
412   $(OSDOBJ)/modules/debugger/debugint.o \
413   $(OSDOBJ)/modules/debugger/debugqt.o \
414   $(OSDOBJ)/modules/debugger/none.o \
412415
413416# add a stub resource file
414417RESFILE = $(WINOBJ)/mame.res
r243106r243107
421424QT_LIBS := -L$(shell qmake -query QT_INSTALL_LIBS)
422425LIBS += $(QT_LIBS) -lqtmain -lQtGui4 -lQtCore4
423426INCPATH += -I$(QT_INSTALL_HEADERS)/QtCore -I$(QT_INSTALL_HEADERS)/QtGui -I$(QT_INSTALL_HEADERS)
424CFLAGS += -DUSE_QTDEBUG
425427
426428MOC = @moc
427429$(OSDOBJ)/%.moc.c: $(OSDSRC)/%.h
428430   $(MOC) $(INCPATH) $(DEFS) $< -o $@
429431
430432OSDOBJS += \
431   $(OSDOBJ)/modules/debugger/debugqt.o \
432433   $(OSDOBJ)/modules/debugger/qt/debugqtview.o \
433434   $(OSDOBJ)/modules/debugger/qt/debugqtwindow.o \
434435   $(OSDOBJ)/modules/debugger/qt/debugqtlogwindow.o \
trunk/src/osd/windows/winmain.c
r243106r243107
3939#include "debugger.h"
4040#include "winfile.h"
4141
42#include "modules/debugger/debugwin.h"
43
44#if (USE_QTDEBUG)
45#include "modules/debugger/debugqt.h"
46#endif
4742#define DEBUG_SLOW_LOCKS    0
4843
49
5044//**************************************************************************
5145//  MACROS
5246//**************************************************************************
r243106r243107
536530}
537531
538532//============================================================
539//  debugger_register
540//============================================================
541
542void windows_osd_interface::debugger_register()
543{
544   debugger_options_add("windows", OSD_DEBUGGER_WINDOWS);
545#if (USE_QTDEBUG)
546   debugger_options_add("qt", OSD_DEBUGGER_QT);
547#endif
548   debugger_options_add("auto", OSD_DEBUGGER_WINDOWS); // making windows debugger default one
549}
550
551//============================================================
552533//  init
553534//============================================================
554535
trunk/src/osd/windows/winmain.h
r243106r243107
253253   virtual void customize_input_type_list(simple_list<input_type_entry> &typelist);
254254
255255   virtual void video_register();
256   virtual void debugger_register();
257256
258257   virtual bool video_init();
259258   virtual bool window_init();

https://github.com/mamedev/mame/commit/d2ef6dfc1f0e6189fa1c91819469f86455abeb77

Previous 199869 Revisions Next

© 1997-2024 The MAME Team