summaryrefslogtreecommitdiff
path: root/target-unicore32/helper.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-03-29 18:03:18 +0200
committerAndreas Färber <afaerber@suse.de>2012-03-30 11:09:31 +0200
commit8df9082da6b7a24b299d37462bc3539c15f26135 (patch)
treed8ff071c6ceee97cd9b6dbbcfa5623815af27e34 /target-unicore32/helper.c
parentae0f5e9ea80de923ae1c11289cf6ac468f657880 (diff)
downloadqemu-8df9082da6b7a24b299d37462bc3539c15f26135.tar.gz
target-unicore32: Move CPU-dependent init into initfn
Instead of setting values in a CPUID switch, do so in initfn functions. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Diffstat (limited to 'target-unicore32/helper.c')
-rw-r--r--target-unicore32/helper.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index 0f23a407b4..9fe4a375e4 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -14,16 +14,10 @@
#include "helper.h"
#include "host-utils.h"
-static inline void set_feature(CPUUniCore32State *env, int feature)
-{
- env->features |= feature;
-}
-
CPUUniCore32State *uc32_cpu_init(const char *cpu_model)
{
UniCore32CPU *cpu;
CPUUniCore32State *env;
- uint32_t id;
static int inited = 1;
if (object_class_by_name(cpu_model) == NULL) {
@@ -32,23 +26,6 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model)
cpu = UNICORE32_CPU(object_new(cpu_model));
env = &cpu->env;
- id = env->cp0.c0_cpuid;
- switch (id) {
- case UC32_CPUID_UCV2:
- set_feature(env, UC32_HWCAP_CMOV);
- set_feature(env, UC32_HWCAP_UCF64);
- env->ucf64.xregs[UC32_UCF64_FPSCR] = 0;
- env->cp0.c0_cachetype = 0x1dd20d2;
- env->cp0.c1_sys = 0x00090078;
- break;
- case UC32_CPUID_ANY: /* For userspace emulation. */
- set_feature(env, UC32_HWCAP_CMOV);
- set_feature(env, UC32_HWCAP_UCF64);
- break;
- default:
- cpu_abort(env, "Bad CPU ID: %x\n", id);
- }
-
if (inited) {
inited = 0;
uc32_translate_init();