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/op_helper.c | |
| parent | 2685d2961b51437d0c7bc71f4ed7c320f6cbd010 (diff) | |
| download | qemu-60f356e86d66a4a22530ec7570f7582af602d200.tar.gz | |
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/op_helper.c')
| -rw-r--r-- | target-sparc/op_helper.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index d3e1b63539..854f168c60 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -1653,7 +1653,7 @@ static void dump_asi(const char *txt, target_ulong addr, int asi, int size, /* Leon3 cache control */ -void leon3_cache_control_int(void) +static void leon3_cache_control_int(void) { uint32_t state = 0; @@ -1741,11 +1741,17 @@ static uint64_t leon3_cache_control_ld(target_ulong addr, int size) DPRINTF_CACHE_CONTROL("read unknown register %08x\n", addr); break; }; - DPRINTF_CACHE_CONTROL("st addr:%08x, ret:%" PRIx64 ", size:%d\n", + DPRINTF_CACHE_CONTROL("ld addr:%08x, ret:0x%" PRIx64 ", size:%d\n", addr, ret, size); return ret; } +void leon3_irq_manager(void *irq_manager, int intno) +{ + leon3_irq_ack(irq_manager, intno); + leon3_cache_control_int(); +} + uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign) { uint64_t ret = 0; @@ -1760,7 +1766,9 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign) case 0x00: /* Leon3 Cache Control */ case 0x08: /* Leon3 Instruction Cache config */ case 0x0C: /* Leon3 Date Cache config */ - ret = leon3_cache_control_ld(addr, size); + if (env->def->features & CPU_FEATURE_CACHE_CTRL) { + ret = leon3_cache_control_ld(addr, size); + } break; case 0x01c00a00: /* MXCC control register */ if (size == 8) @@ -1994,7 +2002,9 @@ void helper_st_asi(target_ulong addr, uint64_t val, int asi, int size) case 0x00: /* Leon3 Cache Control */ case 0x08: /* Leon3 Instruction Cache config */ case 0x0C: /* Leon3 Date Cache config */ - leon3_cache_control_st(addr, val, size); + if (env->def->features & CPU_FEATURE_CACHE_CTRL) { + leon3_cache_control_st(addr, val, size); + } break; case 0x01c00000: /* MXCC stream data register 0 */ |