Re: [Qemu-devel] [PATCH v2 12/14] target-arm: Drop cpu_reset_model_id()

2012-04-20 Thread Andreas Färber 
Am 14.04.2012 18:42, schrieb Peter Maydell:
 cpu_reset_model_id() is now empty and we can remove it.
 
 Signed-off-by: Peter Maydell peter.mayd...@linaro.org

Acked-by: Andreas Färber afaer...@suse.de

However, ...

 diff --git a/target-arm/helper.c b/target-arm/helper.c
 index 5cbc7e0..653885a 100644
 --- a/target-arm/helper.c
 +++ b/target-arm/helper.c
 @@ -7,66 +7,12 @@
  #endif
  #include sysemu.h
  
 -static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
 -{
 -switch (id) {
 -case ARM_CPUID_ARM926:
 -break;
 -case ARM_CPUID_ARM946:
 -break;
 -case ARM_CPUID_ARM1026:
 -break;
 -case ARM_CPUID_ARM1136:
 -/* This is the 1136 r1, which is a v6K core */
 -case ARM_CPUID_ARM1136_R2:
 -break;
 -case ARM_CPUID_ARM1176:
 -break;
 -case ARM_CPUID_ARM11MPCORE:
 -break;
 -case ARM_CPUID_CORTEXA8:
 -break;
 -case ARM_CPUID_CORTEXA9:
 -break;
 -case ARM_CPUID_CORTEXA15:
 -break;
 -case ARM_CPUID_CORTEXM3:
 -break;
 -case ARM_CPUID_ANY: /* For userspace emulation.  */
 -break;
 -case ARM_CPUID_TI915T:
 -case ARM_CPUID_TI925T:
 -break;
 -case ARM_CPUID_PXA250:
 -case ARM_CPUID_PXA255:
 -case ARM_CPUID_PXA260:
 -case ARM_CPUID_PXA261:
 -case ARM_CPUID_PXA262:
 -break;
 -case ARM_CPUID_PXA270_A0:
 -case ARM_CPUID_PXA270_A1:
 -case ARM_CPUID_PXA270_B0:
 -case ARM_CPUID_PXA270_B1:
 -case ARM_CPUID_PXA270_C0:
 -case ARM_CPUID_PXA270_C5:
 -break;
 -case ARM_CPUID_SA1100:
 -case ARM_CPUID_SA1110:
 -break;
 -default:
 -cpu_abort(env, Bad CPU ID: %x\n, id);
 -break;
 -}
 -
 -}
 -
  /* TODO Move contents into arm_cpu_reset() in cpu.c,
   *  once cpu_reset_model_id() is eliminated,

...if you were to drop this comment line it would be cleaner. There is
no cpu_reset_model_id() any more.

Also, can't some CPUID defines already be dropped in this patch, now
that the switch is gone?

Andreas

   *  and then forward to cpu_reset() here.
   */
  void cpu_state_reset(CPUARMState *env)
  {
 -uint32_t id;
  uint32_t tmp = 0;
  ARMCPU *cpu = arm_env_get_cpu(env);
  
[snip]

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH v2 12/14] target-arm: Drop cpu_reset_model_id()

2012-04-20 Thread Peter Maydell 
On 20 April 2012 17:14, Andreas Färber afaer...@suse.de wrote:
 Am 14.04.2012 18:42, schrieb Peter Maydell:
  /* TODO Move contents into arm_cpu_reset() in cpu.c,
   *      once cpu_reset_model_id() is eliminated,

 ...if you were to drop this comment line it would be cleaner. There is
 no cpu_reset_model_id() any more.

...the whole comment disappears in the next patch.

 Also, can't some CPUID defines already be dropped in this patch, now
 that the switch is gone?

It would be possible, but I didn't really like the approach of
dropping some but not all of them.

-- PMM

[Qemu-devel] [PATCH v2 12/14] target-arm: Drop cpu_reset_model_id()

2012-04-14 Thread Peter Maydell 
cpu_reset_model_id() is now empty and we can remove it.

Signed-off-by: Peter Maydell peter.mayd...@linaro.org
---
 target-arm/helper.c |   59 +--
 1 files changed, 1 insertions(+), 58 deletions(-)

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 5cbc7e0..653885a 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -7,66 +7,12 @@
 #endif
 #include sysemu.h
 
-static void cpu_reset_model_id(CPUARMState *env, uint32_t id)
-{
-switch (id) {
-case ARM_CPUID_ARM926:
-break;
-case ARM_CPUID_ARM946:
-break;
-case ARM_CPUID_ARM1026:
-break;
-case ARM_CPUID_ARM1136:
-/* This is the 1136 r1, which is a v6K core */
-case ARM_CPUID_ARM1136_R2:
-break;
-case ARM_CPUID_ARM1176:
-break;
-case ARM_CPUID_ARM11MPCORE:
-break;
-case ARM_CPUID_CORTEXA8:
-break;
-case ARM_CPUID_CORTEXA9:
-break;
-case ARM_CPUID_CORTEXA15:
-break;
-case ARM_CPUID_CORTEXM3:
-break;
-case ARM_CPUID_ANY: /* For userspace emulation.  */
-break;
-case ARM_CPUID_TI915T:
-case ARM_CPUID_TI925T:
-break;
-case ARM_CPUID_PXA250:
-case ARM_CPUID_PXA255:
-case ARM_CPUID_PXA260:
-case ARM_CPUID_PXA261:
-case ARM_CPUID_PXA262:
-break;
-case ARM_CPUID_PXA270_A0:
-case ARM_CPUID_PXA270_A1:
-case ARM_CPUID_PXA270_B0:
-case ARM_CPUID_PXA270_B1:
-case ARM_CPUID_PXA270_C0:
-case ARM_CPUID_PXA270_C5:
-break;
-case ARM_CPUID_SA1100:
-case ARM_CPUID_SA1110:
-break;
-default:
-cpu_abort(env, Bad CPU ID: %x\n, id);
-break;
-}
-
-}
-
 /* TODO Move contents into arm_cpu_reset() in cpu.c,
  *  once cpu_reset_model_id() is eliminated,
  *  and then forward to cpu_reset() here.
  */
 void cpu_state_reset(CPUARMState *env)
 {
-uint32_t id;
 uint32_t tmp = 0;
 ARMCPU *cpu = arm_env_get_cpu(env);
 
@@ -75,11 +21,8 @@ void cpu_state_reset(CPUARMState *env)
 log_cpu_state(env, 0);
 }
 
-id = cpu-midr;
 tmp = env-cp15.c15_config_base_address;
 memset(env, 0, offsetof(CPUARMState, breakpoints));
-if (id)
-cpu_reset_model_id(env, id);
 env-cp15.c15_config_base_address = tmp;
 env-cp15.c0_cpuid = cpu-midr;
 env-vfp.xregs[ARM_VFP_FPSID] = cpu-reset_fpsid;
@@ -144,7 +87,7 @@ void cpu_state_reset(CPUARMState *env)
 /* v7 performance monitor control register: same implementor
  * field as main ID register, and we implement no event counters.
  */
-env-cp15.c9_pmcr = (id  0xff00);
+env-cp15.c9_pmcr = (cpu-midr  0xff00);
 #endif
 set_flush_to_zero(1, env-vfp.standard_fp_status);
 set_flush_inputs_to_zero(1, env-vfp.standard_fp_status);
-- 
1.7.1