From patchwork Fri Feb 3 02:59:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [RFC, v3, 09/21] target-arm: No longer abort on unhandled CPUIDs on reset From: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 139273 Message-Id: <1328237992-14953-10-git-send-email-afaerber@suse.de> To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 3 Feb 2012 03:59:40 +0100 Having moved the reset code for some CPUs to class_init, we can drop some of the cases in the switch. Signed-off-by: Andreas Färber Cc: Peter Maydell --- target-arm/cpu.h | 2 -- target-arm/helper.c | 5 ----- 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/target-arm/cpu.h b/target-arm/cpu.h index bf8c911..6731256 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -427,8 +427,6 @@ void cpu_arm_set_cp_io(CPUARMState *env, int cpnum, #define ARM_CPUID_CORTEXA8 0x410fc080 #define ARM_CPUID_CORTEXA9 0x410fc090 #define ARM_CPUID_CORTEXA15 0x412fc0f1 -#define ARM_CPUID_CORTEXM3 0x410fc231 -#define ARM_CPUID_ANY 0xffffffff #if defined(CONFIG_USER_ONLY) #define TARGET_PAGE_BITS 12 diff --git a/target-arm/helper.c b/target-arm/helper.c index 4fd8ba8..67e18cc 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -141,10 +141,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) env->cp15.c0_ccsid[2] = 0x711fe07a; /* 4096K L2 unified cache */ env->cp15.c1_sys = 0x00c50078; break; - case ARM_CPUID_CORTEXM3: - break; - case ARM_CPUID_ANY: /* For userspace emulation. */ - break; case ARM_CPUID_TI915T: case ARM_CPUID_TI925T: env->cp15.c0_cachetype = 0x5109149; @@ -177,7 +173,6 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t id) env->cp15.c1_sys = 0x00000070; break; default: - cpu_abort(env, "Bad CPU ID: %x\n", id); break; } }