[Qemu-devel] [5408] Rearrange tick functions

[Blue Swirl]

Revision: 5408
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5408
Author:   blueswir1
Date:     2008-10-03 19:04:42 +0000 (Fri, 03 Oct 2008)

Log Message:
-----------
Rearrange tick functions

Modified Paths:
--------------
    trunk/hw/sun4u.c
    trunk/target-sparc/cpu.h
    trunk/target-sparc/helper.c
    trunk/target-sparc/op_helper.c

Modified: trunk/hw/sun4u.c
===================================================================
--- trunk/hw/sun4u.c    2008-10-03 19:02:42 UTC (rev 5407)
+++ trunk/hw/sun4u.c    2008-10-03 19:04:42 UTC (rev 5408)
@@ -309,6 +309,21 @@
     cpu_interrupt(env, CPU_INTERRUPT_TIMER);
 }
 
+void cpu_tick_set_count(void *opaque, uint64_t count)
+{
+    ptimer_set_count(opaque, -count);
+}
+
+uint64_t cpu_tick_get_count(void *opaque)
+{
+    return -ptimer_get_count(opaque);
+}
+
+void cpu_tick_set_limit(void *opaque, uint64_t limit)
+{
+    ptimer_set_limit(opaque, -limit, 0);
+}
+
 static const int ide_iobase[2] = { 0x1f0, 0x170 };
 static const int ide_iobase2[2] = { 0x3f6, 0x376 };
 static const int ide_irq[2] = { 14, 15 };

Modified: trunk/target-sparc/cpu.h
===================================================================
--- trunk/target-sparc/cpu.h    2008-10-03 19:02:42 UTC (rev 5407)
+++ trunk/target-sparc/cpu.h    2008-10-03 19:04:42 UTC (rev 5408)
@@ -501,4 +501,11 @@
 /* sum4m.c, sun4u.c */
 void cpu_check_irqs(CPUSPARCState *env);
 
+#ifdef TARGET_SPARC64
+/* sun4u.c */
+void cpu_tick_set_count(void *opaque, uint64_t count);
+uint64_t cpu_tick_get_count(void *opaque);
+void cpu_tick_set_limit(void *opaque, uint64_t limit);
 #endif
+
+#endif

Modified: trunk/target-sparc/helper.c
===================================================================
--- trunk/target-sparc/helper.c 2008-10-03 19:02:42 UTC (rev 5407)
+++ trunk/target-sparc/helper.c 2008-10-03 19:04:42 UTC (rev 5408)
@@ -1412,34 +1412,3 @@
 #endif
     cpu_fprintf(f, "fsr: 0x%08x\n", env->fsr);
 }
-
-#ifdef TARGET_SPARC64
-#if !defined(CONFIG_USER_ONLY)
-#include "qemu-common.h"
-#include "hw/irq.h"
-#include "qemu-timer.h"
-#endif
-
-void helper_tick_set_count(void *opaque, uint64_t count)
-{
-#if !defined(CONFIG_USER_ONLY)
-    ptimer_set_count(opaque, -count);
-#endif
-}
-
-uint64_t helper_tick_get_count(void *opaque)
-{
-#if !defined(CONFIG_USER_ONLY)
-    return -ptimer_get_count(opaque);
-#else
-    return 0;
-#endif
-}
-
-void helper_tick_set_limit(void *opaque, uint64_t limit)
-{
-#if !defined(CONFIG_USER_ONLY)
-    ptimer_set_limit(opaque, -limit, 0);
-#endif
-}
-#endif

Modified: trunk/target-sparc/op_helper.c
===================================================================
--- trunk/target-sparc/op_helper.c      2008-10-03 19:02:42 UTC (rev 5407)
+++ trunk/target-sparc/op_helper.c      2008-10-03 19:04:42 UTC (rev 5408)
@@ -3086,3 +3086,27 @@
 }
 #endif
 
+#ifdef TARGET_SPARC64
+void helper_tick_set_count(void *opaque, uint64_t count)
+{
+#if !defined(CONFIG_USER_ONLY)
+    cpu_tick_set_count(opaque, count);
+#endif
+}
+
+uint64_t helper_tick_get_count(void *opaque)
+{
+#if !defined(CONFIG_USER_ONLY)
+    return cpu_tick_get_count(opaque);
+#else
+    return 0;
+#endif
+}
+
+void helper_tick_set_limit(void *opaque, uint64_t limit)
+{
+#if !defined(CONFIG_USER_ONLY)
+    cpu_tick_set_limit(opaque, limit);
+#endif
+}
+#endif