mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lm32_boards: Store LM32CPU in ResetInfo

Browse Source 
Allows us to use cpu_reset() in place of cpu_state_reset() in
main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michael Walle <michael@walle.cc>
This commit is contained in:
Andreas Färber 2012-05-04 19:00:34 +02:00
parent 47dc4fa211
commit b143559655
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/lm32_boards.c
View File

@ -31,7 +31,7 @@
#include "exec-memory.h" #include "exec-memory.h"
typedef struct { typedef struct {
CPULM32State *env; LM32CPU *cpu;
target_phys_addr_t bootstrap_pc; target_phys_addr_t bootstrap_pc;
target_phys_addr_t flash_base; target_phys_addr_t flash_base;
target_phys_addr_t hwsetup_base; target_phys_addr_t hwsetup_base;
@ -54,9 +54,9 @@ static void cpu_irq_handler(void *opaque, int irq, int level)
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
{ {
ResetInfo *reset_info = opaque; ResetInfo *reset_info = opaque;
CPULM32State *env = reset_info->env; CPULM32State *env = &reset_info->cpu->env;
cpu_state_reset(env); cpu_reset(CPU(reset_info->cpu));
/* init defaults */ /* init defaults */
env->pc = (uint32_t)reset_info->bootstrap_pc; env->pc = (uint32_t)reset_info->bootstrap_pc;
@ -104,7 +104,7 @@ static void lm32_evr_init(ram_addr_t ram_size_not_used,
} }
cpu = cpu_lm32_init(cpu_model); cpu = cpu_lm32_init(cpu_model);
env = &cpu->env; env = &cpu->env;
reset_info->env = env; reset_info->cpu = cpu;
reset_info->flash_base = flash_base; reset_info->flash_base = flash_base;
@ -201,7 +201,7 @@ static void lm32_uclinux_init(ram_addr_t ram_size_not_used,
} }
cpu = cpu_lm32_init(cpu_model); cpu = cpu_lm32_init(cpu_model);
env = &cpu->env; env = &cpu->env;
reset_info->env = env; reset_info->cpu = cpu;
reset_info->flash_base = flash_base; reset_info->flash_base = flash_base;