set svn:eol-style=native for **.cpp

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1442 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 1234 insertions, 1234 deletions

diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
index 42a6ad9376..dfe1489559 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
@@ -1,1234 +1,1234 @@
-// Copyright (C) 2003-2008 Dolphin Project.

-

-// This program is free software: you can redistribute it and/or modify

-// it under the terms of the GNU General Public License as published by

-// the Free Software Foundation, version 2.0.

-

-// This program is distributed in the hope that it will be useful,

-// but WITHOUT ANY WARRANTY; without even the implied warranty of

-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-// GNU General Public License 2.0 for more details.

-

-// A copy of the GPL 2.0 should have been included with the program.

-// If not, see http://www.gnu.org/licenses/

-

-// Official SVN repository and contact information can be found at

-// http://code.google.com/p/dolphin-emu/

-

-#include <wx/button.h>

-#include <wx/textctrl.h>

-#include <wx/textdlg.h>

-#include <wx/listctrl.h>

-#include <wx/thread.h>

-#include <wx/mstream.h>

-

-// ugly that this lib included code from the main

-#include "../../DolphinWX/Src/Globals.h"

-

-#include "IniFile.h"

-#include "Host.h"

-

-#include "Debugger.h"

-

-#include "RegisterWindow.h"

-#include "LogWindow.h"

-#include "BreakpointWindow.h"

-#include "MemoryWindow.h"

-#include "JitWindow.h"

-

-#include "CodeWindow.h"

-#include "CodeView.h"

-

-#include "FileUtil.h"

-#include "Core.h"

-#include "HLE/HLE.h"

-#include "Boot/Boot.h"

-#include "LogManager.h"

-#include "HW/CPU.h"

-#include "PowerPC/PowerPC.h"

-#include "Debugger/PPCDebugInterface.h"

-#include "Debugger/Debugger_SymbolMap.h"

-#include "PowerPC/PPCAnalyst.h"

-#include "PowerPC/Profiler.h"

-#include "PowerPC/SymbolDB.h"

-#include "PowerPC/SignatureDB.h"

-#include "PowerPC/PPCTables.h"

-#include "PowerPC/Jit64/Jit.h"

-#include "PowerPC/Jit64/JitCache.h" // for ClearCache()

-

-#include "Plugins/Plugin_DSP.h" // new stuff, to let us open the DLLDebugger

-#include "Plugins/Plugin_Video.h" // new stuff, to let us open the DLLDebugger

-#include "../../DolphinWX/Src/PluginManager.h"

-#include "../../DolphinWX/Src/Config.h"

-

-// and here are the classes

-class CPluginInfo;

-class CPluginManager;

-//extern DynamicLibrary Common::CPlugin;

-//extern CPluginManager CPluginManager::m_Instance;

-

-extern "C" {

-	#include "../resources/toolbar_play.c"

-	#include "../resources/toolbar_pause.c"

-	#include "../resources/toolbar_add_memorycheck.c"

-	#include "../resources/toolbar_delete.c"

-	#include "../resources/toolbar_add_breakpoint.c"

-}

-

-static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT;

-

-BEGIN_EVENT_TABLE(CCodeWindow, wxFrame)   

-    EVT_LISTBOX(IDM_SYMBOLLIST,     CCodeWindow::OnSymbolListChange)

-    EVT_LISTBOX(IDM_CALLSTACKLIST,  CCodeWindow::OnCallstackListChange)

-    EVT_LISTBOX(IDM_CALLERSLIST,    CCodeWindow::OnCallersListChange)

-    EVT_LISTBOX(IDM_CALLSLIST,      CCodeWindow::OnCallsListChange)

-    EVT_HOST_COMMAND(wxID_ANY,      CCodeWindow::OnHostMessage)

-    EVT_MENU(IDM_LOGWINDOW,         CCodeWindow::OnToggleLogWindow)

-    EVT_MENU(IDM_REGISTERWINDOW,    CCodeWindow::OnToggleRegisterWindow)

-    EVT_MENU(IDM_BREAKPOINTWINDOW,  CCodeWindow::OnToggleBreakPointWindow)

-    EVT_MENU(IDM_MEMORYWINDOW,      CCodeWindow::OnToggleMemoryWindow)

-	EVT_MENU(IDM_JITWINDOW,			CCodeWindow::OnToggleJitWindow)

-	EVT_MENU(IDM_SOUNDWINDOW,		CCodeWindow::OnToggleSoundWindow)

-	EVT_MENU(IDM_VIDEOWINDOW,		CCodeWindow::OnToggleVideoWindow)

-

-	EVT_MENU(IDM_INTERPRETER,       CCodeWindow::OnInterpreter) // CPU Mode

-	EVT_MENU(IDM_AUTOMATICSTART,       CCodeWindow::OnAutomaticStart) // CPU Mode

-	EVT_MENU(IDM_JITUNLIMITED,			CCodeWindow::OnJITOff)	

-	EVT_MENU(IDM_JITOFF,			CCodeWindow::OnJITOff)

-	EVT_MENU(IDM_JITLSOFF,			CCodeWindow::OnJITOff)

-		EVT_MENU(IDM_JITLSLXZOFF,		CCodeWindow::OnJITOff)

-			EVT_MENU(IDM_JITLSLWZOFF,		CCodeWindow::OnJITOff)

-		EVT_MENU(IDM_JITLSLBZXOFF,		CCodeWindow::OnJITOff)

-	EVT_MENU(IDM_JITLSFOFF,			CCodeWindow::OnJITOff)

-	EVT_MENU(IDM_JITLSPOFF,			CCodeWindow::OnJITOff)

-	EVT_MENU(IDM_JITFPOFF,			CCodeWindow::OnJITOff)

-	EVT_MENU(IDM_JITIOFF,			CCodeWindow::OnJITOff)

-	EVT_MENU(IDM_JITPOFF,			CCodeWindow::OnJITOff)

-	EVT_MENU(IDM_JITSROFF,			CCodeWindow::OnJITOff)

-

-	EVT_MENU(IDM_CLEARSYMBOLS,      CCodeWindow::OnSymbolsMenu)

-	EVT_MENU(IDM_LOADMAPFILE,       CCodeWindow::OnSymbolsMenu)

-	EVT_MENU(IDM_SCANFUNCTIONS,     CCodeWindow::OnSymbolsMenu)

-	EVT_MENU(IDM_SAVEMAPFILE,       CCodeWindow::OnSymbolsMenu)

-	EVT_MENU(IDM_SAVEMAPFILEWITHCODES, CCodeWindow::OnSymbolsMenu)	

-	EVT_MENU(IDM_CREATESIGNATUREFILE, CCodeWindow::OnSymbolsMenu)

-	EVT_MENU(IDM_USESIGNATUREFILE,  CCodeWindow::OnSymbolsMenu)

-	EVT_MENU(IDM_PATCHHLEFUNCTIONS, CCodeWindow::OnSymbolsMenu)

-

-	EVT_MENU(IDM_CLEARCODECACHE,    CCodeWindow::OnJitMenu)

-	EVT_MENU(IDM_LOGINSTRUCTIONS,   CCodeWindow::OnJitMenu)

-

-	EVT_MENU(IDM_PROFILEBLOCKS,     CCodeWindow::OnProfilerMenu)

-	EVT_MENU(IDM_WRITEPROFILE,      CCodeWindow::OnProfilerMenu)

-

-	// toolbar

-	EVT_MENU(IDM_DEBUG_GO,			CCodeWindow::OnCodeStep)

-	EVT_MENU(IDM_STEP,				CCodeWindow::OnCodeStep)

-	EVT_MENU(IDM_STEPOVER,			CCodeWindow::OnCodeStep)

-	EVT_MENU(IDM_SKIP,				CCodeWindow::OnCodeStep)

-	EVT_MENU(IDM_SETPC,				CCodeWindow::OnCodeStep)

-	EVT_MENU(IDM_GOTOPC,			CCodeWindow::OnCodeStep)

-	EVT_TEXT(IDM_ADDRBOX,           CCodeWindow::OnAddrBoxChange)

-

-	EVT_COMMAND(IDM_CODEVIEW, wxEVT_CODEVIEW_CHANGE, CCodeWindow::OnCodeViewChange)

-END_EVENT_TABLE()

-

-#define wxGetBitmapFromMemory(name) _wxGetBitmapFromMemory(name, sizeof(name))

-inline wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length)

-{

-	wxMemoryInputStream is(data, length);

-	return(wxBitmap(wxImage(is, wxBITMAP_TYPE_ANY, -1), -1));

-}

-

-// =======================================================================================

-// WARNING: If you create a new dialog window you must add m_dialog(NULL) below otherwise

-// m_dialog = true and things will crash.

-// ----------------

-CCodeWindow::CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter, wxWindow* parent, wxWindowID id,

-		const wxString& title, const wxPoint& pos, const wxSize& size, long style)

-	: wxFrame(parent, id, title, pos, size, style)

-	, m_LogWindow(NULL)

-	, m_RegisterWindow(NULL)

-	, m_BreakpointWindow(NULL)

-	, m_MemoryWindow(NULL)

-	, m_JitWindow(NULL)

-{

-	// Load ini settings

-	IniFile file;

-	file.Load(DEBUGGER_CONFIG_FILE);

-	this->Load_(file);

-

-	InitBitmaps();

-

-	CreateGUIControls(_LocalCoreStartupParameter);

-

-	// Create the toolbar

-	RecreateToolbar();

-

-	UpdateButtonStates();

-

-	wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN,

-		wxKeyEventHandler(CCodeWindow::OnKeyDown),

-		(wxObject*)0, this);

-

-	// Load settings for selectable windowses, but only if they have been created

-	this->Load(file);

-	if (m_BreakpointWindow) m_BreakpointWindow->Load(file);

-	if (m_RegisterWindow) m_RegisterWindow->Load(file);

-	if (m_MemoryWindow) m_MemoryWindow->Load(file);

-	if (m_JitWindow) m_JitWindow->Load(file);

-}

-// ===============

-

-

-CCodeWindow::~CCodeWindow()

-{

-	IniFile file;

-	file.Load(DEBUGGER_CONFIG_FILE);

-

-	this->Save(file);

-	if (m_BreakpointWindow) m_BreakpointWindow->Save(file);

-	if (m_LogWindow) m_LogWindow->Save(file);

-	if (m_RegisterWindow) m_RegisterWindow->Save(file);

-	if (m_MemoryWindow) m_MemoryWindow->Save(file);

-	if (m_JitWindow) m_JitWindow->Save(file);

-

-	file.Save(DEBUGGER_CONFIG_FILE);

-}

-

-

-// =======================================================================================

-// Load before CreateGUIControls()

-// --------------

-void CCodeWindow::Load_( IniFile &ini )

-{

-

-	// Decide what windows to use

-	ini.Get("ShowOnStart", "LogWindow", &bLogWindow, true);

-	ini.Get("ShowOnStart", "RegisterWindow", &bRegisterWindow, true);

-	ini.Get("ShowOnStart", "BreakpointWindow", &bBreakpointWindow, true);

-	ini.Get("ShowOnStart", "MemoryWindow", &bMemoryWindow, true);

-	ini.Get("ShowOnStart", "JitWindow", &bJitWindow, true);

-	ini.Get("ShowOnStart", "SoundWindow", &bSoundWindow, false);

-	ini.Get("ShowOnStart", "VideoWindow", &bVideoWindow, false);

-	// ===============

-

-	// Boot to pause or not

-	ini.Get("ShowOnStart", "AutomaticStart", &bAutomaticStart, false);

-}

-

-

-void CCodeWindow::Load( IniFile &ini )

-{

-	int x,y,w,h;

-	ini.Get("CodeWindow", "x", &x, GetPosition().x);

-	ini.Get("CodeWindow", "y", &y, GetPosition().y);

-	ini.Get("CodeWindow", "w", &w, GetSize().GetWidth());

-	ini.Get("CodeWindow", "h", &h, GetSize().GetHeight());

-	this->SetSize(x, y, w, h);

-}

-

-

-void CCodeWindow::Save(IniFile &ini) const

