valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

add option to select cpu core in config file

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1544
This commit is contained in:
Sjoerd van der Berg 2004-01-07 21:37:47 +00:00
parent 926c1aab65
commit 012d12d691
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/cpu/cpu.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: cpu.cpp,v 1.46 2004-01-01 12:26:08 harekiet Exp $ */
/* $Id: cpu.cpp,v 1.47 2004-01-07 21:37:47 harekiet Exp $ */
#include <assert.h>
#include "dosbox.h"
@ -26,6 +26,7 @@
#include "keyboard.h"
#include "setup.h"
#include "paging.h"
#include "support.h"
Bitu DEBUG_EnableDebugger(void);
@ -1255,9 +1256,6 @@ void CPU_Init(Section* sec) {
#if (C_DYNAMIC_X86)
CPU_Core_Dyn_X86_Init();
#endif
cpudecoder=&startcpu_core;
CPU_JMP(false,0,0); //Setup the first cpu core
KEYBOARD_AddEvent(KBD_f11,KBD_MOD_CTRL,CPU_CycleDecrease);
KEYBOARD_AddEvent(KBD_f12,KBD_MOD_CTRL,CPU_CycleIncrease);
@ -1266,6 +1264,23 @@ void CPU_Init(Section* sec) {
CPU_CycleMax=section->Get_int("cycles");;
CPU_CycleUp=section->Get_int("cycleup");
CPU_CycleDown=section->Get_int("cycledown");
const char * core=section->Get_string("core");
cpudecoder=&CPU_Core_Normal_Run;
if (!strcasecmp(core,"normal")) {
cpudecoder=&CPU_Core_Normal_Run;
} else if (!strcasecmp(core,"full")) {
cpudecoder=&CPU_Core_Full_Run;
}
#if (C_DYNAMIC_X86)
else if (!strcasecmp(core,"dynamic")) {
cpudecoder=&CPU_Core_Dyn_X86_Run;
}
#endif
else {
LOG_MSG("CPU:Unknown core type %s, switcing back to normal.",core);
}
CPU_JMP(false,0,0); //Setup the first cpu core
if (!CPU_CycleMax) CPU_CycleMax = 1800;
if(!CPU_CycleUp) CPU_CycleUp = 500;
if(!CPU_CycleDown) CPU_CycleDown = 20;

6
src/dosbox.cpp
View file

@ -221,10 +221,16 @@ void DOSBOX_Init(void) {
);
secprop=control->AddSection_prop("cpu",&CPU_Init);
secprop->Add_string("core","normal");
secprop->Add_int("cycles",1800);
secprop->Add_int("cycleup",500);
secprop->Add_int("cycledown",20);
MSG_Add("CPU_CONFIGFILE_HELP",
"core -- CPU Core used in emulation: normal,full"
#if (C_DYNAMIC_X86)
",dynamic"
#endif
".\n"
"cycles -- Amount of instructions dosbox tries to emulate each millsecond.\n"
" Setting this higher than your machine can handle is bad!\n"
"cycleup -- Amount of cycles to increase/decrease with keycombo.\n"