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 /hw | |
| 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 'hw')
| -rw-r--r-- | hw/leon3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/leon3.c b/hw/leon3.c index 69d8f3b655..919f49fc1c 100644 --- a/hw/leon3.c +++ b/hw/leon3.c @@ -56,10 +56,9 @@ static void main_cpu_reset(void *opaque) env->npc = s->entry + 4; } -static void leon3_irq_ack(void *irq_manager, int intno) +void leon3_irq_ack(void *irq_manager, int intno) { grlib_irqmp_ack((DeviceState *)irq_manager, intno); - leon3_cache_control_int(); } static void leon3_set_pil_in(void *opaque, uint32_t pil_in) @@ -130,7 +129,7 @@ static void leon3_generic_hw_init(ram_addr_t ram_size, /* Allocate IRQ manager */ grlib_irqmp_create(0x80000200, env, &cpu_irqs, MAX_PILS, &leon3_set_pil_in); - env->qemu_irq_ack = leon3_irq_ack; + env->qemu_irq_ack = leon3_irq_manager; /* Allocate RAM */ if ((uint64_t)ram_size > (1UL << 30)) { |