-{

-	ini.Set("CodeWindow", "x", GetPosition().x);

-	ini.Set("CodeWindow", "y", GetPosition().y);

-	ini.Set("CodeWindow", "w", GetSize().GetWidth());

-	ini.Set("CodeWindow", "h", GetSize().GetHeight());

-

-	// Boot to pause or not

-	ini.Set("ShowOnStart", "AutomaticStart", GetMenuBar()->IsChecked(IDM_AUTOMATICSTART));

-

-	// Save windows settings

-	ini.Set("ShowOnStart", "LogWindow", GetMenuBar()->IsChecked(IDM_LOGWINDOW));

-	ini.Set("ShowOnStart", "RegisterWindow", GetMenuBar()->IsChecked(IDM_REGISTERWINDOW));

-	ini.Set("ShowOnStart", "BreakpointWindow", GetMenuBar()->IsChecked(IDM_BREAKPOINTWINDOW));

-	ini.Set("ShowOnStart", "MemoryWindow", GetMenuBar()->IsChecked(IDM_MEMORYWINDOW));

-	ini.Set("ShowOnStart", "JitWindow", GetMenuBar()->IsChecked(IDM_JITWINDOW));

-	ini.Set("ShowOnStart", "SoundWindow", GetMenuBar()->IsChecked(IDM_SOUNDWINDOW));

-	ini.Set("ShowOnStart", "VideoWindow", GetMenuBar()->IsChecked(IDM_VIDEOWINDOW));

-}

-

-

-void CCodeWindow::CreateGUIControls(const SCoreStartupParameter& _LocalCoreStartupParameter)

-{

-	CreateMenu(_LocalCoreStartupParameter);

-

-	// =======================================================================================

-	// Configure the code window

-	wxBoxSizer* sizerBig   = new wxBoxSizer(wxHORIZONTAL);

-	wxBoxSizer* sizerLeft  = new wxBoxSizer(wxVERTICAL);

-

-	DebugInterface* di = new PPCDebugInterface();

-

-	codeview = new CCodeView(di, this, IDM_CODEVIEW);

-	sizerBig->Add(sizerLeft, 2, wxEXPAND);

-	sizerBig->Add(codeview, 5, wxEXPAND);

-

-	sizerLeft->Add(callstack = new wxListBox(this, IDM_CALLSTACKLIST, wxDefaultPosition, wxSize(90, 100)), 0, wxEXPAND);

-	sizerLeft->Add(symbols = new wxListBox(this, IDM_SYMBOLLIST, wxDefaultPosition, wxSize(90, 100), 0, NULL, wxLB_SORT), 1, wxEXPAND);

-	sizerLeft->Add(calls = new wxListBox(this, IDM_CALLSLIST, wxDefaultPosition, wxSize(90, 100), 0, NULL, wxLB_SORT), 0, wxEXPAND);

-	sizerLeft->Add(callers = new wxListBox(this, IDM_CALLERSLIST, wxDefaultPosition, wxSize(90, 100), 0, NULL, wxLB_SORT), 0, wxEXPAND);

-

-	SetSizer(sizerBig);

-

-	sizerLeft->SetSizeHints(this);

-	sizerLeft->Fit(this);

-	sizerBig->SetSizeHints(this);

-	sizerBig->Fit(this);

-

-	sync_event.Init();

-	// =================

-

-

-	// additional dialogs

-	if (IsLoggingActivated() && bLogWindow)

-	{

-		m_LogWindow = new CLogWindow(this);

-		m_LogWindow->Show(true);

-	}

-

-	if (bRegisterWindow)

-	{

-		m_RegisterWindow = new CRegisterWindow(this);

-		m_RegisterWindow->Show(true);

-	}

-

-	if(bBreakpointWindow)

-	{

-		m_BreakpointWindow = new CBreakPointWindow(this, this);

-		m_BreakpointWindow->Show(true);

-	}

-

-	if(bMemoryWindow)

-	{

-		m_MemoryWindow = new CMemoryWindow(this);

-		m_MemoryWindow->Show(true);

-	}

-

-	if(bJitWindow)

-	{

-		m_JitWindow = new CJitWindow(this);

-		m_JitWindow->Show(true);

-	}

-

-	if(bSoundWindow)

-	{

-		// possible todo: add some kind of if here to? can it fail?

-		CPluginManager::GetInstance().OpenDebug(

-		GetHandle(),

-		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(),

-		false, true

-		);	

-	} // don't have any else, just ignore it

-

-	if(bVideoWindow)

-	{

-		// possible todo: add some kind of if here to? can it fail?

-		CPluginManager::GetInstance().OpenDebug(

-		GetHandle(),

-		_LocalCoreStartupParameter.m_strVideoPlugin.c_str(),

-		true, true

-		);

-	} // don't have any else, just ignore it

-}

-

-

-void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter)

-{

-

-	// =======================================================================================

-	// Windowses

-	// ---------------

-	wxMenuBar* pMenuBar = new wxMenuBar(wxMB_DOCKABLE);

-

-	{	

-		wxMenu* pCoreMenu = new wxMenu;

-

-		wxMenuItem* interpreter = pCoreMenu->Append(IDM_INTERPRETER, _T("&Interpreter core"), wxEmptyString, wxITEM_CHECK);

-		interpreter->Check(!_LocalCoreStartupParameter.bUseJIT);

-		pCoreMenu->AppendSeparator();

-		wxMenuItem* automaticstart = pCoreMenu->Append(IDM_AUTOMATICSTART, _T("&Automatic start"), wxEmptyString, wxITEM_CHECK);

-		automaticstart->Check(bAutomaticStart);		

-		pCoreMenu->AppendSeparator();

-

-#ifdef JIT_OFF_OPTIONS

-		jitunlimited = pCoreMenu->Append(IDM_JITUNLIMITED, _T("&Unlimited JIT Cache"), wxEmptyString, wxITEM_CHECK);

-		pCoreMenu->AppendSeparator();

-		jitoff = pCoreMenu->Append(IDM_JITOFF, _T("&JIT off (JIT core)"), wxEmptyString, wxITEM_CHECK);

-		jitlsoff = pCoreMenu->Append(IDM_JITLSOFF, _T("&JIT LoadStore off"), wxEmptyString, wxITEM_CHECK);

-			jitlslbzxoff = pCoreMenu->Append(IDM_JITLSLBZXOFF, _T("    &JIT LoadStore lbzx off"), wxEmptyString, wxITEM_CHECK);

-			jitlslxzoff = pCoreMenu->Append(IDM_JITLSLXZOFF, _T("    &JIT LoadStore lXz off"), wxEmptyString, wxITEM_CHECK);

-				jitlslwzoff = pCoreMenu->Append(IDM_JITLSLWZOFF, _T("        &JIT LoadStore lwz off"), wxEmptyString, wxITEM_CHECK);

-		jitlspoff = pCoreMenu->Append(IDM_JITLSFOFF, _T("&JIT LoadStore Floating off"), wxEmptyString, wxITEM_CHECK);

-		jitlsfoff = pCoreMenu->Append(IDM_JITLSPOFF, _T("&JIT LoadStore Paired off"), wxEmptyString, wxITEM_CHECK);

-		jitfpoff = pCoreMenu->Append(IDM_JITFPOFF, _T("&JIT FloatingPoint off"), wxEmptyString, wxITEM_CHECK);

-		jitioff = pCoreMenu->Append(IDM_JITIOFF, _T("&JIT Integer off"), wxEmptyString, wxITEM_CHECK);

-		jitpoff = pCoreMenu->Append(IDM_JITPOFF, _T("&JIT Paired off"), wxEmptyString, wxITEM_CHECK);

-		jitsroff = pCoreMenu->Append(IDM_JITSROFF, _T("&JIT SystemRegisters off"), wxEmptyString, wxITEM_CHECK);

-#endif

-

-//		wxMenuItem* dualcore = pDebugMenu->Append(IDM_DUALCORE, _T("&DualCore"), wxEmptyString, wxITEM_CHECK);

-//		dualcore->Check(_LocalCoreStartupParameter.bUseDualCore);

-		

-		pMenuBar->Append(pCoreMenu, _T("&CPU Mode"));		

-

-	}

-

-	{

-		wxMenu* pDebugDialogs = new wxMenu;

-

-		if (IsLoggingActivated())

-		{

-			wxMenuItem* pLogWindow = pDebugDialogs->Append(IDM_LOGWINDOW, _T("&LogManager"), wxEmptyString, wxITEM_CHECK);

-			pLogWindow->Check(bLogWindow);

-		}

-

-		wxMenuItem* pRegister = pDebugDialogs->Append(IDM_REGISTERWINDOW, _T("&Registers"), wxEmptyString, wxITEM_CHECK);

-		pRegister->Check(bRegisterWindow);

-

-		wxMenuItem* pBreakPoints = pDebugDialogs->Append(IDM_BREAKPOINTWINDOW, _T("&BreakPoints"), wxEmptyString, wxITEM_CHECK);

-		pBreakPoints->Check(bBreakpointWindow);

-

-		wxMenuItem* pMemory = pDebugDialogs->Append(IDM_MEMORYWINDOW, _T("&Memory"), wxEmptyString, wxITEM_CHECK);

-		pMemory->Check(bMemoryWindow);

-

-		wxMenuItem* pJit = pDebugDialogs->Append(IDM_JITWINDOW, _T("&Jit"), wxEmptyString, wxITEM_CHECK);

-		pJit->Check(bJitWindow);

-

-		wxMenuItem* pSound = pDebugDialogs->Append(IDM_SOUNDWINDOW, _T("&Sound"), wxEmptyString, wxITEM_CHECK);

-		pSound->Check(bSoundWindow);

-

-		wxMenuItem* pVideo = pDebugDialogs->Append(IDM_VIDEOWINDOW, _T("&Video"), wxEmptyString, wxITEM_CHECK);

-		pVideo->Check(bVideoWindow);

-

-		pMenuBar->Append(pDebugDialogs, _T("&Views"));

-	}

-	// ===============

-

-

-	{

-		wxMenu *pSymbolsMenu = new wxMenu;

-		pSymbolsMenu->Append(IDM_CLEARSYMBOLS, _T("&Clear symbols"));

-		// pSymbolsMenu->Append(IDM_CLEANSYMBOLS, _T("&Clean symbols (zz)"));

-		pSymbolsMenu->Append(IDM_SCANFUNCTIONS, _T("&Generate symbol map"));

-		pSymbolsMenu->AppendSeparator();

-		pSymbolsMenu->Append(IDM_LOADMAPFILE, _T("&Load symbol map"));

-		pSymbolsMenu->Append(IDM_SAVEMAPFILE, _T("&Save symbol map"));

-		pSymbolsMenu->AppendSeparator();

-		pSymbolsMenu->Append(IDM_SAVEMAPFILEWITHCODES, _T("Save code"));

-		pSymbolsMenu->AppendSeparator();

-		pSymbolsMenu->Append(IDM_CREATESIGNATUREFILE, _T("&Create signature file..."));

-		pSymbolsMenu->Append(IDM_USESIGNATUREFILE, _T("&Use signature file..."));

-		pSymbolsMenu->AppendSeparator();

-		pSymbolsMenu->Append(IDM_PATCHHLEFUNCTIONS, _T("&Patch HLE functions"));

-		pMenuBar->Append(pSymbolsMenu, _T("&Symbols"));

-	}

-

-	{

-		wxMenu *pJitMenu = new wxMenu;

-		pJitMenu->Append(IDM_CLEARCODECACHE, _T("&Clear code cache"));

-		pJitMenu->Append(IDM_LOGINSTRUCTIONS, _T("&Log JIT instruction coverage"));

-		pMenuBar->Append(pJitMenu, _T("&JIT"));

-	}

-

-	{

-		wxMenu *pProfilerMenu = new wxMenu;

-		pProfilerMenu->Append(IDM_PROFILEBLOCKS, _T("&Profile blocks"), wxEmptyString, wxITEM_CHECK);

-		pProfilerMenu->AppendSeparator();

-		pProfilerMenu->Append(IDM_WRITEPROFILE, _T("&Write to profile.txt, show"));

-		pMenuBar->Append(pProfilerMenu, _T("&Profiler"));

-	}

-

-

-	SetMenuBar(pMenuBar);

-}

-

-

-bool CCodeWindow::UseInterpreter()

-{

-	return GetMenuBar()->IsChecked(IDM_INTERPRETER);

-}

-

-bool CCodeWindow::AutomaticStart()

-{

-	return GetMenuBar()->IsChecked(IDM_AUTOMATICSTART);

-}

-

-bool CCodeWindow::UseDualCore()

-{

-	return GetMenuBar()->IsChecked(IDM_DUALCORE);

-}

-

-

-// =======================================================================================

-// CPU Mode

-// --------------

-void CCodeWindow::OnInterpreter(wxCommandEvent& event)

-{

-	if (Core::GetState() != Core::CORE_RUN) {

-		PowerPC::SetMode(UseInterpreter() ? PowerPC::MODE_INTERPRETER : PowerPC::MODE_JIT);

-	} else {

-		event.Skip();

-		wxMessageBox(_T("Please pause the emulator before changing mode."));

-	}

-}

