diff options
| author | Fabien Chouteau <chouteau@adacore.com> | 2011-01-31 11:36:54 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-02-01 17:01:41 +0000 |
| commit | 60f356e86d66a4a22530ec7570f7582af602d200 (patch) | |
| tree | 243b43a088e1cba43673a99edba65061dc162ce8 /target-sparc/cpu.h | |
| parent | 2685d2961b51437d0c7bc71f4ed7c320f6cbd010 (diff) | |
| download | qemu-60f356e86d66a4a22530ec7570f7582af602d200.zip qemu-60f356e86d66a4a22530ec7570f7582af602d200.tar.gz qemu-60f356e86d66a4a22530ec7570f7582af602d200.tar.bz2 | |
SPARC: Fix Leon3 cache control
The "leon3_cache_control_int" (op_helper.c) function is called within leon3.c
which leads to segfault error with the global "env".
Now cache control is a CPU feature and everything is handled in op_helper.c.
Signed-off-by: Fabien Chouteau <chouteau@adacore.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-sparc/cpu.h')
| -rw-r--r-- | target-sparc/cpu.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 6f5990b..320530e 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -268,6 +268,8 @@ typedef struct sparc_def_t { #define CPU_FEATURE_GL (1 << 13) #define CPU_FEATURE_TA0_SHUTDOWN (1 << 14) /* Shutdown on "ta 0x0" */ #define CPU_FEATURE_ASR17 (1 << 15) +#define CPU_FEATURE_CACHE_CTRL (1 << 16) + #ifndef TARGET_SPARC64 #define CPU_DEFAULT_FEATURES (CPU_FEATURE_FLOAT | CPU_FEATURE_SWAP | \ CPU_FEATURE_MUL | CPU_FEATURE_DIV | \ @@ -476,12 +478,14 @@ void cpu_put_cwp64(CPUState *env1, int cwp); int cpu_cwp_inc(CPUState *env1, int cwp); int cpu_cwp_dec(CPUState *env1, int cwp); void cpu_set_cwp(CPUState *env1, int new_cwp); - -void leon3_cache_control_int(void); +void leon3_irq_manager(void *irq_manager, int intno); /* sun4m.c, sun4u.c */ void cpu_check_irqs(CPUSPARCState *env); +/* leon3.c */ +void leon3_irq_ack(void *irq_manager, int intno); + #if defined (TARGET_SPARC64) static inline int compare_masked(uint64_t x, uint64_t y, uint64_t mask) |