ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build with gdb stub

This commit is contained in:
wntrmute 2010-02-05 01:52:20 +00:00
parent e48bd707f3
commit fdd1c0e6e8
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
desmume/src/wx/wxMain.cpp
View File

@ -32,6 +32,10 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#ifdef GDB_STUB
#include "gdbstub.h"
#endif
SoundInterface_struct *SNDCoreList[] = { SoundInterface_struct *SNDCoreList[] = {
&SNDDummy, &SNDDummy,
#ifdef WIN32 #ifdef WIN32
@ -102,7 +106,7 @@ public:
//TODO !!!!!!!!!!!!!!!!!!!!!! FIXME!!!!!!!!!!1 //TODO !!!!!!!!!!!!!!!!!!!!!! FIXME!!!!!!!!!!1
#ifndef _MSC_VER #ifndef _MSC_VER
PAD_GetStatus(0, &s); // PAD_GetStatus(0, &s);
#endif #endif
if(s.button & PAD_BUTTON_LEFT) if(s.button & PAD_BUTTON_LEFT)
@ -160,7 +164,7 @@ public:
void LoadRom(wxCommandEvent& event){ void LoadRom(wxCommandEvent& event){
wxFileDialog dialog(this,_T("Load Rom"),wxGetHomeDir(),_T(""),_T("*.nds"),wxFD_OPEN, wxDefaultPosition, wxDefaultSize); wxFileDialog dialog(this,_T("Load Rom"),wxGetHomeDir(),_T(""),_T("*.nds"),wxFD_OPEN, wxDefaultPosition, wxDefaultSize);
if(dialog.ShowModal() == wxID_OK) { if(dialog.ShowModal() == wxID_OK) {
NDS_Init (); NDSInitialize();
execute = true; execute = true;
NDS_LoadROM(dialog.GetPath().mb_str(), dialog.GetPath().mb_str()); NDS_LoadROM(dialog.GetPath().mb_str(), dialog.GetPath().mb_str());
} }
@ -336,8 +340,17 @@ public:
} }
void Menu_SaveStates(wxCommandEvent &event); void Menu_SaveStates(wxCommandEvent &event);
void Menu_LoadStates(wxCommandEvent &event); void Menu_LoadStates(wxCommandEvent &event);
void NDSInitialize();
private: private:
#ifdef GDB_STUB
gdbstub_handle_t arm9_gdb_stub;
gdbstub_handle_t arm7_gdb_stub;
struct armcpu_memory_iface *arm9_memio;
struct armcpu_memory_iface *arm7_memio;
struct armcpu_ctrl_iface *arm9_ctrl_iface;
struct armcpu_ctrl_iface *arm7_ctrl_iface;
#endif
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@ -441,16 +454,25 @@ END_EVENT_TABLE()
IMPLEMENT_APP(Desmume) IMPLEMENT_APP(Desmume)
static SPADInitialize PADInitialize;
void DesmumeFrame::NDSInitialize() {
#ifdef GDB_STUB
arm9_memio = &arm9_base_memory_iface;
arm7_memio = &arm7_base_memory_iface;
NDS_Init( arm9_memio, &arm9_ctrl_iface,
arm7_memio, &arm7_ctrl_iface);
#else
NDS_Init();
#endif
}
bool Desmume::OnInit() bool Desmume::OnInit()
{ {
if ( !wxApp::OnInit() ) if ( !wxApp::OnInit() )
return false; return false;
NDS_Init ();
Desmume_InitOnce();
aggDraw.hud->attach((u8*)GPU_screen, 256, 384, 1024);//TODO
NDS_3D_ChangeCore(0);
#ifdef __WIN32__ #ifdef __WIN32__
extern void OpenConsole(); extern void OpenConsole();
@ -459,6 +481,13 @@ bool Desmume::OnInit()
wxString emu_version(EMU_DESMUME_NAME_AND_VERSION(), wxConvUTF8); wxString emu_version(EMU_DESMUME_NAME_AND_VERSION(), wxConvUTF8);
DesmumeFrame *frame = new DesmumeFrame(emu_version); DesmumeFrame *frame = new DesmumeFrame(emu_version);
frame->NDSInitialize();
Desmume_InitOnce();
aggDraw.hud->attach((u8*)GPU_screen, 256, 384, 1024);//TODO
NDS_3D_ChangeCore(0);
frame->Show(true); frame->Show(true);
char *p, *a; char *p, *a;
@ -469,9 +498,10 @@ bool Desmume::OnInit()
if (++p >= a) *p = 0; if (++p >= a) *p = 0;
executableDirectory = std::string(a); executableDirectory = std::string(a);
SPADInitialize PADInitialize;
PADInitialize.padNumber = 1; PADInitialize.padNumber = 1;
extern void Initialize(void *init); extern void Initialize(void *init);
#ifndef _WIN32 #ifndef _WIN32
Initialize(&PADInitialize); Initialize(&PADInitialize);
#endif #endif