diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-04-07 01:19:45 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-04-15 21:26:55 +0200 |
| commit | 9444006fa6ba1d5e4079ee534a7236124b66ea77 (patch) | |
| tree | aacf9e6b03482dfca8aae582549df08deb07c6e6 | |
| parent | 25ebd80f1d0e4b8863968d56ccfe634ea577d365 (diff) | |
target-alpha: QOM'ify CPU init
Move code from cpu_alpha_init() into a CPU initializer.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Richard Henderson <rth@twiddle.net>
| -rw-r--r-- | target-alpha/cpu.c | 20 | ||||
| -rw-r--r-- | target-alpha/translate.c | 12 |
2 files changed, 21 insertions, 11 deletions
diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c index 315b0c1d57..62d2a669a9 100644 --- a/target-alpha/cpu.c +++ b/target-alpha/cpu.c @@ -1,6 +1,7 @@ /* * QEMU Alpha CPU * + * Copyright (c) 2007 Jocelyn Mayer * Copyright (c) 2012 SUSE LINUX Products GmbH * * This library is free software; you can redistribute it and/or @@ -22,10 +23,29 @@ #include "qemu-common.h" +static void alpha_cpu_initfn(Object *obj) +{ + AlphaCPU *cpu = ALPHA_CPU(obj); + CPUAlphaState *env = &cpu->env; + + cpu_exec_init(env); + tlb_flush(env, 1); + +#if defined(CONFIG_USER_ONLY) + env->ps = PS_USER_MODE; + cpu_alpha_store_fpcr(env, (FPCR_INVD | FPCR_DZED | FPCR_OVFD + | FPCR_UNFD | FPCR_INED | FPCR_DNOD + | FPCR_DYN_NORMAL)); +#endif + env->lock_addr = -1; + env->fen = 1; +} + static const TypeInfo alpha_cpu_type_info = { .name = TYPE_ALPHA_CPU, .parent = TYPE_CPU, .instance_size = sizeof(AlphaCPU), + .instance_init = alpha_cpu_initfn, .abstract = false, .class_size = sizeof(AlphaCPUClass), }; diff --git a/target-alpha/translate.c b/target-alpha/translate.c index f773e6cffc..12de6a3fb6 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -3531,9 +3531,8 @@ CPUAlphaState * cpu_alpha_init (const char *cpu_model) cpu = ALPHA_CPU(object_new(TYPE_ALPHA_CPU)); env = &cpu->env; - cpu_exec_init(env); + alpha_translate_init(); - tlb_flush(env, 1); /* Default to ev67; no reason not to emulate insns by default. */ implver = IMPLVER_21264; @@ -3551,15 +3550,6 @@ CPUAlphaState * cpu_alpha_init (const char *cpu_model) env->implver = implver; env->amask = amask; -#if defined (CONFIG_USER_ONLY) - env->ps = PS_USER_MODE; - cpu_alpha_store_fpcr(env, (FPCR_INVD | FPCR_DZED | FPCR_OVFD - | FPCR_UNFD | FPCR_INED | FPCR_DNOD - | FPCR_DYN_NORMAL)); -#endif - env->lock_addr = -1; - env->fen = 1; - qemu_init_vcpu(env); return env; } |