From 726aabde05b8152a1cf9abcb5ceb6bd80b4718ba Mon Sep 17 00:00:00 2001 From: Sjoerd van der Berg Date: Sat, 19 Oct 2002 17:46:13 +0000 Subject: [PATCH] Protection against setting 0 cycles in the config file and reading out from the low case cycles property Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@375 --- src/cpu/cpu.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp index 160bb573..6ab41391 100644 --- a/src/cpu/cpu.cpp +++ b/src/cpu/cpu.cpp @@ -29,27 +29,22 @@ Flag_Info flags; CPU_Regs cpu_regs; - - Segment Segs[6]; -Bit32u cpu_cycles; +Bitu cpu_cycles; CPU_Decoder * cpudecoder; - static void CPU_CycleIncrease(void) { - Bit32u old_cycles=cpu_cycles; - cpu_cycles=(Bit32u)(cpu_cycles*1.2); + Bitu old_cycles=cpu_cycles; + cpu_cycles=(Bitu)(cpu_cycles*1.2); if (cpu_cycles==old_cycles) cpu_cycles++; LOG_MSG("CPU:%d cycles",cpu_cycles); - } static void CPU_CycleDecrease(void) { - cpu_cycles=(Bit32u)(cpu_cycles/1.2); + cpu_cycles=(Bitu)(cpu_cycles/1.2); if (!cpu_cycles) cpu_cycles=1; LOG_MSG("CPU:%d cycles",cpu_cycles); - } Bit8u lastint; @@ -168,7 +163,8 @@ void CPU_Init(Section* sec) { flags.io=0; SetCPU16bit(); - cpu_cycles=section->Get_int("CYCLES"); + cpu_cycles=section->Get_int("cycles"); + if (!cpu_cycles) cpu_cycles=300; KEYBOARD_AddEvent(KBD_f11,CTRL_PRESSED,CPU_CycleDecrease); KEYBOARD_AddEvent(KBD_f12,CTRL_PRESSED,CPU_CycleIncrease);