Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LyMdJ-0002eb-6d for qemu-devel@nongnu.org; Mon, 27 Apr 2009 04:56:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LyMdE-0002dd-Kn for qemu-devel@nongnu.org; Mon, 27 Apr 2009 04:56:12 -0400 Received: from [199.232.76.173] (port=48741 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LyMdE-0002da-I5 for qemu-devel@nongnu.org; Mon, 27 Apr 2009 04:56:08 -0400 Received: from mel.act-europe.fr ([212.99.106.210]:47446) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LyMdE-00051v-6l for qemu-devel@nongnu.org; Mon, 27 Apr 2009 04:56:08 -0400 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 2EF62290093 for ; Mon, 27 Apr 2009 10:55:46 +0200 (CEST) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id svbqtOaIcTDu for ; Mon, 27 Apr 2009 10:55:45 +0200 (CEST) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) by mel.act-europe.fr (Postfix) with ESMTP id 38224290042 for ; Mon, 27 Apr 2009 10:55:45 +0200 (CEST) From: Tristan Gingold Date: Mon, 27 Apr 2009 10:55:47 +0200 Message-Id: <1240822547-735-1-git-send-email-gingold@adacore.com> Subject: [Qemu-devel] [PATCH] Fix typo in _cpu_ppc_load_decr List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Use parameter 'next' to fix the hdecr case. Also pass 'next' by value instead of pointer (more easy to read and no performance issue for an always_inline function). Signed-off-by: Tristan Gingold --- hw/ppc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ppc.c b/hw/ppc.c index e9f1724..c23a02d 100644 --- a/hw/ppc.c +++ b/hw/ppc.c @@ -551,13 +551,13 @@ static void cpu_ppc_tb_start (CPUState *env) } static always_inline uint32_t _cpu_ppc_load_decr (CPUState *env, - uint64_t *next) + uint64_t next) { ppc_tb_t *tb_env = env->tb_env; uint32_t decr; int64_t diff; - diff = tb_env->decr_next - qemu_get_clock(vm_clock); + diff = next - qemu_get_clock(vm_clock); if (diff >= 0) decr = muldiv64(diff, tb_env->decr_freq, ticks_per_sec); else @@ -571,14 +571,14 @@ uint32_t cpu_ppc_load_decr (CPUState *env) { ppc_tb_t *tb_env = env->tb_env; - return _cpu_ppc_load_decr(env, &tb_env->decr_next); + return _cpu_ppc_load_decr(env, tb_env->decr_next); } uint32_t cpu_ppc_load_hdecr (CPUState *env) { ppc_tb_t *tb_env = env->tb_env; - return _cpu_ppc_load_decr(env, &tb_env->hdecr_next); + return _cpu_ppc_load_decr(env, tb_env->hdecr_next); } uint64_t cpu_ppc_load_purr (CPUState *env) -- 1.6.2