david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mips_mipssim: Store MIPSCPU in ResetData

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>
This commit is contained in:
Andreas Färber 2012-05-05 14:19:45 +02:00
parent 7ee274c193
commit 2d44fc8e2e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/mips_mipssim.c
View File

@ -46,7 +46,7 @@ static struct _loaderparams {
} loaderparams; } loaderparams;
typedef struct ResetData { typedef struct ResetData {
CPUMIPSState *env; MIPSCPU *cpu;
uint64_t vector; uint64_t vector;
} ResetData; } ResetData;
@ -105,9 +105,9 @@ static int64_t load_kernel(void)
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
{ {
ResetData *s = (ResetData *)opaque; ResetData *s = (ResetData *)opaque;
CPUMIPSState *env = s->env; CPUMIPSState *env = &s->cpu->env;
cpu_state_reset(env); cpu_reset(CPU(s->cpu));
env->active_tc.PC = s->vector & ~(target_ulong)1; env->active_tc.PC = s->vector & ~(target_ulong)1;
if (s->vector & 1) { if (s->vector & 1) {
env->hflags |= MIPS_HFLAG_M16; env->hflags |= MIPS_HFLAG_M16;
@ -161,7 +161,7 @@ mips_mipssim_init (ram_addr_t ram_size,
env = &cpu->env; env = &cpu->env;
reset_info = g_malloc0(sizeof(ResetData)); reset_info = g_malloc0(sizeof(ResetData));
reset_info->env = env; reset_info->cpu = cpu;
reset_info->vector = env->active_tc.PC; reset_info->vector = env->active_tc.PC;
qemu_register_reset(main_cpu_reset, reset_info); qemu_register_reset(main_cpu_reset, reset_info);