Skip to content

Commit

Permalink
non-recursive mode is always on as an option, so there is no need to
Browse files Browse the repository at this point in the history
check and complain about normal core and having the option off.
  • Loading branch information
joncampbell123 committed Dec 29, 2017
1 parent e50ce08 commit c136452
Showing 1 changed file with 2 additions and 19 deletions.
21 changes: 2 additions & 19 deletions src/cpu/cpu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3049,13 +3049,6 @@ class CPU: public Module_base {
else if (CPU_ArchitectureType>=CPU_ARCHTYPE_486OLD) CPU_extflags_toggle=(FLAG_AC);
else CPU_extflags_toggle=0;

if (cpudecoder == &CPU_Core_Normal_Run || cpudecoder == &CPU_Core_Prefetch_Run) {
if (!dosbox_enable_nonrecursive_page_fault) {
dosbox_enable_nonrecursive_page_fault = true;
_LOG(LOG_CPU,LOG_NORMAL)("normal/prefetch core requires nonrecursive page fault handling, turning it on");
}
}

// weitek coprocessor emulation?
if (CPU_ArchitectureType == CPU_ARCHTYPE_386 || CPU_ArchitectureType == CPU_ARCHTYPE_486OLD || CPU_ArchitectureType == CPU_ARCHTYPE_486NEW) {
Section_prop *dsection = static_cast<Section_prop *>(control->GetSection("dosbox"));
Expand Down Expand Up @@ -3182,18 +3175,8 @@ CPU_Decoder *CPU_IndexDecoderType( Bit16u decoder_idx )

cpudecoder = 0;
switch( decoder_idx ) {
case 0: cpudecoder = &CPU_Core_Normal_Run;
if (!dosbox_enable_nonrecursive_page_fault) {
dosbox_enable_nonrecursive_page_fault = true;
_LOG(LOG_CPU,LOG_NORMAL)("normal/prefetch core requires nonrecursive page fault handling, turning it on");
}
break;
case 1: cpudecoder = &CPU_Core_Prefetch_Run;
if (!dosbox_enable_nonrecursive_page_fault) {
dosbox_enable_nonrecursive_page_fault = true;
_LOG(LOG_CPU,LOG_NORMAL)("normal/prefetch core requires nonrecursive page fault handling, turning it on");
}
break;
case 0: cpudecoder = &CPU_Core_Normal_Run; break;
case 1: cpudecoder = &CPU_Core_Prefetch_Run; break;
case 2: cpudecoder = &CPU_Core_Simple_Run; break;
case 3: cpudecoder = &CPU_Core_Full_Run; break;
case 100: cpudecoder = &CPU_Core_Normal_Trap_Run; break;
Expand Down

0 comments on commit c136452

Please sign in to comment.