-

-

-void CCodeWindow::OnAutomaticStart(wxCommandEvent& event)

-{

-	bAutomaticStart = !bAutomaticStart;

-}

-

-

-void CCodeWindow::OnJITOff(wxCommandEvent& event)

-{

-	if (Core::GetState() == Core::CORE_UNINITIALIZED)

-	{

-		// we disallow changing the status here because it will be reset to the defult when BootCore()

-		// creates the SCoreStartupParameter as a game is loaded

-		GetMenuBar()->Check(event.GetId(),!event.IsChecked());

-		wxMessageBox(_T("Please start a game before changing mode."));	

-	} else {

-		if (Core::GetState() != Core::CORE_RUN)

-		{

-			switch (event.GetId())

-			{

-			case IDM_JITUNLIMITED:

-				Core::g_CoreStartupParameter.bJITUnlimitedCache = event.IsChecked();

-				Jit64::ClearCache(); // allow InitCache() even after the game has started

-				Jit64::InitCache();

-				GetMenuBar()->Enable(event.GetId(),!event.IsChecked());

-				break;

-			case IDM_JITOFF:

-				Core::g_CoreStartupParameter.bJITOff = event.IsChecked(); break;

-			case IDM_JITLSOFF:

-				Core::g_CoreStartupParameter.bJITLoadStoreOff = event.IsChecked(); break;

-				case IDM_JITLSLXZOFF:

-					Core::g_CoreStartupParameter.bJITLoadStorelXzOff = event.IsChecked(); break;

-					case IDM_JITLSLWZOFF:

-						Core::g_CoreStartupParameter.bJITLoadStorelwzOff = event.IsChecked(); break;

-				case IDM_JITLSLBZXOFF:

-					Core::g_CoreStartupParameter.bJITLoadStorelbzxOff = event.IsChecked(); break;

-			case IDM_JITLSFOFF:

-				Core::g_CoreStartupParameter.bJITLoadStoreFloatingOff = event.IsChecked(); break;

-			case IDM_JITLSPOFF:

-				Core::g_CoreStartupParameter.bJITLoadStorePairedOff = event.IsChecked(); break;

-			case IDM_JITFPOFF:

-				Core::g_CoreStartupParameter.bJITFloatingPointOff = event.IsChecked(); break;

-			case IDM_JITIOFF:

-				Core::g_CoreStartupParameter.bJITIntegerOff = event.IsChecked(); break;

-			case IDM_JITPOFF:

-				Core::g_CoreStartupParameter.bJITPairedOff = event.IsChecked(); break;

-			case IDM_JITSROFF:

-				Core::g_CoreStartupParameter.bJITSystemRegistersOff = event.IsChecked(); break;

-			}

-			Jit64::ClearCache();			

-		} else {

-			//event.Skip(); // this doesn't work

-			GetMenuBar()->Check(event.GetId(),!event.IsChecked());

-			wxMessageBox(_T("Please pause the emulator before changing mode."));		

-		}

-	}

-}

-// ==============

-

-

-void CCodeWindow::OnJitMenu(wxCommandEvent& event)

-{

-	switch (event.GetId())

-	{

-	case IDM_CLEARCODECACHE:

-		Jit64::ClearCache();

-		break;

-	case IDM_LOGINSTRUCTIONS:

-		PPCTables::LogCompiledInstructions();

-		break;

-	}

-}

-

-void CCodeWindow::OnProfilerMenu(wxCommandEvent& event)

-{

-	if (Core::GetState() == Core::CORE_RUN) {

-		event.Skip();

-		return;

-	}

-	switch (event.GetId())

-	{

-	case IDM_PROFILEBLOCKS:

-		Jit64::ClearCache();

-		Profiler::g_ProfileBlocks = GetMenuBar()->IsChecked(IDM_PROFILEBLOCKS);

-		break;

-	case IDM_WRITEPROFILE:

-		Profiler::WriteProfileResults("profiler.txt");

-		File::Launch("profiler.txt");

-		break;

-	}

-}

-

-void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event) 

-{

-	if (Core::GetState() == Core::CORE_UNINITIALIZED)

-	{

-		// TODO: disable menu items instead :P

-		return;

-	}

-	std::string mapfile = CBoot::GenerateMapFilename();

-	switch (event.GetId())

-	{

-	case IDM_CLEARSYMBOLS:

-		g_symbolDB.Clear();

-		Host_NotifyMapLoaded();

-		break;

-	case IDM_CLEANSYMBOLS:

-		g_symbolDB.Clear("zz");

-		Host_NotifyMapLoaded();

-		break;

-	case IDM_SCANFUNCTIONS:

-		{

-		PPCAnalyst::FindFunctions(0x80000000, 0x80400000, &g_symbolDB);

-		SignatureDB db;

-		if (db.Load(TOTALDB_FILE))

-			db.Apply(&g_symbolDB);

-

-		// HLE::PatchFunctions();

-		NotifyMapLoaded();

-		break;

-		}

-	case IDM_LOADMAPFILE:

-		if (!File::Exists(mapfile.c_str()))

-		{

-			g_symbolDB.Clear();

-			PPCAnalyst::FindFunctions(0x80000000, 0x80400000, &g_symbolDB);

-			SignatureDB db;

-			if (db.Load(TOTALDB_FILE))

-				db.Apply(&g_symbolDB);

-		} else {

-			g_symbolDB.LoadMap(mapfile.c_str());

-		}

-		NotifyMapLoaded();

-		break;

-	case IDM_SAVEMAPFILE:

-		g_symbolDB.SaveMap(mapfile.c_str());

-		break;

-	case IDM_SAVEMAPFILEWITHCODES:

-		g_symbolDB.SaveMap(mapfile.c_str(), true);

-		break;

-	case IDM_CREATESIGNATUREFILE:

-		{

-		wxTextEntryDialog input_prefix(this, wxString::FromAscii("Only export symbols with prefix:"), wxGetTextFromUserPromptStr, _T("."));

-		if (input_prefix.ShowModal() == wxID_OK) {

-			std::string prefix(input_prefix.GetValue().mb_str());

-

-			wxString path = wxFileSelector(

-					_T("Save signature as"), wxEmptyString, wxEmptyString, wxEmptyString,

-					_T("Dolphin Signature File (*.dsy)|*.dsy;"), wxFD_SAVE,

-					this);

-			if (path) {

-				SignatureDB db;

-				db.Initialize(&g_symbolDB, prefix.c_str());

-				std::string filename(path.ToAscii());		// PPCAnalyst::SaveSignatureDB(

-				db.Save(path.ToAscii());

-			}

-		}

-		}

-		break;

-	case IDM_USESIGNATUREFILE:

-		{

-		wxString path = wxFileSelector(

-				_T("Apply signature file"), wxEmptyString, wxEmptyString, wxEmptyString,

-				_T("Dolphin Signature File (*.dsy)|*.dsy;"), wxFD_OPEN | wxFD_FILE_MUST_EXIST,

-				this);

-		if (path) {

-			SignatureDB db;

-			db.Load(path.ToAscii());

-			db.Apply(&g_symbolDB);

-		}

-		}

-		NotifyMapLoaded();

-		break;

-	case IDM_PATCHHLEFUNCTIONS:

-		HLE::PatchFunctions();

-		Update();

-		break;

-	}

-}

-

-// =======================================================================================

-// The Play, Stop, Step, Skip, Go to PC and Show PC buttons all go here 

-// --------------

-void CCodeWindow::OnCodeStep(wxCommandEvent& event)

-{

-	switch (event.GetId())

-	{

-	    case IDM_DEBUG_GO:

-	    {

-		    // [F|RES] prolly we should disable the other buttons in go mode too ...

-		    JumpToAddress(PC);

-

-		    if (CCPU::IsStepping())

-		    {

-			    CCPU::EnableStepping(false);

-		    }

-		    else

-		    {

-			    CCPU::EnableStepping(true);

-			    Host_UpdateLogDisplay();

-		    }

-

-		    Update();

-	    }

-		break;

-

-	    case IDM_STEP:

-			SingleCPUStep();

-

-		    break;

-

-	    case IDM_STEPOVER:

-		    CCPU::EnableStepping(true);

-		    break;

-

-	    case IDM_SKIP:

-		    PC += 4;

-		    Update();

-		    break;

-

-	    case IDM_SETPC:

-		    PC = codeview->GetSelection();

-		    Update();

-		    break;

-

-	    case IDM_GOTOPC:

-		    JumpToAddress(PC);

-		    break;

-	}

-

-	UpdateButtonStates();

-}

-

-

-void CCodeWindow::JumpToAddress(u32 _Address)

-{

-    codeview->Center(_Address);

-	UpdateLists();

-}

-

-

-void CCodeWindow::UpdateLists()

-{

-	callers->Clear();

-	u32 addr = codeview->GetSelection();

-	Symbol *symbol = g_symbolDB.GetSymbolFromAddr(addr);

-	if (!symbol)

-		return;

-	for (int i = 0; i < (int)symbol->callers.size(); i++)

-	{

-		u32 caller_addr = symbol->callers[i].callAddress;

-		Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr);

-		if (caller_symbol) {

-			int idx = callers->Append(wxString::Format( wxT("< %s (%08x)"), caller_symbol->name.c_str(), caller_addr));

-			callers->SetClientData(idx, (void*)caller_addr);

-		}

-	}

-

-	calls->Clear();

-	for (int i = 0; i < (int)symbol->calls.size(); i++)

-	{

-		u32 call_addr = symbol->calls[i].function;

-		Symbol *call_symbol = g_symbolDB.GetSymbolFromAddr(call_addr);

-		if (call_symbol) {

-			int idx = calls->Append(wxString::Format(_T("> %s (%08x)"), call_symbol->name.c_str(), call_addr));

-			calls->SetClientData(idx, (void*)call_addr);

-		}

-	}

-}

-

-

-void CCodeWindow::OnCodeViewChange(wxCommandEvent &event)

-{

-	//PanicAlert("boo");

-	UpdateLists();

-}

-

-void CCodeWindow::OnAddrBoxChange(wxCommandEvent& event)

-{

-	wxTextCtrl* pAddrCtrl = (wxTextCtrl*)GetToolBar()->FindControl(IDM_ADDRBOX);

-	wxString txt = pAddrCtrl->GetValue();

-

-	std::string text(txt.mb_str());

-	text = StripSpaces(text);

-	if (text.size() == 8)

-	{

-		u32 addr;

-		sscanf(text.c_str(), "%08x", &addr);

-		JumpToAddress(addr);

-	}

-

-	event.Skip(1);

-}

-

-void CCodeWindow::OnCallstackListChange(wxCommandEvent& event)

-{

-	int index   = callstack->GetSelection();

-	if (index >= 0) {

-		u32 address = (u32)(u64)(callstack->GetClientData(index));

-		if (address)

-			JumpToAddress(address);

-	}

-}

-

-void CCodeWindow::OnCallersListChange(wxCommandEvent& event)

-{

-	int index = callers->GetSelection();

-	if (index >= 0) {

-		u32 address = (u32)(u64)(callers->GetClientData(index));

-		if (address)

-			JumpToAddress(address);

-	}

-}

-

-void CCodeWindow::OnCallsListChange(wxCommandEvent& event)

-{

-	int index = calls->GetSelection();

-	if (index >= 0) {

-		u32 address = (u32)(u64)(calls->GetClientData(index));

-		if (address)

-			JumpToAddress(address);

-	}

-}

-

-void CCodeWindow::Update()

-{

-	codeview->Refresh();

-	callstack->Clear();

-

-	std::vector<Debugger::CallstackEntry> stack;

-

-	if (Debugger::GetCallstack(stack))

-	{

-		for (size_t i = 0; i < stack.size(); i++)

-		{

-			int idx = callstack->Append(wxString::FromAscii(stack[i].Name.c_str()));

-			callstack->SetClientData(idx, (void*)(u64)stack[i].vAddress);

-		}

-	}

-	else

-	{

-		callstack->Append(wxString::FromAscii("invalid callstack"));

-	}

-

-	UpdateButtonStates();

-

-	/* Automatically show the current PC position when a breakpoint is hit or

-	   when we pause */

-	codeview->Center(PC);

-}

-

-

-void CCodeWindow::NotifyMapLoaded()

