From patchwork Fri Oct 29 19:30:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: malc X-Patchwork-Id: 69626 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BC9F5B70D5 for ; Sat, 30 Oct 2010 06:32:30 +1100 (EST) Received: from localhost ([127.0.0.1]:47111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBugd-0001lV-1y for incoming@patchwork.ozlabs.org; Fri, 29 Oct 2010 15:32:27 -0400 Received: from [140.186.70.92] (port=43747 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PBufG-0001O4-9f for qemu-devel@nongnu.org; Fri, 29 Oct 2010 15:31:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PBufE-0003CU-R2 for qemu-devel@nongnu.org; Fri, 29 Oct 2010 15:31:02 -0400 Received: from fe02x03-cgp.akado.ru ([77.232.31.165]:64344 helo=akado.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PBufE-0003Bs-GO for qemu-devel@nongnu.org; Fri, 29 Oct 2010 15:31:00 -0400 Received: from [10.0.66.9] ([10.0.66.9] verified) by fe02-cgp.akado.ru (CommuniGate Pro SMTP 5.2.13) with ESMTPS id 181851207; Fri, 29 Oct 2010 23:30:54 +0400 Date: Fri, 29 Oct 2010 23:30:52 +0400 (MSD) From: malc X-X-Sender: malc@linmac To: qemu-devel Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Blue Swirl , Stefan Hajnoczi , Eduardo Cruz Subject: [Qemu-devel] muldiv64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org c57c846a80f9306aa2c6cf7efdef45ed42723fac broke gus, Blue Swirl said that he put muldiv64 into qemu-timer.h since putting it elsewhere broke something and he can't remember what, anyways gus has nothing to do with timers (just like muldiv64) so I've tried following and built all targets on linux with -tracing-backend=nop (-tracing-backend=simple doesn't even build for the reasons I can not understand), so unless someone will point me to a scenario where following doesn't work it will be applied, thanks. diff --git a/hw/omap_clk.c b/hw/omap_clk.c index 10c9c43..6bcabef 100644 --- a/hw/omap_clk.c +++ b/hw/omap_clk.c @@ -20,7 +20,6 @@ */ #include "hw.h" #include "omap.h" -#include "qemu-timer.h" /* for muldiv64() */ struct clk { const char *name; diff --git a/qemu-common.h b/qemu-common.h index 2fbc27f..d31f366 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -309,6 +309,30 @@ static inline uint8_t from_bcd(uint8_t val) return ((val >> 4) * 10) + (val & 0x0f); } +/* compute with 96 bit intermediate result: (a*b)/c */ +static inline uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c) +{ + union { + uint64_t ll; + struct { +#ifdef HOST_WORDS_BIGENDIAN + uint32_t high, low; +#else + uint32_t low, high; +#endif + } l; + } u, res; + uint64_t rl, rh; + + u.ll = a; + rl = (uint64_t)u.l.low * (uint64_t)b; + rh = (uint64_t)u.l.high * (uint64_t)b; + rh += (rl >> 32); + res.l.high = rh / c; + res.l.low = (((rh % c) << 32) + (rl & 0xffffffff)) / c; + return res.ll; +} + #include "module.h" #endif diff --git a/qemu-timer.h b/qemu-timer.h index 299e387..8cd8f83 100644 --- a/qemu-timer.h +++ b/qemu-timer.h @@ -59,30 +59,6 @@ static inline int64_t get_ticks_per_sec(void) return 1000000000LL; } -/* compute with 96 bit intermediate result: (a*b)/c */ -static inline uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c) -{ - union { - uint64_t ll; - struct { -#ifdef HOST_WORDS_BIGENDIAN - uint32_t high, low; -#else - uint32_t low, high; -#endif - } l; - } u, res; - uint64_t rl, rh; - - u.ll = a; - rl = (uint64_t)u.l.low * (uint64_t)b; - rh = (uint64_t)u.l.high * (uint64_t)b; - rh += (rl >> 32); - res.l.high = rh / c; - res.l.low = (((rh % c) << 32) + (rl & 0xffffffff)) / c; - return res.ll; -} - /* real time host monotonic timer */ static inline int64_t get_clock_realtime(void) {