80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Make cpu_override also ignore CPU dynarec requirement

Browse Source
This commit is contained in:
Alexander Babikov
2022-10-05 11:42:00 +05:00
parent 346d99f9b3
commit f72585e9f9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/qt_settingsmachine.cpp
View File

@@ -278,7 +278,7 @@ SettingsMachine::on_comboBoxSpeed_currentIndexChanged(int index)
if (!(flags & CPU_SUPPORTS_DYNAREC)) { if (!(flags & CPU_SUPPORTS_DYNAREC)) {
ui->checkBoxDynamicRecompiler->setChecked(false); ui->checkBoxDynamicRecompiler->setChecked(false);
ui->checkBoxDynamicRecompiler->setEnabled(false); ui->checkBoxDynamicRecompiler->setEnabled(false);
} else if (flags & CPU_REQUIRES_DYNAREC) { } else if ((flags & CPU_REQUIRES_DYNAREC) && !cpu_override) {
ui->checkBoxDynamicRecompiler->setChecked(true); ui->checkBoxDynamicRecompiler->setChecked(true);
ui->checkBoxDynamicRecompiler->setEnabled(false); ui->checkBoxDynamicRecompiler->setEnabled(false);
} else { } else {

2
src/win/win_settings.c
View File

@@ -748,7 +748,7 @@ win_settings_machine_recalc_cpu(HWND hdlg)
cpu_flags = temp_cpu_f->cpus[temp_cpu].cpu_flags; cpu_flags = temp_cpu_f->cpus[temp_cpu].cpu_flags;
if (!(cpu_flags & CPU_SUPPORTS_DYNAREC) && (cpu_flags & CPU_REQUIRES_DYNAREC)) if (!(cpu_flags & CPU_SUPPORTS_DYNAREC) && (cpu_flags & CPU_REQUIRES_DYNAREC))
fatal("Attempting to select a CPU that requires the recompiler and does not support it at the same time\n"); fatal("Attempting to select a CPU that requires the recompiler and does not support it at the same time\n");
if (!(cpu_flags & CPU_SUPPORTS_DYNAREC) || (cpu_flags & CPU_REQUIRES_DYNAREC)) { if (!(cpu_flags & CPU_SUPPORTS_DYNAREC) || ((cpu_flags & CPU_REQUIRES_DYNAREC) && !cpu_override))) {
if (!(cpu_flags & CPU_SUPPORTS_DYNAREC)) if (!(cpu_flags & CPU_SUPPORTS_DYNAREC))
temp_dynarec = 0; temp_dynarec = 0;
if (cpu_flags & CPU_REQUIRES_DYNAREC) if (cpu_flags & CPU_REQUIRES_DYNAREC)