piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Take care of some compiler warnings from unused variables, and a little code cleanup.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6081 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-08-10 01:08:22 +00:00
parent 55d7f93e0c
commit a1daa636c2
4 changed files with 286 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Core/DebuggerWX/Src/CodeWindow.cpp
View File

@ -437,11 +437,11 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam
interpreter->Check(_LocalCoreStartupParameter.iCPUCore == 0); interpreter->Check(_LocalCoreStartupParameter.iCPUCore == 0);
pCoreMenu->AppendSeparator(); pCoreMenu->AppendSeparator();
jitblocklinking = pCoreMenu->Append(IDM_JITBLOCKLINKING, _T("&JIT Block Linking off"), pCoreMenu->Append(IDM_JITBLOCKLINKING, _T("&JIT Block Linking off"),
_T("Provide safer execution by not linking the JIT blocks."), _T("Provide safer execution by not linking the JIT blocks."),
wxITEM_CHECK); wxITEM_CHECK);
jitnoblockcache = pCoreMenu->Append(IDM_JITNOBLOCKCACHE, _T("&Disable JIT Cache"), pCoreMenu->Append(IDM_JITNOBLOCKCACHE, _T("&Disable JIT Cache"),
_T("Avoid any involuntary JIT cache clearing, this may prevent Zelda TP from crashing.") _T("Avoid any involuntary JIT cache clearing, this may prevent Zelda TP from crashing.")
_T(" [This option must be selected before a game is started.]"), _T(" [This option must be selected before a game is started.]"),
wxITEM_CHECK); wxITEM_CHECK);
@ -452,28 +452,28 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam
pCoreMenu->Append(IDM_SEARCHINSTRUCTION, _T("&Search for an op")); pCoreMenu->Append(IDM_SEARCHINSTRUCTION, _T("&Search for an op"));
pCoreMenu->AppendSeparator(); pCoreMenu->AppendSeparator();
jitoff = pCoreMenu->Append(IDM_JITOFF, _T("&JIT off (JIT core)"), pCoreMenu->Append(IDM_JITOFF, _T("&JIT off (JIT core)"),
_T("Turn off all JIT functions, but still use the JIT core from Jit.cpp"), _T("Turn off all JIT functions, but still use the JIT core from Jit.cpp"),
wxITEM_CHECK); wxITEM_CHECK);
jitlsoff = pCoreMenu->Append(IDM_JITLSOFF, _T("&JIT LoadStore off"), pCoreMenu->Append(IDM_JITLSOFF, _T("&JIT LoadStore off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
jitlslbzxoff = pCoreMenu->Append(IDM_JITLSLBZXOFF, _T(" &JIT LoadStore lbzx off"), pCoreMenu->Append(IDM_JITLSLBZXOFF, _T(" &JIT LoadStore lbzx off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
jitlslxzoff = pCoreMenu->Append(IDM_JITLSLXZOFF, _T(" &JIT LoadStore lXz off"), pCoreMenu->Append(IDM_JITLSLXZOFF, _T(" &JIT LoadStore lXz off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
jitlslwzoff = pCoreMenu->Append(IDM_JITLSLWZOFF, _T(" &JIT LoadStore lwz off"), pCoreMenu->Append(IDM_JITLSLWZOFF, _T(" &JIT LoadStore lwz off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
jitlspoff = pCoreMenu->Append(IDM_JITLSFOFF, _T("&JIT LoadStore Floating off"), pCoreMenu->Append(IDM_JITLSFOFF, _T("&JIT LoadStore Floating off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
jitlsfoff = pCoreMenu->Append(IDM_JITLSPOFF, _T("&JIT LoadStore Paired off"), pCoreMenu->Append(IDM_JITLSPOFF, _T("&JIT LoadStore Paired off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
jitfpoff = pCoreMenu->Append(IDM_JITFPOFF, _T("&JIT FloatingPoint off"), pCoreMenu->Append(IDM_JITFPOFF, _T("&JIT FloatingPoint off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
jitioff = pCoreMenu->Append(IDM_JITIOFF, _T("&JIT Integer off"), pCoreMenu->Append(IDM_JITIOFF, _T("&JIT Integer off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
jitpoff = pCoreMenu->Append(IDM_JITPOFF, _T("&JIT Paired off"), pCoreMenu->Append(IDM_JITPOFF, _T("&JIT Paired off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
jitsroff = pCoreMenu->Append(IDM_JITSROFF, _T("&JIT SystemRegisters off"), pCoreMenu->Append(IDM_JITSROFF, _T("&JIT SystemRegisters off"),
wxEmptyString, wxITEM_CHECK); wxEmptyString, wxITEM_CHECK);
pMenuBar->Append(pCoreMenu, _T("&JIT")); pMenuBar->Append(pCoreMenu, _T("&JIT"));
@ -482,9 +482,9 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam
// Debug Menu // Debug Menu
wxMenu* pDebugMenu = new wxMenu; wxMenu* pDebugMenu = new wxMenu;
wxMenuItem* stepinto = pDebugMenu->Append(IDM_STEP, _T("Step &Into\tF11")); pDebugMenu->Append(IDM_STEP, _T("Step &Into\tF11"));
wxMenuItem* stepover = pDebugMenu->Append(IDM_STEPOVER, _T("Step &Over\tF10")); pDebugMenu->Append(IDM_STEPOVER, _T("Step &Over\tF10"));
wxMenuItem* togglebreakpoint = pDebugMenu->Append(IDM_TOGGLE_BREAKPOINT, _T("Toggle &Breakpoint\tF9")); pDebugMenu->Append(IDM_TOGGLE_BREAKPOINT, _T("Toggle &Breakpoint\tF9"));
pMenuBar->Append(pDebugMenu, _T("&Debug")); pMenuBar->Append(pDebugMenu, _T("&Debug"));

9
Source/Core/DebuggerWX/Src/CodeWindow.h
View File

@ -143,15 +143,6 @@ class CCodeWindow
void InitBitmaps(); void InitBitmaps();
void CreateGUIControls(const SCoreStartupParameter& _LocalCoreStartupParameter); void CreateGUIControls(const SCoreStartupParameter& _LocalCoreStartupParameter);
wxMenuItem* jitblocklinking, *jitnoblockcache, *jitoff;
wxMenuItem* jitlsoff, *jitlslxzoff, *jitlslwzoff, *jitlslbzxoff;
wxMenuItem* jitlspoff;
wxMenuItem* jitlsfoff;
wxMenuItem* jitfpoff;
wxMenuItem* jitioff;
wxMenuItem* jitpoff;
wxMenuItem* jitsroff;
CCodeView* codeview; CCodeView* codeview;
wxListBox* callstack; wxListBox* callstack;
wxListBox* symbols; wxListBox* symbols;

2
Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
View File

@ -76,8 +76,6 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
} }
extern bool gShowDebugger; extern bool gShowDebugger;
int OSDChoice = 0 , OSDTime = 0, OSDInternalW = 0, OSDInternalH = 0;
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// OSD Menu // OSD Menu

460
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

File diff suppressed because it is too large Load Diff