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

Disable full MMU by default and add it to global config GUI 

Requested by JMC.
This commit is contained in:
JosJuice 2019-09-04 19:52:35 +02:00
parent 08b191ee8e
commit 9e0b09ddf4
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/ConfigManager.cpp
View File

@ -234,6 +234,7 @@ void SConfig::SaveCoreSettings(IniFile& ini)
core->Set("WiimoteEnableSpeaker", m_WiimoteEnableSpeaker); core->Set("WiimoteEnableSpeaker", m_WiimoteEnableSpeaker);
core->Set("RunCompareServer", bRunCompareServer); core->Set("RunCompareServer", bRunCompareServer);
core->Set("RunCompareClient", bRunCompareClient); core->Set("RunCompareClient", bRunCompareClient);
core->Set("MMU", bMMU);
core->Set("EmulationSpeed", m_EmulationSpeed); core->Set("EmulationSpeed", m_EmulationSpeed);
core->Set("Overclock", m_OCFactor); core->Set("Overclock", m_OCFactor);
core->Set("OverclockEnable", m_OCEnable); core->Set("OverclockEnable", m_OCEnable);
@ -765,11 +766,7 @@ void SConfig::LoadDefaults()
bFastmem = true; bFastmem = true;
bFPRF = false; bFPRF = false;
bAccurateNaNs = false; bAccurateNaNs = false;
#ifdef _M_X86_64
bMMU = true;
#else
bMMU = false; bMMU = false;
#endif
bLowDCBZHack = false; bLowDCBZHack = false;
iBBDumpPort = -1; iBBDumpPort = -1;
bSyncGPU = false; bSyncGPU = false;

9
Source/Core/DolphinQt/Settings/AdvancedPane.cpp
View File

@ -63,6 +63,9 @@ void AdvancedPane::CreateLayout()
cpu_emulation_layout->addWidget(m_cpu_emulation_engine_combobox, 0, 1, Qt::AlignLeft); cpu_emulation_layout->addWidget(m_cpu_emulation_engine_combobox, 0, 1, Qt::AlignLeft);
cpu_options_layout->addLayout(cpu_emulation_layout); cpu_options_layout->addLayout(cpu_emulation_layout);
m_enable_mmu_checkbox = new QCheckBox(tr("Enable MMU"));
cpu_options_layout->addWidget(m_enable_mmu_checkbox);
auto* clock_override = new QGroupBox(tr("Clock Override")); auto* clock_override = new QGroupBox(tr("Clock Override"));
auto* clock_override_layout = new QVBoxLayout(); auto* clock_override_layout = new QVBoxLayout();
clock_override->setLayout(clock_override_layout); clock_override->setLayout(clock_override_layout);
@ -134,6 +137,9 @@ void AdvancedPane::ConnectLayout()
Config::SetBaseOrCurrent(Config::MAIN_CPU_CORE, PowerPC::AvailableCPUCores()[index]); Config::SetBaseOrCurrent(Config::MAIN_CPU_CORE, PowerPC::AvailableCPUCores()[index]);
}); });
connect(m_enable_mmu_checkbox, &QCheckBox::toggled, this,
[this](bool checked) { SConfig::GetInstance().bMMU = checked; });
m_cpu_clock_override_checkbox->setChecked(SConfig::GetInstance().m_OCEnable); m_cpu_clock_override_checkbox->setChecked(SConfig::GetInstance().m_OCEnable);
connect(m_cpu_clock_override_checkbox, &QCheckBox::toggled, [this](bool enable_clock_override) { connect(m_cpu_clock_override_checkbox, &QCheckBox::toggled, [this](bool enable_clock_override) {
SConfig::GetInstance().m_OCEnable = enable_clock_override; SConfig::GetInstance().m_OCEnable = enable_clock_override;
@ -178,6 +184,9 @@ void AdvancedPane::Update()
} }
m_cpu_emulation_engine_combobox->setEnabled(!running); m_cpu_emulation_engine_combobox->setEnabled(!running);
m_enable_mmu_checkbox->setChecked(SConfig::GetInstance().bMMU);
m_enable_mmu_checkbox->setEnabled(!running);
QFont bf = font(); QFont bf = font();
bf.setBold(Config::GetActiveLayerForConfig(Config::MAIN_OVERCLOCK_ENABLE) != bf.setBold(Config::GetActiveLayerForConfig(Config::MAIN_OVERCLOCK_ENABLE) !=
Config::LayerType::Base); Config::LayerType::Base);

1
Source/Core/DolphinQt/Settings/AdvancedPane.h
View File

@ -32,6 +32,7 @@ private:
void Update(); void Update();
QComboBox* m_cpu_emulation_engine_combobox; QComboBox* m_cpu_emulation_engine_combobox;
QCheckBox* m_enable_mmu_checkbox;
QCheckBox* m_cpu_clock_override_checkbox; QCheckBox* m_cpu_clock_override_checkbox;
QSlider* m_cpu_clock_override_slider; QSlider* m_cpu_clock_override_slider;
QLabel* m_cpu_clock_override_slider_label; QLabel* m_cpu_clock_override_slider_label;