commit f55e9d9a40acd3b0e364844017fa14f3aab76645
author Tristan Gingold <gingold@adacore.com> Mon Apr 27 10:55:47 2009 +0200
committer Aurelien Jarno <aurelien@aurel32.net> Sun Jul 12 23:32:11 2009 +0200
tree a57a4faf86ae27a9012b10a2fb0e7f596d371313
parent d27cf0ae6dae753ae4f7c5eac3e375fbc11cb417

target-ppc: fix typo in _cpu_ppc_load_decr

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>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

hw/ppc.c

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 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 @@
 {
     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)