From 6d2afc8a5edc042e4e7c2ceb49f7cabe02aae793 Mon Sep 17 00:00:00 2001 From: Bastian Koppelmann Date: Wed, 6 May 2015 20:18:41 +0200 Subject: [PATCH] target-tricore: introduce ISA v1.6.1 feature The aurix platform contains of several different cpu models and uses the 1.6.1 ISA. This patch changes the generic aurix model to the more specific tc27x cpu model and sets specific features. Signed-off-by: Bastian Koppelmann Reviewed-by: Richard Henderson --- target-tricore/cpu.c | 10 +++++++--- target-tricore/cpu.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/target-tricore/cpu.c b/target-tricore/cpu.c index 9fe0b9783f..b3e5512bbf 100644 --- a/target-tricore/cpu.c +++ b/target-tricore/cpu.c @@ -68,6 +68,10 @@ static void tricore_cpu_realizefn(DeviceState *dev, Error **errp) CPUTriCoreState *env = &cpu->env; /* Some features automatically imply others */ + if (tricore_feature(env, TRICORE_FEATURE_161)) { + set_feature(env, TRICORE_FEATURE_16); + } + if (tricore_feature(env, TRICORE_FEATURE_16)) { set_feature(env, TRICORE_FEATURE_131); } @@ -128,11 +132,11 @@ static void tc1797_initfn(Object *obj) set_feature(&cpu->env, TRICORE_FEATURE_131); } -static void aurix_initfn(Object *obj) +static void tc27x_initfn(Object *obj) { TriCoreCPU *cpu = TRICORE_CPU(obj); - set_feature(&cpu->env, TRICORE_FEATURE_16); + set_feature(&cpu->env, TRICORE_FEATURE_161); } typedef struct TriCoreCPUInfo { @@ -144,7 +148,7 @@ typedef struct TriCoreCPUInfo { static const TriCoreCPUInfo tricore_cpus[] = { { .name = "tc1796", .initfn = tc1796_initfn }, { .name = "tc1797", .initfn = tc1797_initfn }, - { .name = "aurix", .initfn = aurix_initfn }, + { .name = "tc27x", .initfn = tc27x_initfn }, { .name = NULL } }; diff --git a/target-tricore/cpu.h b/target-tricore/cpu.h index c14b5f9016..504f15623d 100644 --- a/target-tricore/cpu.h +++ b/target-tricore/cpu.h @@ -254,6 +254,7 @@ enum tricore_features { TRICORE_FEATURE_13, TRICORE_FEATURE_131, TRICORE_FEATURE_16, + TRICORE_FEATURE_161, }; static inline int tricore_feature(CPUTriCoreState *env, int feature)