OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Implement tick interrupt disable bits 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6122 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-12-23 08:47:26 +00:00
parent 69dd5c9ffd
commit 8fa211e881
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/sun4u.c
View File

@ -57,6 +57,9 @@
#define MAX_PILS 16
#define TICK_INT_DIS 0x8000000000000000ULL
#define TICK_MAX 0x7fffffffffffffffULL
struct hwdef {
const char * const default_cpu_model;
uint16_t machine_id;
@ -269,11 +272,14 @@ static void main_cpu_reset(void *opaque)
CPUState *env = s->env;
cpu_reset(env);
ptimer_set_limit(env->tick, 0x7fffffffffffffffULL, 1);
env->tick_cmpr = TICK_INT_DIS | 0;
ptimer_set_limit(env->tick, TICK_MAX, 1);
ptimer_run(env->tick, 0);
ptimer_set_limit(env->stick, 0x7fffffffffffffffULL, 1);
env->stick_cmpr = TICK_INT_DIS | 0;
ptimer_set_limit(env->stick, TICK_MAX, 1);
ptimer_run(env->stick, 0);
ptimer_set_limit(env->hstick, 0x7fffffffffffffffULL, 1);
env->hstick_cmpr = TICK_INT_DIS | 0;
ptimer_set_limit(env->hstick, TICK_MAX, 1);
ptimer_run(env->hstick, 0);
env->gregs[1] = 0; // Memory start
env->gregs[2] = ram_size; // Memory size
@ -286,24 +292,29 @@ static void tick_irq(void *opaque)
{
CPUState *env = opaque;
env->softint |= SOFTINT_TIMER;
cpu_interrupt(env, CPU_INTERRUPT_TIMER);
if (!(env->tick_cmpr & TICK_INT_DIS)) {
env->softint |= SOFTINT_TIMER;
cpu_interrupt(env, CPU_INTERRUPT_TIMER);
}
}
static void stick_irq(void *opaque)
{
CPUState *env = opaque;
env->softint |= SOFTINT_TIMER;
cpu_interrupt(env, CPU_INTERRUPT_TIMER);
if (!(env->stick_cmpr & TICK_INT_DIS)) {
env->softint |= SOFTINT_STIMER;
cpu_interrupt(env, CPU_INTERRUPT_TIMER);
}
}
static void hstick_irq(void *opaque)
{
CPUState *env = opaque;
env->softint |= SOFTINT_TIMER;
cpu_interrupt(env, CPU_INTERRUPT_TIMER);
if (!(env->hstick_cmpr & TICK_INT_DIS)) {
cpu_interrupt(env, CPU_INTERRUPT_TIMER);
}
}
void cpu_tick_set_count(void *opaque, uint64_t count)

3
target-sparc/cpu.h
View File

@ -330,7 +330,8 @@ typedef struct CPUSPARCState {
uint64_t hpstate, htstate[MAXTL_MAX], hintp, htba, hver, hstick_cmpr, ssr;
void *hstick; // UA 2005
uint32_t softint;
#define SOFTINT_TIMER 1
#define SOFTINT_TIMER 1
#define SOFTINT_STIMER (1 << 16)
#endif
sparc_def_t *def;
} CPUSPARCState;