-{

-	g_symbolDB.FillInCallers();

-	symbols->Show(false); // hide it for faster filling

-	symbols->Clear();

-	for (SymbolDB::XFuncMap::iterator iter = g_symbolDB.GetIterator(); iter != g_symbolDB.End(); iter++)

-	{

-		int idx = symbols->Append(wxString::FromAscii(iter->second.name.c_str()));

-		symbols->SetClientData(idx, (void*)&iter->second);

-	}

-	symbols->Show(true);

-	Update();

-}

-

-

-void CCodeWindow::UpdateButtonStates()

-{

-	wxToolBar* toolBar = GetToolBar();

-	if (Core::GetState() == Core::CORE_UNINITIALIZED)

-	{

-		toolBar->EnableTool(IDM_DEBUG_GO, false);

-		toolBar->EnableTool(IDM_STEP, false);

-		toolBar->EnableTool(IDM_STEPOVER, false);

-		toolBar->EnableTool(IDM_SKIP, false);

-	}

-	else

-	{

-		if (!CCPU::IsStepping())

-		{

-			toolBar->SetToolShortHelp(IDM_DEBUG_GO, _T("&Pause"));

-			toolBar->SetToolNormalBitmap(IDM_DEBUG_GO, m_Bitmaps[Toolbar_Pause]);

-			toolBar->EnableTool(IDM_DEBUG_GO, true);

-			toolBar->EnableTool(IDM_STEP, false);

-			toolBar->EnableTool(IDM_STEPOVER, false);

-			toolBar->EnableTool(IDM_SKIP, false);

-		}

-		else

-		{

-			toolBar->SetToolShortHelp(IDM_DEBUG_GO, _T("&Play"));

-			toolBar->SetToolNormalBitmap(IDM_DEBUG_GO, m_Bitmaps[Toolbar_DebugGo]);

-			toolBar->EnableTool(IDM_DEBUG_GO, true);

-			toolBar->EnableTool(IDM_STEP, true);

-			toolBar->EnableTool(IDM_STEPOVER, true);

-			toolBar->EnableTool(IDM_SKIP, true);

-		}

-	}

-}

-

-

-void CCodeWindow::OnSymbolListChange(wxCommandEvent& event)

-{

-	int index = symbols->GetSelection();

-	if (index >= 0) {

-		Symbol* pSymbol = static_cast<Symbol *>(symbols->GetClientData(index));

-		if (pSymbol != NULL)

-		{

-			if(pSymbol->type == Symbol::SYMBOL_DATA)

-			{

-				if(m_MemoryWindow && m_MemoryWindow->IsVisible())

-					m_MemoryWindow->JumpToAddress(pSymbol->address);

-			}

-			else

-			{

-				JumpToAddress(pSymbol->address);

-			}

-		}

-	}

-}

-

-void CCodeWindow::OnSymbolListContextMenu(wxContextMenuEvent& event)

-{

-}

-

-

-void CCodeWindow::OnToggleLogWindow(wxCommandEvent& event)

-{

-	if (IsLoggingActivated())

-	{

-		bool show = GetMenuBar()->IsChecked(event.GetId());

-

-		if (show)

-		{

-			if (!m_LogWindow)

-			{

-				m_LogWindow = new CLogWindow(this);

-			}

-

-			m_LogWindow->Show(true);

-		}

-		else // hide

-		{

-			// If m_dialog is NULL, then possibly the system

-			// didn't report the checked menu item status correctly.

-			// It should be true just after the menu item was selected,

-			// if there was no modeless dialog yet.

-			wxASSERT(m_LogWindow != NULL);

-

-			if (m_LogWindow)

-			{

-				m_LogWindow->Hide();

-			}

-		}

-	}

-}

-

-

-void CCodeWindow::OnToggleRegisterWindow(wxCommandEvent& event)

-{

-	bool show = GetMenuBar()->IsChecked(event.GetId());

-

-	if (show)

-	{

-		if (!m_RegisterWindow)

-		{

-			m_RegisterWindow = new CRegisterWindow(this);

-		}

-

-		m_RegisterWindow->Show(true);

-	}

-	else // hide

-	{

-		// If m_dialog is NULL, then possibly the system

-		// didn't report the checked menu item status correctly.

-		// It should be true just after the menu item was selected,

-		// if there was no modeless dialog yet.

-		wxASSERT(m_RegisterWindow != NULL);

-

-		if (m_RegisterWindow)

-		{

-			m_RegisterWindow->Hide();

-		}

-	}

-}

-

-

-// =======================================================================================

-// Toggle Sound Debugging Window

-// ------------

-void CCodeWindow::OnToggleSoundWindow(wxCommandEvent& event)

-{

-	bool show = GetMenuBar()->IsChecked(event.GetId());

-

-	if (show)

-	{

-		// TODO: add some kind of if() check here to?

-		CPluginManager::GetInstance().OpenDebug(

-			GetHandle(),

-			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(),

-			false, true // DSP, show

-			);

-	}

-	else // hide

-	{

-		// Close the sound dll that has an open debugger

-		CPluginManager::GetInstance().OpenDebug(

-			GetHandle(),

-			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(),

-			false, false // DSP, hide

-			);

-	}

-}

-// ===========

-

-

-// =======================================================================================

-// Toggle Video Debugging Window

-// ------------

-void CCodeWindow::OnToggleVideoWindow(wxCommandEvent& event)

-{

-	bool show = GetMenuBar()->IsChecked(event.GetId());

-	//GetMenuBar()->Check(event.GetId(), false); // Turn off

-

-	if (show)

-	{

-		// It works now, but I'll keep this message in case the problem reappears

-		/*if(Core::GetState() == Core::CORE_UNINITIALIZED)

-		{

-			wxMessageBox(_T("Warning, opening this window before a game is started \n\

-may cause a crash when a game is later started. Todo: figure out why and fix it."), wxT("OpenGL Debugging Window"));	

-		}*/

-

-		// TODO: add some kind of if() check here to?

-		CPluginManager::GetInstance().OpenDebug(

-		GetHandle(),

-		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin.c_str(),

-		true, true // Video, show

-		);

-	}

-	else // hide

-	{

-		// Close the video dll that has an open debugger

-		CPluginManager::GetInstance().OpenDebug(

-			GetHandle(),

-			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin.c_str(),

-			true, false // Video, hide

-			);

-	}

-}

-// ===========

-

-

-void CCodeWindow::OnToggleJitWindow(wxCommandEvent& event)

-{

-	bool show = GetMenuBar()->IsChecked(event.GetId());

-

-	if (show)

-	{

-		if (!m_JitWindow)

-		{

-			m_JitWindow = new CJitWindow(this);

-		}

-

-		m_JitWindow->Show(true);

-	}

-	else // hide

-	{

-		// If m_dialog is NULL, then possibly the system

-		// didn't report the checked menu item status correctly.

-		// It should be true just after the menu item was selected,

-		// if there was no modeless dialog yet.

-		wxASSERT(m_JitWindow != NULL);

-

-		if (m_JitWindow)

-		{

-			m_JitWindow->Hide();

-		}

-	}

-}

-

-

-void CCodeWindow::OnToggleBreakPointWindow(wxCommandEvent& event)

-{

-	bool show = GetMenuBar()->IsChecked(event.GetId());

-

-	if (show)

-	{

-		if (!m_BreakpointWindow)

-		{

-			m_BreakpointWindow = new CBreakPointWindow(this, this);

-		}

-

-		m_BreakpointWindow->Show(true);

-	}

-	else // hide

-	{

-		// If m_dialog is NULL, then possibly the system

-		// didn't report the checked menu item status correctly.

-		// It should be true just after the menu item was selected,

-		// if there was no modeless dialog yet.

-		wxASSERT(m_BreakpointWindow != NULL);

-

-		if (m_BreakpointWindow)

-		{

-			m_BreakpointWindow->Hide();

-		}

-	}

-}

-

-void CCodeWindow::OnToggleMemoryWindow(wxCommandEvent& event)

-{

-	bool show = GetMenuBar()->IsChecked(event.GetId());

-

-	if (show)

-	{

-		if (!m_MemoryWindow)

-		{

-			m_MemoryWindow = new CMemoryWindow(this);

-		}

-

-		m_MemoryWindow->Show(true);

-	}

-	else // hide

-	{

-		// If m_dialog is NULL, then possibly the system

-		// didn't report the checked menu item status correctly.

-		// It should be true just after the menu item was selected,

-		// if there was no modeless dialog yet.

-		wxASSERT(m_MemoryWindow != NULL);

-

-		if (m_MemoryWindow)

-		{

-			m_MemoryWindow->Hide();

-		}

-	}

-}

-

-void CCodeWindow::OnHostMessage(wxCommandEvent& event)

-{

-	switch (event.GetId())

-	{

-	    case IDM_NOTIFYMAPLOADED:

-		    NotifyMapLoaded();

-		    break;

-

-	    case IDM_UPDATELOGDISPLAY:

-

-		    if (m_LogWindow)

-		    {

-			    m_LogWindow->NotifyUpdate();

-		    }

-

-		    break;

-

-	    case IDM_UPDATEDISASMDIALOG:

-		    Update();

-

-		    if (m_RegisterWindow)

-		    {

-			    m_RegisterWindow->NotifyUpdate();

-		    }

-		    break;

-

-		case IDM_UPDATEBREAKPOINTS:

-            Update();

-

-			if (m_BreakpointWindow)

-			{

-				m_BreakpointWindow->NotifyUpdate();

-			}

-			break;

-

-	}

-}

-

-void CCodeWindow::PopulateToolbar(wxToolBar* toolBar)

-{

-	int w = m_Bitmaps[Toolbar_DebugGo].GetWidth(),

-		h = m_Bitmaps[Toolbar_DebugGo].GetHeight();

-

-	toolBar->SetToolBitmapSize(wxSize(w, h));

-	toolBar->AddTool(IDM_DEBUG_GO,	_T("Play"),			m_Bitmaps[Toolbar_DebugGo]);

-	toolBar->AddTool(IDM_STEP,		_T("Step"),			m_Bitmaps[Toolbar_Step]);

-	toolBar->AddTool(IDM_STEPOVER,	_T("Step Over"),    m_Bitmaps[Toolbar_StepOver]);

-	toolBar->AddTool(IDM_SKIP,		_T("Skip"),			m_Bitmaps[Toolbar_Skip]);

-	toolBar->AddSeparator();

-	toolBar->AddTool(IDM_GOTOPC,    _T("Show PC"),		m_Bitmaps[Toolbar_GotoPC]);

-	toolBar->AddTool(IDM_SETPC,		_T("Set PC"),		m_Bitmaps[Toolbar_SetPC]);

-	toolBar->AddSeparator();

-	toolBar->AddControl(new wxTextCtrl(toolBar, IDM_ADDRBOX, _T("")));

-

-	// after adding the buttons to the toolbar, must call Realize() to reflect

-	// the changes

-	toolBar->Realize();

-}

-

-

-void CCodeWindow::RecreateToolbar()

-{

-	// delete and recreate the toolbar

-	wxToolBarBase* toolBar = GetToolBar();

-	delete toolBar;

-	SetToolBar(NULL);

-

-	long style = TOOLBAR_STYLE;

-	style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_BOTTOM | wxTB_RIGHT | wxTB_HORZ_LAYOUT | wxTB_TOP);

-	wxToolBar* theToolBar = CreateToolBar(style, ID_TOOLBAR);

-

-	PopulateToolbar(theToolBar);

-	SetToolBar(theToolBar);

-}

-

-

-void CCodeWindow::InitBitmaps()

-{

-	// load original size 48x48

-	m_Bitmaps[Toolbar_DebugGo] = wxGetBitmapFromMemory(toolbar_play_png);

-	m_Bitmaps[Toolbar_Step] = wxGetBitmapFromMemory(toolbar_add_breakpoint_png);

-	m_Bitmaps[Toolbar_StepOver] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);

-	m_Bitmaps[Toolbar_Skip] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);

-	m_Bitmaps[Toolbar_GotoPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);

-	m_Bitmaps[Toolbar_SetPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);

-	m_Bitmaps[Toolbar_Pause] = wxGetBitmapFromMemory(toolbar_pause_png);

-

-

-	// scale to 16x16 for toolbar

-	for (size_t n = Toolbar_DebugGo; n < Bitmaps_max; n++)

-	{

-		m_Bitmaps[n] = wxBitmap(m_Bitmaps[n].ConvertToImage().Scale(16, 16));

-	}

-}

-

-

-void CCodeWindow::OnKeyDown(wxKeyEvent& event)

-{

-	if ((event.GetKeyCode() == WXK_SPACE) && IsActive())

-	{

-		SingleCPUStep();	

-	}

-	else

-	{

-		event.Skip();

-	}

-}

-

-

-void CCodeWindow::SingleCPUStep()

