[Qemu-devel] [PATCH] Fix typo in _cpu_ppc_load_decr

[Qemu-devel] [PATCH] Fix typo in _cpu_ppc_load_decr

[Tristan Gingold]

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 <gingold@adacore.com>
---
 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

Re: [Qemu-devel] [PATCH] Fix typo in _cpu_ppc_load_decr

[Aurelien Jarno]

On Mon, Apr 27, 2009 at 10:55:47AM +0200, Tristan Gingold wrote:
> 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).
> 

Thanks, applied.

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net