diff --git a/rpcs3/Emu/SysCalls/Static.cpp b/rpcs3/Emu/SysCalls/Static.cpp index 2628a77272..15c179d987 100644 --- a/rpcs3/Emu/SysCalls/Static.cpp +++ b/rpcs3/Emu/SysCalls/Static.cpp @@ -9,7 +9,8 @@ void StaticAnalyse(void* ptr, u32 size) { u32* data = (u32*)ptr; size /= 4; - return; // disabled + if(!Ini.HLEHookStFunc.GetValue()) + return; // TODO: optimize search for (u32 i = 0; i < size; i++) diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index 269cfd0ce4..3219d1f61d 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -313,8 +313,6 @@ void MainFrame::SendOpenCloseSysMenu(wxCommandEvent& event) void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) { - //TODO - bool paused = false; if(Emu.IsRunning()) @@ -324,54 +322,75 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) } wxDialog diag(this, wxID_ANY, "Settings", wxDefaultPosition); + static const u32 m_height = 400; + static const u32 m_width = 385; - wxBoxSizer* s_panel(new wxBoxSizer(wxHORIZONTAL)); - wxBoxSizer* s_subpanel1(new wxBoxSizer(wxVERTICAL)); - wxBoxSizer* s_subpanel2(new wxBoxSizer(wxVERTICAL)); - wxBoxSizer* s_subpanel3(new wxBoxSizer(wxVERTICAL)); + // Settings panels + wxNotebook* nb_config = new wxNotebook(&diag, wxID_ANY, wxDefaultPosition, wxSize(m_width, m_height)); + wxPanel* p_system = new wxPanel(nb_config, wxID_ANY); + wxPanel* p_cpu = new wxPanel(nb_config, wxID_ANY); + wxPanel* p_graphics = new wxPanel(nb_config, wxID_ANY); + wxPanel* p_audio = new wxPanel(nb_config, wxID_ANY); + wxPanel* p_io = new wxPanel(nb_config, wxID_ANY); + wxPanel* p_hle = new wxPanel(nb_config, wxID_ANY); - wxStaticBoxSizer* s_round_cpu( new wxStaticBoxSizer( wxVERTICAL, &diag, _("CPU") ) ); - wxStaticBoxSizer* s_round_cpu_decoder( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Decoder") ) ); + nb_config->AddPage(p_cpu, wxT("Core")); + nb_config->AddPage(p_graphics, wxT("Graphics")); + nb_config->AddPage(p_audio, wxT("Audio")); + nb_config->AddPage(p_io, wxT("Input / Output")); + nb_config->AddPage(p_hle, wxT("HLE / Misc.")); + nb_config->AddPage(p_system, wxT("System")); - wxStaticBoxSizer* s_round_gs( new wxStaticBoxSizer( wxVERTICAL, &diag, _("GS") ) ); - wxStaticBoxSizer* s_round_gs_render( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Render") ) ); - wxStaticBoxSizer* s_round_gs_res( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Default resolution") ) ); - wxStaticBoxSizer* s_round_gs_aspect( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Default aspect ratio") ) ); + wxBoxSizer* s_subpanel_system(new wxBoxSizer(wxVERTICAL)); + wxBoxSizer* s_subpanel_cpu(new wxBoxSizer(wxVERTICAL)); + wxBoxSizer* s_subpanel_graphics(new wxBoxSizer(wxVERTICAL)); + wxBoxSizer* s_subpanel_audio(new wxBoxSizer(wxVERTICAL)); + wxBoxSizer* s_subpanel_io(new wxBoxSizer(wxVERTICAL)); + wxBoxSizer* s_subpanel_hle(new wxBoxSizer(wxVERTICAL)); - wxStaticBoxSizer* s_round_io( new wxStaticBoxSizer( wxVERTICAL, &diag, _("IO") ) ); - wxStaticBoxSizer* s_round_io_pad_handler( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Pad Handler") ) ); - wxStaticBoxSizer* s_round_io_keyboard_handler( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Keyboard Handler") ) ); - wxStaticBoxSizer* s_round_io_mouse_handler( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Mouse Handler") ) ); + // CPU settings + wxStaticBoxSizer* s_round_cpu_decoder( new wxStaticBoxSizer( wxVERTICAL, p_cpu, _("Decoder") ) ); + + // Graphics + wxStaticBoxSizer* s_round_gs_render( new wxStaticBoxSizer( wxVERTICAL, p_graphics, _("Render") ) ); + wxStaticBoxSizer* s_round_gs_res( new wxStaticBoxSizer( wxVERTICAL, p_graphics, _("Default resolution") ) ); + wxStaticBoxSizer* s_round_gs_aspect( new wxStaticBoxSizer( wxVERTICAL, p_graphics, _("Default aspect ratio") ) ); + + // Input / Output + wxStaticBoxSizer* s_round_io_pad_handler( new wxStaticBoxSizer( wxVERTICAL, p_io, _("Pad Handler") ) ); + wxStaticBoxSizer* s_round_io_keyboard_handler( new wxStaticBoxSizer( wxVERTICAL, p_io, _("Keyboard Handler") ) ); + wxStaticBoxSizer* s_round_io_mouse_handler( new wxStaticBoxSizer( wxVERTICAL, p_io, _("Mouse Handler") ) ); - wxStaticBoxSizer* s_round_audio( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Audio") ) ); - wxStaticBoxSizer* s_round_audio_out( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Audio Out") ) ); + // Audio + wxStaticBoxSizer* s_round_audio_out( new wxStaticBoxSizer( wxVERTICAL, p_audio, _("Audio Out") ) ); - wxStaticBoxSizer* s_round_hle( new wxStaticBoxSizer( wxVERTICAL, &diag, _("HLE / Misc.") ) ); - wxStaticBoxSizer* s_round_hle_log_lvl( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Log lvl") ) ); + // HLE / Misc. + wxStaticBoxSizer* s_round_hle_log_lvl( new wxStaticBoxSizer( wxVERTICAL, p_hle, _("Log lvl") ) ); - wxStaticBoxSizer* s_round_sys( new wxStaticBoxSizer( wxVERTICAL, &diag, _("System") ) ); - wxStaticBoxSizer* s_round_sys_lang( new wxStaticBoxSizer( wxVERTICAL, &diag, _("Language") ) ); + // System + wxStaticBoxSizer* s_round_sys_lang( new wxStaticBoxSizer( wxVERTICAL, p_system, _("Language") ) ); - wxComboBox* cbox_cpu_decoder = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_gs_render = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_gs_resolution = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_gs_aspect = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_pad_handler = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_keyboard_handler = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_mouse_handler = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_audio_out = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_hle_loglvl = new wxComboBox(&diag, wxID_ANY); - wxComboBox* cbox_sys_lang = new wxComboBox(&diag, wxID_ANY); + wxComboBox* cbox_cpu_decoder = new wxComboBox(p_cpu, wxID_ANY); + wxComboBox* cbox_gs_render = new wxComboBox(p_graphics, wxID_ANY); + wxComboBox* cbox_gs_resolution = new wxComboBox(p_graphics, wxID_ANY); + wxComboBox* cbox_gs_aspect = new wxComboBox(p_graphics, wxID_ANY); + wxComboBox* cbox_pad_handler = new wxComboBox(p_io, wxID_ANY); + wxComboBox* cbox_keyboard_handler = new wxComboBox(p_io, wxID_ANY); + wxComboBox* cbox_mouse_handler = new wxComboBox(p_io, wxID_ANY); + wxComboBox* cbox_audio_out = new wxComboBox(p_audio, wxID_ANY); + wxComboBox* cbox_hle_loglvl = new wxComboBox(p_hle, wxID_ANY); + wxComboBox* cbox_sys_lang = new wxComboBox(p_system, wxID_ANY); - wxCheckBox* chbox_cpu_ignore_rwerrors = new wxCheckBox(&diag, wxID_ANY, "Ignore Read/Write errors"); - wxCheckBox* chbox_gs_log_prog = new wxCheckBox(&diag, wxID_ANY, "Log vertex/fragment programs"); - wxCheckBox* chbox_gs_dump_depth = new wxCheckBox(&diag, wxID_ANY, "Write Depth Buffer"); - wxCheckBox* chbox_gs_dump_color = new wxCheckBox(&diag, wxID_ANY, "Write Color Buffers"); - wxCheckBox* chbox_gs_vsync = new wxCheckBox(&diag, wxID_ANY, "VSync"); - wxCheckBox* chbox_audio_dump = new wxCheckBox(&diag, wxID_ANY, "Dump to file"); - wxCheckBox* chbox_hle_logging = new wxCheckBox(&diag, wxID_ANY, "Log all SysCalls"); - wxCheckBox* chbox_hle_savetty = new wxCheckBox(&diag, wxID_ANY, "Save TTY output to file"); - wxCheckBox* chbox_hle_exitonstop = new wxCheckBox(&diag, wxID_ANY, "Exit RPCS3 when process finishes"); + wxCheckBox* chbox_cpu_ignore_rwerrors = new wxCheckBox(p_cpu, wxID_ANY, "Ignore Read/Write errors"); + wxCheckBox* chbox_gs_log_prog = new wxCheckBox(p_graphics, wxID_ANY, "Log vertex/fragment programs"); + wxCheckBox* chbox_gs_dump_depth = new wxCheckBox(p_graphics, wxID_ANY, "Write Depth Buffer"); + wxCheckBox* chbox_gs_dump_color = new wxCheckBox(p_graphics, wxID_ANY, "Write Color Buffers"); + wxCheckBox* chbox_gs_vsync = new wxCheckBox(p_graphics, wxID_ANY, "VSync"); + wxCheckBox* chbox_audio_dump = new wxCheckBox(p_audio, wxID_ANY, "Dump to file"); + wxCheckBox* chbox_hle_logging = new wxCheckBox(p_hle, wxID_ANY, "Log all SysCalls"); + wxCheckBox* chbox_hle_hook_stfunc = new wxCheckBox(p_hle, wxID_ANY, "Hook static functions"); + wxCheckBox* chbox_hle_savetty = new wxCheckBox(p_hle, wxID_ANY, "Save TTY output to file"); + wxCheckBox* chbox_hle_exitonstop = new wxCheckBox(p_hle, wxID_ANY, "Exit RPCS3 when process finishes"); //cbox_cpu_decoder->Append("DisAsm"); cbox_cpu_decoder->Append("Interpreter & DisAsm"); @@ -429,6 +448,8 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) cbox_sys_lang->Append("Polish"); cbox_sys_lang->Append("English (UK)"); + + // Get values from .ini chbox_cpu_ignore_rwerrors->SetValue(Ini.CPUIgnoreRWErrors.GetValue()); chbox_gs_log_prog->SetValue(Ini.GSLogPrograms.GetValue()); chbox_gs_dump_depth->SetValue(Ini.GSDumpDepthBuffer.GetValue()); @@ -436,13 +457,10 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) chbox_gs_vsync->SetValue(Ini.GSVSyncEnable.GetValue()); chbox_audio_dump->SetValue(Ini.AudioDumpToFile.GetValue()); chbox_hle_logging->SetValue(Ini.HLELogging.GetValue()); + chbox_hle_hook_stfunc->SetValue(Ini.HLEHookStFunc.GetValue()); chbox_hle_savetty->SetValue(Ini.HLESaveTTY.GetValue()); chbox_hle_exitonstop->SetValue(Ini.HLEExitOnStop.GetValue()); - chbox_audio_dump->Enable(Emu.IsStopped()); - //cbox_audio_out->Enable(Emu.IsStopped()); - chbox_hle_logging->Enable(Emu.IsStopped()); - cbox_cpu_decoder->SetSelection(Ini.CPUDecoderMode.GetValue() ? Ini.CPUDecoderMode.GetValue() - 1 : 0); cbox_gs_render->SetSelection(Ini.GSRenderMode.GetValue()); cbox_gs_resolution->SetSelection(ResolutionIdToNum(Ini.GSResolution.GetValue()) - 1); @@ -453,63 +471,78 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) cbox_audio_out->SetSelection(Ini.AudioOutMode.GetValue()); cbox_hle_loglvl->SetSelection(Ini.HLELogLvl.GetValue()); cbox_sys_lang->SetSelection(Ini.SysLanguage.GetValue()); + + + // Enable / Disable parameters + chbox_audio_dump->Enable(Emu.IsStopped()); + chbox_hle_logging->Enable(Emu.IsStopped()); + chbox_hle_hook_stfunc->Enable(Emu.IsStopped()); + s_round_cpu_decoder->Add(cbox_cpu_decoder, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_cpu->Add(s_round_cpu_decoder, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_cpu->Add(chbox_cpu_ignore_rwerrors, wxSizerFlags().Border(wxALL, 5).Expand()); s_round_gs_render->Add(cbox_gs_render, wxSizerFlags().Border(wxALL, 5).Expand()); s_round_gs_res->Add(cbox_gs_resolution, wxSizerFlags().Border(wxALL, 5).Expand()); s_round_gs_aspect->Add(cbox_gs_aspect, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_gs->Add(s_round_gs_render, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_gs->Add(s_round_gs_res, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_gs->Add(s_round_gs_aspect, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_gs->Add(chbox_gs_log_prog, wxSizerFlags().Border(wxALL, 5)); - s_round_gs->Add(chbox_gs_dump_depth, wxSizerFlags().Border(wxALL, 5)); - s_round_gs->Add(chbox_gs_dump_color, wxSizerFlags().Border(wxALL, 5)); - s_round_gs->Add(chbox_gs_vsync, wxSizerFlags().Border(wxALL, 5)); s_round_io_pad_handler->Add(cbox_pad_handler, wxSizerFlags().Border(wxALL, 5).Expand()); s_round_io_keyboard_handler->Add(cbox_keyboard_handler, wxSizerFlags().Border(wxALL, 5).Expand()); s_round_io_mouse_handler->Add(cbox_mouse_handler, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_io->Add(s_round_io_pad_handler, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_io->Add(s_round_io_keyboard_handler, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_io->Add(s_round_io_mouse_handler, wxSizerFlags().Border(wxALL, 5).Expand()); s_round_audio_out->Add(cbox_audio_out, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_audio_out->Add(chbox_audio_dump, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_audio->Add(s_round_audio_out, wxSizerFlags().Border(wxALL, 5).Expand()); s_round_hle_log_lvl->Add(cbox_hle_loglvl, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_hle->Add(s_round_hle_log_lvl, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_hle->Add(chbox_hle_logging, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_hle->Add(chbox_hle_savetty, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_hle->Add(chbox_hle_exitonstop, wxSizerFlags().Border(wxALL, 5).Expand()); s_round_sys_lang->Add(cbox_sys_lang, wxSizerFlags().Border(wxALL, 5).Expand()); - s_round_sys->Add(s_round_sys_lang, wxSizerFlags().Border(wxALL, 5).Expand()); - wxBoxSizer* s_b_panel(new wxBoxSizer(wxHORIZONTAL)); + // Core + s_subpanel_cpu->Add(s_round_cpu_decoder, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_cpu->Add(chbox_cpu_ignore_rwerrors, wxSizerFlags().Border(wxALL, 5).Expand()); - s_b_panel->Add(new wxButton(&diag, wxID_OK), wxSizerFlags().Border(wxALL, 5).Center()); - s_b_panel->Add(new wxButton(&diag, wxID_CANCEL), wxSizerFlags().Border(wxALL, 5).Center()); + // Graphics + s_subpanel_graphics->Add(s_round_gs_render, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_graphics->Add(s_round_gs_res, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_graphics->Add(s_round_gs_aspect, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_graphics->Add(chbox_gs_log_prog, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_graphics->Add(chbox_gs_dump_depth, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_graphics->Add(chbox_gs_dump_color, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_graphics->Add(chbox_gs_vsync, wxSizerFlags().Border(wxALL, 5).Expand()); - //wxBoxSizer* s_conf_panel(new wxBoxSizer(wxHORIZONTAL)); + // Input - Output + s_subpanel_io->Add(s_round_io_pad_handler, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_io->Add(s_round_io_keyboard_handler, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_io->Add(s_round_io_mouse_handler, wxSizerFlags().Border(wxALL, 5).Expand()); - s_subpanel1->Add(s_round_cpu, wxSizerFlags().Border(wxALL, 5).Expand()); - s_subpanel1->Add(s_round_gs, wxSizerFlags().Border(wxALL, 5).Expand()); - s_subpanel1->Add(s_b_panel, wxSizerFlags().Border(wxALL, 8).Expand()); - s_subpanel2->Add(s_round_io, wxSizerFlags().Border(wxALL, 5).Expand()); - s_subpanel2->Add(s_round_audio, wxSizerFlags().Border(wxALL, 5).Expand()); - s_subpanel2->Add(s_round_hle, wxSizerFlags().Border(wxALL, 5).Expand()); - s_subpanel3->Add(s_round_sys, wxSizerFlags().Border(wxALL, 5).Expand()); + // Audio + s_subpanel_audio->Add(s_round_audio_out, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_audio->Add(chbox_audio_dump, wxSizerFlags().Border(wxALL, 5).Expand()); - s_panel->Add(s_subpanel1, wxSizerFlags().Border(wxALL, 5).Expand()); - s_panel->Add(s_subpanel2, wxSizerFlags().Border(wxALL, 5).Expand()); - s_panel->Add(s_subpanel3, wxSizerFlags().Border(wxALL, 5).Expand()); + // HLE / Misc. + s_subpanel_hle->Add(s_round_hle_log_lvl, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_hle->Add(chbox_hle_logging, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_hle->Add(chbox_hle_hook_stfunc, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_hle->Add(chbox_hle_savetty, wxSizerFlags().Border(wxALL, 5).Expand()); + s_subpanel_hle->Add(chbox_hle_exitonstop, wxSizerFlags().Border(wxALL, 5).Expand()); - diag.SetSizerAndFit( s_panel ); + // System + s_subpanel_system->Add(s_round_sys_lang, wxSizerFlags().Border(wxALL, 5).Expand()); + // Buttons + wxBoxSizer* s_b_panel(new wxBoxSizer(wxHORIZONTAL)); + s_b_panel->Add(new wxButton(&diag, wxID_OK), wxSizerFlags().Border(wxALL, 5).Bottom()); + s_b_panel->Add(new wxButton(&diag, wxID_CANCEL), wxSizerFlags().Border(wxALL, 5).Bottom()); + + // Resize panels + diag.SetSizerAndFit(s_subpanel_cpu, false); + diag.SetSizerAndFit(s_subpanel_graphics, false); + diag.SetSizerAndFit(s_subpanel_io, false); + diag.SetSizerAndFit(s_subpanel_audio, false); + diag.SetSizerAndFit(s_subpanel_hle, false); + diag.SetSizerAndFit(s_subpanel_system, false); + diag.SetSizerAndFit(s_b_panel, false); + + diag.SetSize(m_width, m_height + 80); + if(diag.ShowModal() == wxID_OK) { Ini.CPUDecoderMode.SetValue(cbox_cpu_decoder->GetSelection() + 1); @@ -527,6 +560,7 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event)) Ini.AudioOutMode.SetValue(cbox_audio_out->GetSelection()); Ini.AudioDumpToFile.SetValue(chbox_audio_dump->GetValue()); Ini.HLELogging.SetValue(chbox_hle_logging->GetValue()); + Ini.HLEHookStFunc.SetValue(chbox_hle_hook_stfunc->GetValue()); Ini.HLESaveTTY.SetValue(chbox_hle_savetty->GetValue()); Ini.HLEExitOnStop.SetValue(chbox_hle_exitonstop->GetValue()); Ini.HLELogLvl.SetValue(cbox_hle_loglvl->GetSelection()); diff --git a/rpcs3/Ini.h b/rpcs3/Ini.h index 2bef4ef0d2..d8f7e55f9c 100644 --- a/rpcs3/Ini.h +++ b/rpcs3/Ini.h @@ -107,6 +107,7 @@ public: IniEntry AudioOutMode; IniEntry AudioDumpToFile; IniEntry HLELogging; + IniEntry HLEHookStFunc; IniEntry HLESaveTTY; IniEntry HLEExitOnStop; IniEntry HLELogLvl; @@ -176,6 +177,7 @@ public: path = DefPath + "/" + "HLE"; HLELogging.Init("HLELogging", path); + HLEHookStFunc.Init("HLEHookStFunc", path); HLESaveTTY.Init("HLESaveTTY", path); HLEExitOnStop.Init("HLEExitOnStop", path); HLELogLvl.Init("HLELogLvl", path); @@ -201,6 +203,7 @@ public: AudioOutMode.Load(1); AudioDumpToFile.Load(0); HLELogging.Load(false); + HLEHookStFunc.Load(false); HLESaveTTY.Load(false); HLEExitOnStop.Load(false); HLELogLvl.Load(0); @@ -241,6 +244,7 @@ public: AudioOutMode.Save(); AudioDumpToFile.Save(); HLELogging.Save(); + HLEHookStFunc.Save(); HLESaveTTY.Save(); HLEExitOnStop.Save(); HLELogLvl.Save();