mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rearrange tick functions

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5408 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-10-03 19:04:42 +00:00
parent 48585ec51d
commit f4b1a842d7
4 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/sun4u.c
View File

@ -309,6 +309,21 @@ static void hstick_irq(void *opaque)
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 };

7
target-sparc/cpu.h
View File

@ -501,4 +501,11 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp)
/* 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

31
target-sparc/helper.c
View File

@ -1412,34 +1412,3 @@ void cpu_dump_state(CPUState *env, FILE *f,
#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

24
target-sparc/op_helper.c
View File

@ -3086,3 +3086,27 @@ void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
}
#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