diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2011-08-01 09:20:58 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2011-10-26 17:18:09 +0000 |
commit | 7922703623a989b59ce7f7b57a3c8ebe5c0f6b53 (patch) | |
tree | 75d9b2f34c34b1854e3b9f0516f82253bf7a3960 /target-sparc/int32_helper.c | |
parent | 063c367558dc4e811e0c10a64f49838acb108c38 (diff) | |
download | hqemu-7922703623a989b59ce7f7b57a3c8ebe5c0f6b53.zip hqemu-7922703623a989b59ce7f7b57a3c8ebe5c0f6b53.tar.gz |
Sparc: avoid AREG0 for softint op helpers and Leon cache control
Make softint op helpers and Leon cache irq manager take a parameter
for CPUState instead of relying on global env. Move the functions
to int{32,64}_helper.c.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-sparc/int32_helper.c')
-rw-r--r-- | target-sparc/int32_helper.c | 47 |
1 files changed, 46 insertions, 1 deletions
diff --git a/target-sparc/int32_helper.c b/target-sparc/int32_helper.c index 219a6c6..1c6ba6d 100644 --- a/target-sparc/int32_helper.c +++ b/target-sparc/int32_helper.c @@ -20,6 +20,14 @@ #include "cpu.h" //#define DEBUG_PCALL +//#define DEBUG_CACHE_CONTROL + +#ifdef DEBUG_CACHE_CONTROL +#define DPRINTF_CACHE_CONTROL(fmt, ...) \ + do { printf("CACHE_CONTROL: " fmt , ## __VA_ARGS__); } while (0) +#else +#define DPRINTF_CACHE_CONTROL(fmt, ...) do {} while (0) +#endif #ifdef DEBUG_PCALL static const char * const excp_names[0x80] = { @@ -119,7 +127,44 @@ void do_interrupt(CPUState *env) #if !defined(CONFIG_USER_ONLY) /* IRQ acknowledgment */ if ((intno & ~15) == TT_EXTINT && env->qemu_irq_ack != NULL) { - env->qemu_irq_ack(env->irq_manager, intno); + env->qemu_irq_ack(env, env->irq_manager, intno); } #endif } + +#if !defined(CONFIG_USER_ONLY) +static void leon3_cache_control_int(CPUState *env) +{ + uint32_t state = 0; + + if (env->cache_control & CACHE_CTRL_IF) { + /* Instruction cache state */ + state = env->cache_control & CACHE_STATE_MASK; + if (state == CACHE_ENABLED) { + state = CACHE_FROZEN; + DPRINTF_CACHE_CONTROL("Instruction cache: freeze\n"); + } + + env->cache_control &= ~CACHE_STATE_MASK; + env->cache_control |= state; + } + + if (env->cache_control & CACHE_CTRL_DF) { + /* Data cache state */ + state = (env->cache_control >> 2) & CACHE_STATE_MASK; + if (state == CACHE_ENABLED) { + state = CACHE_FROZEN; + DPRINTF_CACHE_CONTROL("Data cache: freeze\n"); + } + + env->cache_control &= ~(CACHE_STATE_MASK << 2); + env->cache_control |= (state << 2); + } +} + +void leon3_irq_manager(CPUState *env, void *irq_manager, int intno) +{ + leon3_irq_ack(irq_manager, intno); + leon3_cache_control_int(env); +} +#endif |