-{

-	CCPU::StepOpcode(&sync_event);

-	//            if (CCPU::IsStepping())

-	//	            sync_event.Wait();

-	wxThread::Sleep(20);

-	// need a short wait here

-	JumpToAddress(PC);

-	Update();

-	Host_UpdateLogDisplay();

-}

+// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include <wx/button.h>
+#include <wx/textctrl.h>
+#include <wx/textdlg.h>
+#include <wx/listctrl.h>
+#include <wx/thread.h>
+#include <wx/mstream.h>
+
+// ugly that this lib included code from the main
+#include "../../DolphinWX/Src/Globals.h"
+
+#include "IniFile.h"
+#include "Host.h"
+
+#include "Debugger.h"
+
+#include "RegisterWindow.h"
+#include "LogWindow.h"
+#include "BreakpointWindow.h"
+#include "MemoryWindow.h"
+#include "JitWindow.h"
+
+#include "CodeWindow.h"
+#include "CodeView.h"
+
+#include "FileUtil.h"
+#include "Core.h"
+#include "HLE/HLE.h"
+#include "Boot/Boot.h"
+#include "LogManager.h"
+#include "HW/CPU.h"
+#include "PowerPC/PowerPC.h"
+#include "Debugger/PPCDebugInterface.h"
+#include "Debugger/Debugger_SymbolMap.h"
+#include "PowerPC/PPCAnalyst.h"
+#include "PowerPC/Profiler.h"
+#include "PowerPC/SymbolDB.h"
+#include "PowerPC/SignatureDB.h"
+#include "PowerPC/PPCTables.h"
+#include "PowerPC/Jit64/Jit.h"
+#include "PowerPC/Jit64/JitCache.h" // for ClearCache()
+
+#include "Plugins/Plugin_DSP.h" // new stuff, to let us open the DLLDebugger
+#include "Plugins/Plugin_Video.h" // new stuff, to let us open the DLLDebugger
+#include "../../DolphinWX/Src/PluginManager.h"
+#include "../../DolphinWX/Src/Config.h"
+
+// and here are the classes
+class CPluginInfo;
+class CPluginManager;
+//extern DynamicLibrary Common::CPlugin;
+//extern CPluginManager CPluginManager::m_Instance;
+
+extern "C" {
+	#include "../resources/toolbar_play.c"
+	#include "../resources/toolbar_pause.c"
+	#include "../resources/toolbar_add_memorycheck.c"
+	#include "../resources/toolbar_delete.c"
+	#include "../resources/toolbar_add_breakpoint.c"
+}
+
+static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT;
+
+BEGIN_EVENT_TABLE(CCodeWindow, wxFrame)   
+    EVT_LISTBOX(IDM_SYMBOLLIST,     CCodeWindow::OnSymbolListChange)
+    EVT_LISTBOX(IDM_CALLSTACKLIST,  CCodeWindow::OnCallstackListChange)
+    EVT_LISTBOX(IDM_CALLERSLIST,    CCodeWindow::OnCallersListChange)
+    EVT_LISTBOX(IDM_CALLSLIST,      CCodeWindow::OnCallsListChange)
+    EVT_HOST_COMMAND(wxID_ANY,      CCodeWindow::OnHostMessage)
+    EVT_MENU(IDM_LOGWINDOW,         CCodeWindow::OnToggleLogWindow)
+    EVT_MENU(IDM_REGISTERWINDOW,    CCodeWindow::OnToggleRegisterWindow)
+    EVT_MENU(IDM_BREAKPOINTWINDOW,  CCodeWindow::OnToggleBreakPointWindow)
+    EVT_MENU(IDM_MEMORYWINDOW,      CCodeWindow::OnToggleMemoryWindow)
+	EVT_MENU(IDM_JITWINDOW,			CCodeWindow::OnToggleJitWindow)
+	EVT_MENU(IDM_SOUNDWINDOW,		CCodeWindow::OnToggleSoundWindow)
+	EVT_MENU(IDM_VIDEOWINDOW,		CCodeWindow::OnToggleVideoWindow)
+
+	EVT_MENU(IDM_INTERPRETER,       CCodeWindow::OnInterpreter) // CPU Mode
+	EVT_MENU(IDM_AUTOMATICSTART,       CCodeWindow::OnAutomaticStart) // CPU Mode
+	EVT_MENU(IDM_JITUNLIMITED,			CCodeWindow::OnJITOff)	
+	EVT_MENU(IDM_JITOFF,			CCodeWindow::OnJITOff)
+	EVT_MENU(IDM_JITLSOFF,			CCodeWindow::OnJITOff)
+		EVT_MENU(IDM_JITLSLXZOFF,		CCodeWindow::OnJITOff)
+			EVT_MENU(IDM_JITLSLWZOFF,		CCodeWindow::OnJITOff)
+		EVT_MENU(IDM_JITLSLBZXOFF,		CCodeWindow::OnJITOff)
+	EVT_MENU(IDM_JITLSFOFF,			CCodeWindow::OnJITOff)
+	EVT_MENU(IDM_JITLSPOFF,			CCodeWindow::OnJITOff)
+	EVT_MENU(IDM_JITFPOFF,			CCodeWindow::OnJITOff)
+	EVT_MENU(IDM_JITIOFF,			CCodeWindow::OnJITOff)
+	EVT_MENU(IDM_JITPOFF,			CCodeWindow::OnJITOff)
+	EVT_MENU(IDM_JITSROFF,			CCodeWindow::OnJITOff)
+
+	EVT_MENU(IDM_CLEARSYMBOLS,      CCodeWindow::OnSymbolsMenu)
+	EVT_MENU(IDM_LOADMAPFILE,       CCodeWindow::OnSymbolsMenu)
+	EVT_MENU(IDM_SCANFUNCTIONS,     CCodeWindow::OnSymbolsMenu)
+	EVT_MENU(IDM_SAVEMAPFILE,       CCodeWindow::OnSymbolsMenu)
+	EVT_MENU(IDM_SAVEMAPFILEWITHCODES, CCodeWindow::OnSymbolsMenu)	
+	EVT_MENU(IDM_CREATESIGNATUREFILE, CCodeWindow::OnSymbolsMenu)
+	EVT_MENU(IDM_USESIGNATUREFILE,  CCodeWindow::OnSymbolsMenu)
+	EVT_MENU(IDM_PATCHHLEFUNCTIONS, CCodeWindow::OnSymbolsMenu)
+
+	EVT_MENU(IDM_CLEARCODECACHE,    CCodeWindow::OnJitMenu)
+	EVT_MENU(IDM_LOGINSTRUCTIONS,   CCodeWindow::OnJitMenu)
+
+	EVT_MENU(IDM_PROFILEBLOCKS,     CCodeWindow::OnProfilerMenu)
+	EVT_MENU(IDM_WRITEPROFILE,      CCodeWindow::OnProfilerMenu)
+
+	// toolbar
+	EVT_MENU(IDM_DEBUG_GO,			CCodeWindow::OnCodeStep)
+	EVT_MENU(IDM_STEP,				CCodeWindow::OnCodeStep)
+	EVT_MENU(IDM_STEPOVER,			CCodeWindow::OnCodeStep)
+	EVT_MENU(IDM_SKIP,				CCodeWindow::OnCodeStep)
+	EVT_MENU(IDM_SETPC,				CCodeWindow::OnCodeStep)
+	EVT_MENU(IDM_GOTOPC,			CCodeWindow::OnCodeStep)
+	EVT_TEXT(IDM_ADDRBOX,           CCodeWindow::OnAddrBoxChange)
+
+	EVT_COMMAND(IDM_CODEVIEW, wxEVT_CODEVIEW_CHANGE, CCodeWindow::OnCodeViewChange)
+END_EVENT_TABLE()
+
+#define wxGetBitmapFromMemory(name) _wxGetBitmapFromMemory(name, sizeof(name))
+inline wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length)
+{
+	wxMemoryInputStream is(data, length);
+	return(wxBitmap(wxImage(is, wxBITMAP_TYPE_ANY, -1), -1));
+}
+
+// =======================================================================================
+// WARNING: If you create a new dialog window you must add m_dialog(NULL) below otherwise
+// m_dialog = true and things will crash.
+// ----------------
+CCodeWindow::CCodeWindow(const SCoreStartupParameter& _LocalCoreStartupParameter, wxWindow* parent, wxWindowID id,
+		const wxString& title, const wxPoint& pos, const wxSize& size, long style)
+	: wxFrame(parent, id, title, pos, size, style)
+	, m_LogWindow(NULL)
+	, m_RegisterWindow(NULL)
+	, m_BreakpointWindow(NULL)
+	, m_MemoryWindow(NULL)
+	, m_JitWindow(NULL)
+{
+	// Load ini settings
+	IniFile file;
+	file.Load(DEBUGGER_CONFIG_FILE);
+	this->Load_(file);
+
+	InitBitmaps();
+
+	CreateGUIControls(_LocalCoreStartupParameter);
+
+	// Create the toolbar
+	RecreateToolbar();
+
+	UpdateButtonStates();
+
+	wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN,
+		wxKeyEventHandler(CCodeWindow::OnKeyDown),
+		(wxObject*)0, this);
+
+	// Load settings for selectable windowses, but only if they have been created
+	this->Load(file);
+	if (m_BreakpointWindow) m_BreakpointWindow->Load(file);
+	if (m_RegisterWindow) m_RegisterWindow->Load(file);
+	if (m_MemoryWindow) m_MemoryWindow->Load(file);
+	if (m_JitWindow) m_JitWindow->Load(file);
+}
+// ===============
+
+
+CCodeWindow::~CCodeWindow()
+{
+	IniFile file;
+	file.Load(DEBUGGER_CONFIG_FILE);
+
+	this->Save(file);
+	if (m_BreakpointWindow) m_BreakpointWindow->Save(file);
+	if (m_LogWindow) m_LogWindow->Save(file);
+	if (m_RegisterWindow) m_RegisterWindow->Save(file);
+	if (m_MemoryWindow) m_MemoryWindow->Save(file);
+	if (m_JitWindow) m_JitWindow->Save(file);
+
+	file.Save(DEBUGGER_CONFIG_FILE);
+}
+
+
+// =======================================================================================
+// Load before CreateGUIControls()
+// --------------
+void CCodeWindow::Load_( IniFile &ini )
+{
+
+	// Decide what windows to use
+	ini.Get("ShowOnStart", "LogWindow", &bLogWindow, true);
+	ini.Get("ShowOnStart", "RegisterWindow", &bRegisterWindow, true);
+	ini.Get("ShowOnStart", "BreakpointWindow", &bBreakpointWindow, true);
+	ini.Get("ShowOnStart", "MemoryWindow", &bMemoryWindow, true);
+	ini.Get("ShowOnStart", "JitWindow", &bJitWindow, true);
+	ini.Get("ShowOnStart", "SoundWindow", &bSoundWindow, false);
+	ini.Get("ShowOnStart", "VideoWindow", &bVideoWindow, false);
+	// ===============
+
+	// Boot to pause or not
+	ini.Get("ShowOnStart", "AutomaticStart", &bAutomaticStart, false);
+}
+
+
+void CCodeWindow::Load( IniFile &ini )
+{
+	int x,y,w,h;
+	ini.Get("CodeWindow", "x", &x, GetPosition().x);
+	ini.Get("CodeWindow", "y", &y, GetPosition().y);
+	ini.Get("CodeWindow", "w", &w, GetSize().GetWidth());
+	ini.Get("CodeWindow", "h", &h, GetSize().GetHeight());
+	this->SetSize(x, y, w, h);
+}
+
+
+void CCodeWindow::Save(IniFile &ini) const
+{
+	ini.Set("CodeWindow", "x", GetPosition().x);
+	ini.Set("CodeWindow", "y", GetPosition().y);
+	ini.Set("CodeWindow", "w", GetSize().GetWidth());
+	ini.Set("CodeWindow", "h", GetSize().GetHeight());
+
+	// Boot to pause or not
+	ini.Set("ShowOnStart", "AutomaticStart", GetMenuBar()->IsChecked(IDM_AUTOMATICSTART));
+
+	// Save windows settings
+	ini.Set("ShowOnStart", "LogWindow", GetMenuBar()->IsChecked(IDM_LOGWINDOW));
+	ini.Set("ShowOnStart", "RegisterWindow", GetMenuBar()->IsChecked(IDM_REGISTERWINDOW));
+	ini.Set("ShowOnStart", "BreakpointWindow", GetMenuBar()->IsChecked(IDM_BREAKPOINTWINDOW));
+	ini.Set("ShowOnStart", "MemoryWindow", GetMenuBar()->IsChecked(IDM_MEMORYWINDOW));
+	ini.Set("ShowOnStart", "JitWindow", GetMenuBar()->IsChecked(IDM_JITWINDOW));
+	ini.Set("ShowOnStart", "SoundWindow", GetMenuBar()->IsChecked(IDM_SOUNDWINDOW));
+	ini.Set("ShowOnStart", "VideoWindow", GetMenuBar()->IsChecked(IDM_VIDEOWINDOW));
+}
+
+
+void CCodeWindow::CreateGUIControls(const SCoreStartupParameter& _LocalCoreStartupParameter)
+{
+	CreateMenu(_LocalCoreStartupParameter);
+
+	// =======================================================================================
+	// Configure the code window
+	wxBoxSizer* sizerBig   = new wxBoxSizer(wxHORIZONTAL);
+	wxBoxSizer* sizerLeft  = new wxBoxSizer(wxVERTICAL);
+
+	DebugInterface* di = new PPCDebugInterface();
+
+	codeview = new CCodeView(di, this, IDM_CODEVIEW);
+	sizerBig->Add(sizerLeft, 2, wxEXPAND);
+	sizerBig->Add(codeview, 5, wxEXPAND);
+
+	sizerLeft->Add(callstack = new wxListBox(this, IDM_CALLSTACKLIST, wxDefaultPosition, wxSize(90, 100)), 0, wxEXPAND);
+	sizerLeft->Add(symbols = new wxListBox(this, IDM_SYMBOLLIST, wxDefaultPosition, wxSize(90, 100), 0, NULL, wxLB_SORT), 1, wxEXPAND);
+	sizerLeft->Add(calls = new wxListBox(this, IDM_CALLSLIST, wxDefaultPosition, wxSize(90, 100), 0, NULL, wxLB_SORT), 0, wxEXPAND);
+	sizerLeft->Add(callers = new wxListBox(this, IDM_CALLERSLIST, wxDefaultPosition, wxSize(90, 100), 0, NULL, wxLB_SORT), 0, wxEXPAND);
+
+	SetSizer(sizerBig);
+
+	sizerLeft->SetSizeHints(this);
+	sizerLeft->Fit(this);
+	sizerBig->SetSizeHints(this);
+	sizerBig->Fit(this);
+
+	sync_event.Init();
+	// =================
+
+
+	// additional dialogs
+	if (IsLoggingActivated() && bLogWindow)
+	{
+		m_LogWindow = new CLogWindow(this);
+		m_LogWindow->Show(true);
+	}
+
+	if (bRegisterWindow)
+	{
+		m_RegisterWindow = new CRegisterWindow(this);
+		m_RegisterWindow->Show(true);
+	}
+
+	if(bBreakpointWindow)
+	{
+		m_BreakpointWindow = new CBreakPointWindow(this, this);
+		m_BreakpointWindow->Show(true);
+	}
+
+	if(bMemoryWindow)
+	{
+		m_MemoryWindow = new CMemoryWindow(this);
+		m_MemoryWindow->Show(true);
+	}
+
+	if(bJitWindow)
+	{
+		m_JitWindow = new CJitWindow(this);
+		m_JitWindow->Show(true);
+	}
+
+	if(bSoundWindow)
+	{
+		// possible todo: add some kind of if here to? can it fail?
+		CPluginManager::GetInstance().OpenDebug(
+		GetHandle(),
+		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(),
+		false, true
+		);	
+	} // don't have any else, just ignore it
+
+	if(bVideoWindow)
+	{
+		// possible todo: add some kind of if here to? can it fail?
+		CPluginManager::GetInstance().OpenDebug(
+		GetHandle(),
+		_LocalCoreStartupParameter.m_strVideoPlugin.c_str(),
+		true, true
+		);
+	} // don't have any else, just ignore it
+}
+
+
+void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParameter)
+{
+
+	// =======================================================================================
+	// Windowses
+	// ---------------
+	wxMenuBar* pMenuBar = new wxMenuBar(wxMB_DOCKABLE);
+
+	{	
+		wxMenu* pCoreMenu = new wxMenu;
+
+		wxMenuItem* interpreter = pCoreMenu->Append(IDM_INTERPRETER, _T("&Interpreter core"), wxEmptyString, wxITEM_CHECK);
+		interpreter->Check(!_LocalCoreStartupParameter.bUseJIT);
+		pCoreMenu->AppendSeparator();
+		wxMenuItem* automaticstart = pCoreMenu->Append(IDM_AUTOMATICSTART, _T("&Automatic start"), wxEmptyString, wxITEM_CHECK);
+		automaticstart->Check(bAutomaticStart);		
+		pCoreMenu->AppendSeparator();
+
+#ifdef JIT_OFF_OPTIONS
+		jitunlimited = pCoreMenu->Append(IDM_JITUNLIMITED, _T("&Unlimited JIT Cache"), wxEmptyString, wxITEM_CHECK);
+		pCoreMenu->AppendSeparator();
+		jitoff = pCoreMenu->Append(IDM_JITOFF, _T("&JIT off (JIT core)"), wxEmptyString, wxITEM_CHECK);
+		jitlsoff = pCoreMenu->Append(IDM_JITLSOFF, _T("&JIT LoadStore off"), wxEmptyString, wxITEM_CHECK);
+			jitlslbzxoff = pCoreMenu->Append(IDM_JITLSLBZXOFF, _T("    &JIT LoadStore lbzx off"), wxEmptyString, wxITEM_CHECK);
+			jitlslxzoff = pCoreMenu->Append(IDM_JITLSLXZOFF, _T("    &JIT LoadStore lXz off"), wxEmptyString, wxITEM_CHECK);
+				jitlslwzoff = pCoreMenu->Append(IDM_JITLSLWZOFF, _T("        &JIT LoadStore lwz off"), wxEmptyString, wxITEM_CHECK);
+		jitlspoff = pCoreMenu->Append(IDM_JITLSFOFF, _T("&JIT LoadStore Floating off"), wxEmptyString, wxITEM_CHECK);
+		jitlsfoff = pCoreMenu->Append(IDM_JITLSPOFF, _T("&JIT LoadStore Paired off"), wxEmptyString, wxITEM_CHECK);
+		jitfpoff = pCoreMenu->Append(IDM_JITFPOFF, _T("&JIT FloatingPoint off"), wxEmptyString, wxITEM_CHECK);
+		jitioff = pCoreMenu->Append(IDM_JITIOFF, _T("&JIT Integer off"), wxEmptyString, wxITEM_CHECK);
+		jitpoff = pCoreMenu->Append(IDM_JITPOFF, _T("&JIT Paired off"), wxEmptyString, wxITEM_CHECK);
+		jitsroff = pCoreMenu->Append(IDM_JITSROFF, _T("&JIT SystemRegisters off"), wxEmptyString, wxITEM_CHECK);
+#endif
+
+//		wxMenuItem* dualcore = pDebugMenu->Append(IDM_DUALCORE, _T("&DualCore"), wxEmptyString, wxITEM_CHECK);
+//		dualcore->Check(_LocalCoreStartupParameter.bUseDualCore);
+		
+		pMenuBar->Append(pCoreMenu, _T("&CPU Mode"));		
+
+	}
+
+	{
+		wxMenu* pDebugDialogs = new wxMenu;
+
+		if (IsLoggingActivated())
+		{
+			wxMenuItem* pLogWindow = pDebugDialogs->Append(IDM_LOGWINDOW, _T("&LogManager"), wxEmptyString, wxITEM_CHECK);
+			pLogWindow->Check(bLogWindow);
+		}
+
+		wxMenuItem* pRegister = pDebugDialogs->Append(IDM_REGISTERWINDOW, _T("&Registers"), wxEmptyString, wxITEM_CHECK);
+		pRegister->Check(bRegisterWindow);
+
+		wxMenuItem* pBreakPoints = pDebugDialogs->Append(IDM_BREAKPOINTWINDOW, _T("&BreakPoints"), wxEmptyString, wxITEM_CHECK);
+		pBreakPoints->Check(bBreakpointWindow);
+
+		wxMenuItem* pMemory = pDebugDialogs->Append(IDM_MEMORYWINDOW, _T("&Memory"), wxEmptyString, wxITEM_CHECK);
+		pMemory->Check(bMemoryWindow);
+
+		wxMenuItem* pJit = pDebugDialogs->Append(IDM_JITWINDOW, _T("&Jit"), wxEmptyString, wxITEM_CHECK);
+		pJit->Check(bJitWindow);
+
+		wxMenuItem* pSound = pDebugDialogs->Append(IDM_SOUNDWINDOW, _T("&Sound"), wxEmptyString, wxITEM_CHECK);
+		pSound->Check(bSoundWindow);
+
+		wxMenuItem* pVideo = pDebugDialogs->Append(IDM_VIDEOWINDOW, _T("&Video"), wxEmptyString, wxITEM_CHECK);
+		pVideo->Check(bVideoWindow);
+
+		pMenuBar->Append(pDebugDialogs, _T("&Views"));
+	}
+	// ===============
+
+
+	{
+		wxMenu *pSymbolsMenu = new wxMenu;
+		pSymbolsMenu->Append(IDM_CLEARSYMBOLS, _T("&Clear symbols"));
+		// pSymbolsMenu->Append(IDM_CLEANSYMBOLS, _T("&Clean symbols (zz)"));
+		pSymbolsMenu->Append(IDM_SCANFUNCTIONS, _T("&Generate symbol map"));
+		pSymbolsMenu->AppendSeparator();
+		pSymbolsMenu->Append(IDM_LOADMAPFILE, _T("&Load symbol map"));
+		pSymbolsMenu->Append(IDM_SAVEMAPFILE, _T("&Save symbol map"));
+		pSymbolsMenu->AppendSeparator();
+		pSymbolsMenu->Append(IDM_SAVEMAPFILEWITHCODES, _T("Save code"));
+		pSymbolsMenu->AppendSeparator();
+		pSymbolsMenu->Append(IDM_CREATESIGNATUREFILE, _T("&Create signature file..."));
+		pSymbolsMenu->Append(IDM_USESIGNATUREFILE, _T("&Use signature file..."));
+		pSymbolsMenu->AppendSeparator();
+		pSymbolsMenu->Append(IDM_PATCHHLEFUNCTIONS, _T("&Patch HLE functions"));
+		pMenuBar->Append(pSymbolsMenu, _T("&Symbols"));
+	}
+
+	{
+		wxMenu *pJitMenu = new wxMenu;
+		pJitMenu->Append(IDM_CLEARCODECACHE, _T("&Clear code cache"));
+		pJitMenu->Append(IDM_LOGINSTRUCTIONS, _T("&Log JIT instruction coverage"));
+		pMenuBar->Append(pJitMenu, _T("&JIT"));
+	}
+
+	{
+		wxMenu *pProfilerMenu = new wxMenu;
+		pProfilerMenu->Append(IDM_PROFILEBLOCKS, _T("&Profile blocks"), wxEmptyString, wxITEM_CHECK);
+		pProfilerMenu->AppendSeparator();
+		pProfilerMenu->Append(IDM_WRITEPROFILE, _T("&Write to profile.txt, show"));
+		pMenuBar->Append(pProfilerMenu, _T("&Profiler"));
+	}
+
+
+	SetMenuBar(pMenuBar);
+}
+
+
+bool CCodeWindow::UseInterpreter()
+{
+	return GetMenuBar()->IsChecked(IDM_INTERPRETER);
+}
+
+bool CCodeWindow::AutomaticStart()
+{
+	return GetMenuBar()->IsChecked(IDM_AUTOMATICSTART);
+}
+
+bool CCodeWindow::UseDualCore()
+{
+	return GetMenuBar()->IsChecked(IDM_DUALCORE);
+}
+
+
+// =======================================================================================
+// CPU Mode
+// --------------
+void CCodeWindow::OnInterpreter(wxCommandEvent& event)
+{
+	if (Core::GetState() != Core::CORE_RUN) {
+		PowerPC::SetMode(UseInterpreter() ? PowerPC::MODE_INTERPRETER : PowerPC::MODE_JIT);
+	} else {
+		event.Skip();
+		wxMessageBox(_T("Please pause the emulator before changing mode."));
+	}
+}
+
+
+void CCodeWindow::OnAutomaticStart(wxCommandEvent& event)
+{
+	bAutomaticStart = !bAutomaticStart;
+}
+
+
+void CCodeWindow::OnJITOff(wxCommandEvent& event)
+{
+	if (Core::GetState() == Core::CORE_UNINITIALIZED)
+	{
+		// we disallow changing the status here because it will be reset to the defult when BootCore()
+		// creates the SCoreStartupParameter as a game is loaded
+		GetMenuBar()->Check(event.GetId(),!event.IsChecked());
+		wxMessageBox(_T("Please start a game before changing mode."));	
+	} else {
+		if (Core::GetState() != Core::CORE_RUN)
+		{
+			switch (event.GetId())
+			{
+			case IDM_JITUNLIMITED:
+				Core::g_CoreStartupParameter.bJITUnlimitedCache = event.IsChecked();
+				Jit64::ClearCache(); // allow InitCache() even after the game has started
+				Jit64::InitCache();
+				GetMenuBar()->Enable(event.GetId(),!event.IsChecked());
+				break;
+			case IDM_JITOFF:
+				Core::g_CoreStartupParameter.bJITOff = event.IsChecked(); break;
+			case IDM_JITLSOFF:
+				Core::g_CoreStartupParameter.bJITLoadStoreOff = event.IsChecked(); break;
+				case IDM_JITLSLXZOFF:
+					Core::g_CoreStartupParameter.bJITLoadStorelXzOff = event.IsChecked(); break;
+					case IDM_JITLSLWZOFF:
+						Core::g_CoreStartupParameter.bJITLoadStorelwzOff = event.IsChecked(); break;
+				case IDM_JITLSLBZXOFF:
+					Core::g_CoreStartupParameter.bJITLoadStorelbzxOff = event.IsChecked(); break;
+			case IDM_JITLSFOFF:
+				Core::g_CoreStartupParameter.bJITLoadStoreFloatingOff = event.IsChecked(); break;
+			case IDM_JITLSPOFF:
+				Core::g_CoreStartupParameter.bJITLoadStorePairedOff = event.IsChecked(); break;
+			case IDM_JITFPOFF:
+				Core::g_CoreStartupParameter.bJITFloatingPointOff = event.IsChecked(); break;
+			case IDM_JITIOFF:
+				Core::g_CoreStartupParameter.bJITIntegerOff = event.IsChecked(); break;
+			case IDM_JITPOFF:
+				Core::g_CoreStartupParameter.bJITPairedOff = event.IsChecked(); break;
+			case IDM_JITSROFF:
+				Core::g_CoreStartupParameter.bJITSystemRegistersOff = event.IsChecked(); break;
+			}
+			Jit64::ClearCache();			
+		} else {
+			//event.Skip(); // this doesn't work
+			GetMenuBar()->Check(event.GetId(),!event.IsChecked());
+			wxMessageBox(_T("Please pause the emulator before changing mode."));		
+		}
+	}
+}
+// ==============
+
+
+void CCodeWindow::OnJitMenu(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+	case IDM_CLEARCODECACHE:
+		Jit64::ClearCache();
+		break;
+	case IDM_LOGINSTRUCTIONS:
+		PPCTables::LogCompiledInstructions();
+		break;
+	}
+}
+
+void CCodeWindow::OnProfilerMenu(wxCommandEvent& event)
+{
+	if (Core::GetState() == Core::CORE_RUN) {
+		event.Skip();
+		return;
+	}
+	switch (event.GetId())
+	{
+	case IDM_PROFILEBLOCKS:
+		Jit64::ClearCache();
+		Profiler::g_ProfileBlocks = GetMenuBar()->IsChecked(IDM_PROFILEBLOCKS);
+		break;
+	case IDM_WRITEPROFILE:
+		Profiler::WriteProfileResults("profiler.txt");
+		File::Launch("profiler.txt");
+		break;
+	}
+}
+
+void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event) 
+{
+	if (Core::GetState() == Core::CORE_UNINITIALIZED)
+	{
+		// TODO: disable menu items instead :P
+		return;
+	}
+	std::string mapfile = CBoot::GenerateMapFilename();
+	switch (event.GetId())
+	{
+	case IDM_CLEARSYMBOLS:
+		g_symbolDB.Clear();
+		Host_NotifyMapLoaded();
+		break;
+	case IDM_CLEANSYMBOLS:
+		g_symbolDB.Clear("zz");
+		Host_NotifyMapLoaded();
+		break;
+	case IDM_SCANFUNCTIONS:
+		{
+		PPCAnalyst::FindFunctions(0x80000000, 0x80400000, &g_symbolDB);
+		SignatureDB db;
+		if (db.Load(TOTALDB_FILE))
+			db.Apply(&g_symbolDB);
+
+		// HLE::PatchFunctions();
+		NotifyMapLoaded();
+		break;
+		}
+	case IDM_LOADMAPFILE:
+		if (!File::Exists(mapfile.c_str()))
+		{
+			g_symbolDB.Clear();
+			PPCAnalyst::FindFunctions(0x80000000, 0x80400000, &g_symbolDB);
+			SignatureDB db;
+			if (db.Load(TOTALDB_FILE))
+				db.Apply(&g_symbolDB);
+		} else {
+			g_symbolDB.LoadMap(mapfile.c_str());
+		}
+		NotifyMapLoaded();
+		break;
+	case IDM_SAVEMAPFILE:
+		g_symbolDB.SaveMap(mapfile.c_str());
+		break;
+	case IDM_SAVEMAPFILEWITHCODES:
+		g_symbolDB.SaveMap(mapfile.c_str(), true);
+		break;
+	case IDM_CREATESIGNATUREFILE:
+		{
+		wxTextEntryDialog input_prefix(this, wxString::FromAscii("Only export symbols with prefix:"), wxGetTextFromUserPromptStr, _T("."));
+		if (input_prefix.ShowModal() == wxID_OK) {
+			std::string prefix(input_prefix.GetValue().mb_str());
+
+			wxString path = wxFileSelector(
+					_T("Save signature as"), wxEmptyString, wxEmptyString, wxEmptyString,
+					_T("Dolphin Signature File (*.dsy)|*.dsy;"), wxFD_SAVE,
+					this);
+			if (path) {
+				SignatureDB db;
+				db.Initialize(&g_symbolDB, prefix.c_str());
+				std::string filename(path.ToAscii());		// PPCAnalyst::SaveSignatureDB(
+				db.Save(path.ToAscii());
+			}
+		}
+		}
+		break;
+	case IDM_USESIGNATUREFILE:
+		{
+		wxString path = wxFileSelector(
+				_T("Apply signature file"), wxEmptyString, wxEmptyString, wxEmptyString,
+				_T("Dolphin Signature File (*.dsy)|*.dsy;"), wxFD_OPEN | wxFD_FILE_MUST_EXIST,
+				this);
+		if (path) {
+			SignatureDB db;
+			db.Load(path.ToAscii());
+			db.Apply(&g_symbolDB);
+		}
+		}
+		NotifyMapLoaded();
+		break;
+	case IDM_PATCHHLEFUNCTIONS:
+		HLE::PatchFunctions();
+		Update();
+		break;
+	}
+}
+
+// =======================================================================================
+// The Play, Stop, Step, Skip, Go to PC and Show PC buttons all go here 
+// --------------
+void CCodeWindow::OnCodeStep(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+	    case IDM_DEBUG_GO:
+	    {
+		    // [F|RES] prolly we should disable the other buttons in go mode too ...
+		    JumpToAddress(PC);
+
+		    if (CCPU::IsStepping())
+		    {
+			    CCPU::EnableStepping(false);
+		    }
+		    else
+		    {
+			    CCPU::EnableStepping(true);
+			    Host_UpdateLogDisplay();
+		    }
+
+		    Update();
+	    }
+		break;
+
+	    case IDM_STEP:
+			SingleCPUStep();
+
+		    break;
+
+	    case IDM_STEPOVER:
+		    CCPU::EnableStepping(true);
+		    break;
+
+	    case IDM_SKIP:
+		    PC += 4;
+		    Update();
+		    break;
+
+	    case IDM_SETPC:
+		    PC = codeview->GetSelection();
+		    Update();
+		    break;
+
+	    case IDM_GOTOPC:
+		    JumpToAddress(PC);
+		    break;
+	}
+
+	UpdateButtonStates();
+}
+
+
+void CCodeWindow::JumpToAddress(u32 _Address)
+{
+    codeview->Center(_Address);
+	UpdateLists();
+}
+
+
+void CCodeWindow::UpdateLists()
+{
+	callers->Clear();
+	u32 addr = codeview->GetSelection();
+	Symbol *symbol = g_symbolDB.GetSymbolFromAddr(addr);
+	if (!symbol)
+		return;
+	for (int i = 0; i < (int)symbol->callers.size(); i++)
+	{
+		u32 caller_addr = symbol->callers[i].callAddress;
+		Symbol *caller_symbol = g_symbolDB.GetSymbolFromAddr(caller_addr);
+		if (caller_symbol) {
+			int idx = callers->Append(wxString::Format( wxT("< %s (%08x)"), caller_symbol->name.c_str(), caller_addr));
+			callers->SetClientData(idx, (void*)caller_addr);
+		}
+	}
+
+	calls->Clear();
+	for (int i = 0; i < (int)symbol->calls.size(); i++)
+	{
+		u32 call_addr = symbol->calls[i].function;
+		Symbol *call_symbol = g_symbolDB.GetSymbolFromAddr(call_addr);
+		if (call_symbol) {
+			int idx = calls->Append(wxString::Format(_T("> %s (%08x)"), call_symbol->name.c_str(), call_addr));
+			calls->SetClientData(idx, (void*)call_addr);
+		}
+	}
+}
+
+
+void CCodeWindow::OnCodeViewChange(wxCommandEvent &event)
+{
+	//PanicAlert("boo");
+	UpdateLists();
+}
+
+void CCodeWindow::OnAddrBoxChange(wxCommandEvent& event)
+{
+	wxTextCtrl* pAddrCtrl = (wxTextCtrl*)GetToolBar()->FindControl(IDM_ADDRBOX);
+	wxString txt = pAddrCtrl->GetValue();
+
+	std::string text(txt.mb_str());
+	text = StripSpaces(text);
+	if (text.size() == 8)
+	{
+		u32 addr;
+		sscanf(text.c_str(), "%08x", &addr);
+		JumpToAddress(addr);
+	}
+
+	event.Skip(1);
+}
+
+void CCodeWindow::OnCallstackListChange(wxCommandEvent& event)
+{
+	int index   = callstack->GetSelection();
+	if (index >= 0) {
+		u32 address = (u32)(u64)(callstack->GetClientData(index));
+		if (address)
+			JumpToAddress(address);
+	}
+}
+
+void CCodeWindow::OnCallersListChange(wxCommandEvent& event)
+{
+	int index = callers->GetSelection();
+	if (index >= 0) {
+		u32 address = (u32)(u64)(callers->GetClientData(index));
+		if (address)
+			JumpToAddress(address);
+	}
+}
+
+void CCodeWindow::OnCallsListChange(wxCommandEvent& event)
+{
+	int index = calls->GetSelection();
+	if (index >= 0) {
+		u32 address = (u32)(u64)(calls->GetClientData(index));
+		if (address)
+			JumpToAddress(address);
+	}
+}
+
+void CCodeWindow::Update()
+{
+	codeview->Refresh();
+	callstack->Clear();
+
+	std::vector<Debugger::CallstackEntry> stack;
+
+	if (Debugger::GetCallstack(stack))
+	{
+		for (size_t i = 0; i < stack.size(); i++)
+		{
+			int idx = callstack->Append(wxString::FromAscii(stack[i].Name.c_str()));
+			callstack->SetClientData(idx, (void*)(u64)stack[i].vAddress);
+		}
+	}
+	else
+	{
+		callstack->Append(wxString::FromAscii("invalid callstack"));
+	}
+
+	UpdateButtonStates();
+
+	/* Automatically show the current PC position when a breakpoint is hit or
+	   when we pause */
+	codeview->Center(PC);
+}
+
+
+void CCodeWindow::NotifyMapLoaded()
+{
+	g_symbolDB.FillInCallers();
+	symbols->Show(false); // hide it for faster filling
+	symbols->Clear();
+	for (SymbolDB::XFuncMap::iterator iter = g_symbolDB.GetIterator(); iter != g_symbolDB.End(); iter++)
+	{
+		int idx = symbols->Append(wxString::FromAscii(iter->second.name.c_str()));
+		symbols->SetClientData(idx, (void*)&iter->second);
+	}
+	symbols->Show(true);
+	Update();
+}
+
+
+void CCodeWindow::UpdateButtonStates()
+{
+	wxToolBar* toolBar = GetToolBar();
+	if (Core::GetState() == Core::CORE_UNINITIALIZED)
+	{
+		toolBar->EnableTool(IDM_DEBUG_GO, false);
+		toolBar->EnableTool(IDM_STEP, false);
+		toolBar->EnableTool(IDM_STEPOVER, false);
+		toolBar->EnableTool(IDM_SKIP, false);
+	}
+	else
+	{
+		if (!CCPU::IsStepping())
+		{
+			toolBar->SetToolShortHelp(IDM_DEBUG_GO, _T("&Pause"));
+			toolBar->SetToolNormalBitmap(IDM_DEBUG_GO, m_Bitmaps[Toolbar_Pause]);
+			toolBar->EnableTool(IDM_DEBUG_GO, true);
+			toolBar->EnableTool(IDM_STEP, false);
+			toolBar->EnableTool(IDM_STEPOVER, false);
+			toolBar->EnableTool(IDM_SKIP, false);
+		}
+		else
+		{
+			toolBar->SetToolShortHelp(IDM_DEBUG_GO, _T("&Play"));
+			toolBar->SetToolNormalBitmap(IDM_DEBUG_GO, m_Bitmaps[Toolbar_DebugGo]);
+			toolBar->EnableTool(IDM_DEBUG_GO, true);
+			toolBar->EnableTool(IDM_STEP, true);
+			toolBar->EnableTool(IDM_STEPOVER, true);
+			toolBar->EnableTool(IDM_SKIP, true);
+		}
+	}
+}
+
+
+void CCodeWindow::OnSymbolListChange(wxCommandEvent& event)
+{
+	int index = symbols->GetSelection();
+	if (index >= 0) {
+		Symbol* pSymbol = static_cast<Symbol *>(symbols->GetClientData(index));
+		if (pSymbol != NULL)
+		{
+			if(pSymbol->type == Symbol::SYMBOL_DATA)
+			{
+				if(m_MemoryWindow && m_MemoryWindow->IsVisible())
+					m_MemoryWindow->JumpToAddress(pSymbol->address);
+			}
+			else
+			{
+				JumpToAddress(pSymbol->address);
+			}
+		}
+	}
+}
+
+void CCodeWindow::OnSymbolListContextMenu(wxContextMenuEvent& event)
+{
+}
+
+
+void CCodeWindow::OnToggleLogWindow(wxCommandEvent& event)
+{
+	if (IsLoggingActivated())
+	{
+		bool show = GetMenuBar()->IsChecked(event.GetId());
+
+		if (show)
+		{
+			if (!m_LogWindow)
+			{
+				m_LogWindow = new CLogWindow(this);
+			}
+
+			m_LogWindow->Show(true);
+		}
+		else // hide
+		{
+			// If m_dialog is NULL, then possibly the system
+			// didn't report the checked menu item status correctly.
+			// It should be true just after the menu item was selected,
+			// if there was no modeless dialog yet.
+			wxASSERT(m_LogWindow != NULL);
+
+			if (m_LogWindow)
+			{
+				m_LogWindow->Hide();
+			}
+		}
+	}
+}
+
+
+void CCodeWindow::OnToggleRegisterWindow(wxCommandEvent& event)
+{
+	bool show = GetMenuBar()->IsChecked(event.GetId());
+
+	if (show)
+	{
+		if (!m_RegisterWindow)
+		{
+			m_RegisterWindow = new CRegisterWindow(this);
+		}
+
+		m_RegisterWindow->Show(true);
+	}
+	else // hide
+	{
+		// If m_dialog is NULL, then possibly the system
+		// didn't report the checked menu item status correctly.
+		// It should be true just after the menu item was selected,
+		// if there was no modeless dialog yet.
+		wxASSERT(m_RegisterWindow != NULL);
+
+		if (m_RegisterWindow)
+		{
+			m_RegisterWindow->Hide();
+		}
+	}
+}
+
+
+// =======================================================================================
+// Toggle Sound Debugging Window
+// ------------
+void CCodeWindow::OnToggleSoundWindow(wxCommandEvent& event)
+{
+	bool show = GetMenuBar()->IsChecked(event.GetId());
+
+	if (show)
+	{
+		// TODO: add some kind of if() check here to?
+		CPluginManager::GetInstance().OpenDebug(
+			GetHandle(),
+			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(),
+			false, true // DSP, show
+			);
+	}
+	else // hide
+	{
+		// Close the sound dll that has an open debugger
+		CPluginManager::GetInstance().OpenDebug(
+			GetHandle(),
+			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(),
+			false, false // DSP, hide
+			);
+	}
+}
+// ===========
+
+
+// =======================================================================================
+// Toggle Video Debugging Window
+// ------------
+void CCodeWindow::OnToggleVideoWindow(wxCommandEvent& event)
+{
+	bool show = GetMenuBar()->IsChecked(event.GetId());
+	//GetMenuBar()->Check(event.GetId(), false); // Turn off
+
+	if (show)
+	{
+		// It works now, but I'll keep this message in case the problem reappears
+		/*if(Core::GetState() == Core::CORE_UNINITIALIZED)
+		{
+			wxMessageBox(_T("Warning, opening this window before a game is started \n\
+may cause a crash when a game is later started. Todo: figure out why and fix it."), wxT("OpenGL Debugging Window"));	
+		}*/
+
+		// TODO: add some kind of if() check here to?
+		CPluginManager::GetInstance().OpenDebug(
+		GetHandle(),
+		SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin.c_str(),
+		true, true // Video, show
+		);
+	}
+	else // hide
+	{
+		// Close the video dll that has an open debugger
+		CPluginManager::GetInstance().OpenDebug(
+			GetHandle(),
+			SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin.c_str(),
+			true, false // Video, hide
+			);
+	}
+}
+// ===========
+
+
+void CCodeWindow::OnToggleJitWindow(wxCommandEvent& event)
+{
+	bool show = GetMenuBar()->IsChecked(event.GetId());
+
+	if (show)
+	{
+		if (!m_JitWindow)
+		{
+			m_JitWindow = new CJitWindow(this);
+		}
+
+		m_JitWindow->Show(true);
+	}
+	else // hide
+	{
+		// If m_dialog is NULL, then possibly the system
+		// didn't report the checked menu item status correctly.
+		// It should be true just after the menu item was selected,
+		// if there was no modeless dialog yet.
+		wxASSERT(m_JitWindow != NULL);
+
+		if (m_JitWindow)
+		{
+			m_JitWindow->Hide();
+		}
+	}
+}
+
+
+void CCodeWindow::OnToggleBreakPointWindow(wxCommandEvent& event)
+{
+	bool show = GetMenuBar()->IsChecked(event.GetId());
+
+	if (show)
+	{
+		if (!m_BreakpointWindow)
+		{
+			m_BreakpointWindow = new CBreakPointWindow(this, this);
+		}
+
+		m_BreakpointWindow->Show(true);
+	}
+	else // hide
+	{
+		// If m_dialog is NULL, then possibly the system
+		// didn't report the checked menu item status correctly.
+		// It should be true just after the menu item was selected,
+		// if there was no modeless dialog yet.
+		wxASSERT(m_BreakpointWindow != NULL);
+
+		if (m_BreakpointWindow)
+		{
+			m_BreakpointWindow->Hide();
+		}
+	}
+}
+
+void CCodeWindow::OnToggleMemoryWindow(wxCommandEvent& event)
+{
+	bool show = GetMenuBar()->IsChecked(event.GetId());
+
+	if (show)
+	{
+		if (!m_MemoryWindow)
+		{
+			m_MemoryWindow = new CMemoryWindow(this);
+		}
+
+		m_MemoryWindow->Show(true);
+	}
+	else // hide
+	{
+		// If m_dialog is NULL, then possibly the system
+		// didn't report the checked menu item status correctly.
+		// It should be true just after the menu item was selected,
+		// if there was no modeless dialog yet.
+		wxASSERT(m_MemoryWindow != NULL);
+
+		if (m_MemoryWindow)
+		{
+			m_MemoryWindow->Hide();
+		}
+	}
+}
+
+void CCodeWindow::OnHostMessage(wxCommandEvent& event)
+{
+	switch (event.GetId())
+	{
+	    case IDM_NOTIFYMAPLOADED:
+		    NotifyMapLoaded();
+		    break;
+
+	    case IDM_UPDATELOGDISPLAY:
+
+		    if (m_LogWindow)
+		    {
+			    m_LogWindow->NotifyUpdate();
+		    }
+
+		    break;
+
+	    case IDM_UPDATEDISASMDIALOG:
+		    Update();
+
+		    if (m_RegisterWindow)
+		    {
+			    m_RegisterWindow->NotifyUpdate();
+		    }
+		    break;
+
+		case IDM_UPDATEBREAKPOINTS:
+            Update();
+
+			if (m_BreakpointWindow)
+			{
+				m_BreakpointWindow->NotifyUpdate();
+			}
+			break;
+
+	}
+}
+
+void CCodeWindow::PopulateToolbar(wxToolBar* toolBar)
+{
+	int w = m_Bitmaps[Toolbar_DebugGo].GetWidth(),
+		h = m_Bitmaps[Toolbar_DebugGo].GetHeight();
+
+	toolBar->SetToolBitmapSize(wxSize(w, h));
+	toolBar->AddTool(IDM_DEBUG_GO,	_T("Play"),			m_Bitmaps[Toolbar_DebugGo]);
+	toolBar->AddTool(IDM_STEP,		_T("Step"),			m_Bitmaps[Toolbar_Step]);
+	toolBar->AddTool(IDM_STEPOVER,	_T("Step Over"),    m_Bitmaps[Toolbar_StepOver]);
+	toolBar->AddTool(IDM_SKIP,		_T("Skip"),			m_Bitmaps[Toolbar_Skip]);
+	toolBar->AddSeparator();
+	toolBar->AddTool(IDM_GOTOPC,    _T("Show PC"),		m_Bitmaps[Toolbar_GotoPC]);
+	toolBar->AddTool(IDM_SETPC,		_T("Set PC"),		m_Bitmaps[Toolbar_SetPC]);
+	toolBar->AddSeparator();
+	toolBar->AddControl(new wxTextCtrl(toolBar, IDM_ADDRBOX, _T("")));
+
+	// after adding the buttons to the toolbar, must call Realize() to reflect
+	// the changes
+	toolBar->Realize();
+}
+
+
+void CCodeWindow::RecreateToolbar()
+{
+	// delete and recreate the toolbar
+	wxToolBarBase* toolBar = GetToolBar();
+	delete toolBar;
+	SetToolBar(NULL);
+
+	long style = TOOLBAR_STYLE;
+	style &= ~(wxTB_HORIZONTAL | wxTB_VERTICAL | wxTB_BOTTOM | wxTB_RIGHT | wxTB_HORZ_LAYOUT | wxTB_TOP);
+	wxToolBar* theToolBar = CreateToolBar(style, ID_TOOLBAR);
+
+	PopulateToolbar(theToolBar);
+	SetToolBar(theToolBar);
+}
+
+
+void CCodeWindow::InitBitmaps()
+{
+	// load original size 48x48
+	m_Bitmaps[Toolbar_DebugGo] = wxGetBitmapFromMemory(toolbar_play_png);
+	m_Bitmaps[Toolbar_Step] = wxGetBitmapFromMemory(toolbar_add_breakpoint_png);
+	m_Bitmaps[Toolbar_StepOver] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
+	m_Bitmaps[Toolbar_Skip] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
+	m_Bitmaps[Toolbar_GotoPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
+	m_Bitmaps[Toolbar_SetPC] = wxGetBitmapFromMemory(toolbar_add_memcheck_png);
+	m_Bitmaps[Toolbar_Pause] = wxGetBitmapFromMemory(toolbar_pause_png);
+
+
+	// scale to 16x16 for toolbar
+	for (size_t n = Toolbar_DebugGo; n < Bitmaps_max; n++)
+	{
+		m_Bitmaps[n] = wxBitmap(m_Bitmaps[n].ConvertToImage().Scale(16, 16));
+	}
+}
+
+
+void CCodeWindow::OnKeyDown(wxKeyEvent& event)
+{
+	if ((event.GetKeyCode() == WXK_SPACE) && IsActive())
+	{
+		SingleCPUStep();	
+	}
+	else
+	{
+		event.Skip();
+	}
+}
+
+
+void CCodeWindow::SingleCPUStep()
+{
+	CCPU::StepOpcode(&sync_event);
+	//            if (CCPU::IsStepping())
+	//	            sync_event.Wait();
+	wxThread::Sleep(20);
+	// need a short wait here
+	JumpToAddress(PC);
+	Update();
+	Host_UpdateLogDisplay();
+}