diff --git a/src/include/86box/timer.h b/src/include/86box/timer.h index a5ecf72fc..38784e154 100644 --- a/src/include/86box/timer.h +++ b/src/include/86box/timer.h @@ -92,10 +92,8 @@ timer_advance_u64(pc_timer_t *timer, uint64_t delay) uint64_t int_delay = delay >> 32; uint32_t frac_delay = delay & 0xffffffff; - if (int_delay & 0x0000000080000000ULL) { - printf("timer_advance_u64(): Negative delay: %08X%08X!\n", (uint32_t) (int_delay), frac_delay); + if (int_delay & 0x0000000080000000ULL) int_delay |= 0xffffffff00000000ULL; - } if ((frac_delay + timer->ts_frac) < frac_delay) timer->ts_integer++; @@ -113,10 +111,8 @@ timer_set_delay_u64(pc_timer_t *timer, uint64_t delay) uint64_t int_delay = delay >> 32; uint32_t frac_delay = delay & 0xffffffff; - if (int_delay & 0x0000000080000000ULL) { - printf("timer_set_delay_u64(): Negative delay: %08X%08X!\n", (uint32_t) (int_delay), frac_delay); + if (int_delay & 0x0000000080000000ULL) int_delay |= 0xffffffff00000000ULL; - } timer->ts_frac = frac_delay; timer->ts_integer = int_delay + (uint64_t)tsc; diff --git a/src/timer.c b/src/timer.c index 9f47f8608..7eacf36f6 100644 --- a/src/timer.c +++ b/src/timer.c @@ -124,11 +124,8 @@ timer_process(void) while (1) { pc_timer_t *timer = timer_head; - if (!TIMER_LESS_THAN_VAL(timer, (uint64_t) tsc)) { - if (num == 0) - pclog("No processing because all timers expire later\n"); + if (!TIMER_LESS_THAN_VAL(timer, (uint64_t) tsc)) break; - } timer_remove_head(); @@ -150,9 +147,6 @@ timer_process(void) } timer_target = timer_head->ts_integer; - - if (old_target > timer_target) - pclog("Timer wraparound!\n"); } void