Introduce only one non-abstract type TYPE_ARM_CPU and do not touch cp15 registers to not interfere with Peter's ongoing remodelling. Embed CPUARMState as first (additional) field of ARMCPU. Let CPUClass::reset() call cpu_state_reset() for now. Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
		
			
				
	
	
		
			61 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			61 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * QEMU ARM CPU
 | 
						|
 *
 | 
						|
 * Copyright (c) 2012 SUSE LINUX Products GmbH
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU General Public License
 | 
						|
 * as published by the Free Software Foundation; either version 2
 | 
						|
 * of the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program; if not, see
 | 
						|
 * <http://www.gnu.org/licenses/gpl-2.0.html>
 | 
						|
 */
 | 
						|
 | 
						|
#include "cpu-qom.h"
 | 
						|
#include "qemu-common.h"
 | 
						|
 | 
						|
/* CPUClass::reset() */
 | 
						|
static void arm_cpu_reset(CPUState *s)
 | 
						|
{
 | 
						|
    ARMCPU *cpu = ARM_CPU(s);
 | 
						|
    ARMCPUClass *acc = ARM_CPU_GET_CLASS(cpu);
 | 
						|
 | 
						|
    acc->parent_reset(s);
 | 
						|
 | 
						|
    /* TODO Inline the current contents of cpu_state_reset(),
 | 
						|
            once cpu_reset_model_id() is eliminated. */
 | 
						|
    cpu_state_reset(&cpu->env);
 | 
						|
}
 | 
						|
 | 
						|
static void arm_cpu_class_init(ObjectClass *oc, void *data)
 | 
						|
{
 | 
						|
    ARMCPUClass *acc = ARM_CPU_CLASS(oc);
 | 
						|
    CPUClass *cc = CPU_CLASS(acc);
 | 
						|
 | 
						|
    acc->parent_reset = cc->reset;
 | 
						|
    cc->reset = arm_cpu_reset;
 | 
						|
}
 | 
						|
 | 
						|
static const TypeInfo arm_cpu_type_info = {
 | 
						|
    .name = TYPE_ARM_CPU,
 | 
						|
    .parent = TYPE_CPU,
 | 
						|
    .instance_size = sizeof(ARMCPU),
 | 
						|
    .abstract = false,
 | 
						|
    .class_size = sizeof(ARMCPUClass),
 | 
						|
    .class_init = arm_cpu_class_init,
 | 
						|
};
 | 
						|
 | 
						|
static void arm_cpu_register_types(void)
 | 
						|
{
 | 
						|
    type_register_static(&arm_cpu_type_info);
 | 
						|
}
 | 
						|
 | 
						|
type_init(arm_cpu_register_types)
 |