diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2016-05-09 15:24:58 +0200 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2016-06-07 18:02:49 +0300 |
| commit | c00dc6750f6e825df27aa20fce713a55a4032cc6 (patch) | |
| tree | 5bc37f2cc12cfd8cd0484edf344bd67d755d4c71 | |
| parent | cd1f16f94727f82ea77fcd82c4dad63bb9172a6f (diff) | |
replace muldiv64(a, b, c) by (uint64_t)a * b / c
When "a" and "b" are 32bit values, we don't have to cast
them to 128bit, 64bit is enough.
This patch is the result of coccinelle script
scripts/coccinelle/simplify_muldiv64.cocci
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
For xtensa PIC:
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | hw/audio/gus.c | 2 | ||||
| -rw-r--r-- | hw/xtensa/pic_cpu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 9dd6947bee..6c02646773 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -144,7 +144,7 @@ static void GUS_callback (void *opaque, int free) s->left = samples; reset: - gus_irqgen (&s->emu, muldiv64 (net, 1000000, s->freq)); + gus_irqgen (&s->emu, (uint64_t)net * 1000000 / s->freq); } int GUS_irqrequest (GUSEmuState *emu, int hwirq, int n) diff --git a/hw/xtensa/pic_cpu.c b/hw/xtensa/pic_cpu.c index ccf65fd8ad..2bed64f15b 100644 --- a/hw/xtensa/pic_cpu.c +++ b/hw/xtensa/pic_cpu.c @@ -122,8 +122,8 @@ void xtensa_rearm_ccompare_timer(CPUXtensaState *env) } env->wake_ccount = wake_ccount; timer_mod(env->ccompare_timer, env->halt_clock + - muldiv64(wake_ccount - env->sregs[CCOUNT], - 1000000, env->config->clock_freq_khz)); + (uint64_t)(wake_ccount - env->sregs[CCOUNT]) * + 1000000 / env->config->clock_freq_khz); } static void xtensa_ccompare_cb(void *opaque) |