Commit 61d25e15 authored by Blue Swirl's avatar Blue Swirl
Browse files

Merge branch 'qom-cpu-rest.v1' of git://github.com/afaerber/qemu-cpu 

* 'qom-cpu-rest.v1' of git://github.com/afaerber/qemu-cpu:
  Makefile: Simplify compilation of target-*/cpu.c
  target-mips: Start QOM'ifying CPU init
  target-mips: QOM'ify CPU
  target-m68k: Add QOM CPU subclasses
  target-m68k: Start QOM'ifying CPU init
  target-m68k: QOM'ify CPU reset
  target-m68k: QOM'ify CPU
  target-sh4: Start QOM'ifying CPU init
  target-sh4: QOM'ify CPU reset
  target-sh4: QOM'ify CPU
  MAINTAINERS: Downgrade target-mips and target-sh4 to Odd Fixes
  MAINTAINERS: Downgrade target-m68k to Odd Fixes
parents 42fe1c24 894a84e6

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ F: target-lm32/ 


M68K

M: Paul Brook <paul@codesourcery.com>

S: Maintained

S: Odd Fixes

F: target-m68k/



MicroBlaze
@@ -88,7 +88,7 @@ F: target-microblaze/ 


MIPS

M: Aurelien Jarno <aurelien@aurel32.net>

S: Maintained

S: Odd Fixes

F: target-mips/



PowerPC
@@ -104,7 +104,7 @@ F: target-s390x/ 


SH4

M: Aurelien Jarno <aurelien@aurel32.net>

S: Maintained

S: Odd Fixes

F: target-sh4/



SPARC

Makefile.target

+1 −10
Original line number Diff line number Diff line
@@ -87,27 +87,18 @@ libobj-y += op_helper.o 
endif

endif

libobj-y += helper.o

ifeq ($(TARGET_BASE_ARCH), i386)

ifneq ($(TARGET_BASE_ARCH), ppc)

libobj-y += cpu.o

endif

libobj-$(TARGET_SPARC64) += vis_helper.o

libobj-$(CONFIG_NEED_MMU) += mmu.o

libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o

libobj-$(TARGET_ARM) += cpu.o

libobj-$(TARGET_CRIS) += cpu.o

libobj-$(TARGET_LM32) += cpu.o

libobj-$(TARGET_MICROBLAZE) += cpu.o

libobj-$(TARGET_S390X) += cpu.o

ifeq ($(TARGET_BASE_ARCH), sparc)

libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o

libobj-y += cpu.o

endif

libobj-$(TARGET_SPARC) += int32_helper.o

libobj-$(TARGET_SPARC64) += int64_helper.o

libobj-$(TARGET_UNICORE32) += cpu.o

libobj-$(TARGET_XTENSA) += cpu.o

libobj-$(TARGET_ALPHA) += int_helper.o fpu_helper.o sys_helper.o mem_helper.o

libobj-$(TARGET_ALPHA) += cpu.o



libobj-y += disas.o

libobj-$(CONFIG_TCI_DIS) += tci-dis.o

target-m68k/cpu-qom.h

0 → 100644
+70 −0
Original line number Diff line number Diff line 
/*

 * QEMU Motorola 68k CPU

 *

 * Copyright (c) 2012 SUSE LINUX Products GmbH

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2.1 of the License, or (at your option) any later version.

 *

 * This library 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

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see

 * <http://www.gnu.org/licenses/lgpl-2.1.html>

 */

#ifndef QEMU_M68K_CPU_QOM_H

#define QEMU_M68K_CPU_QOM_H



#include "qemu/cpu.h"



#define TYPE_M68K_CPU "m68k-cpu"



#define M68K_CPU_CLASS(klass) \

    OBJECT_CLASS_CHECK(M68kCPUClass, (klass), TYPE_M68K_CPU)

#define M68K_CPU(obj) \

    OBJECT_CHECK(M68kCPU, (obj), TYPE_M68K_CPU)

#define M68K_CPU_GET_CLASS(obj) \

    OBJECT_GET_CLASS(M68kCPUClass, (obj), TYPE_M68K_CPU)



/**

 * M68kCPUClass:

 * @parent_reset: The parent class' reset handler.

 *

 * A Motorola 68k CPU model.

 */

typedef struct M68kCPUClass {

    /*< private >*/

    CPUClass parent_class;

    /*< public >*/



    void (*parent_reset)(CPUState *cpu);

} M68kCPUClass;



/**

 * M68kCPU:

 * @env: #CPUM68KState

 *

 * A Motorola 68k CPU.

 */

typedef struct M68kCPU {

    /*< private >*/

    CPUState parent_obj;

    /*< public >*/



    CPUM68KState env;

} M68kCPU;



static inline M68kCPU *m68k_env_get_cpu(CPUM68KState *env)

{

    return M68K_CPU(container_of(env, M68kCPU, env));

}



#define ENV_GET_CPU(e) CPU(m68k_env_get_cpu(e))





#endif

target-m68k/cpu.c

0 → 100644
+170 −0
Original line number Diff line number Diff line 
/*

 * QEMU Motorola 68k CPU

 *

 * Copyright (c) 2012 SUSE LINUX Products GmbH

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2.1 of the License, or (at your option) any later version.

 *

 * This library 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

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see

 * <http://www.gnu.org/licenses/lgpl-2.1.html>

 */



#include "cpu.h"

#include "qemu-common.h"





static void m68k_set_feature(CPUM68KState *env, int feature)

{

    env->features |= (1u << feature);

}



/* CPUClass::reset() */

static void m68k_cpu_reset(CPUState *s)

{

    M68kCPU *cpu = M68K_CPU(s);

    M68kCPUClass *mcc = M68K_CPU_GET_CLASS(cpu);

    CPUM68KState *env = &cpu->env;



    if (qemu_loglevel_mask(CPU_LOG_RESET)) {

        qemu_log("CPU Reset (CPU %d)\n", env->cpu_index);

        log_cpu_state(env, 0);

    }



    mcc->parent_reset(s);



    memset(env, 0, offsetof(CPUM68KState, breakpoints));

#if !defined(CONFIG_USER_ONLY)

    env->sr = 0x2700;

#endif

    m68k_switch_sp(env);

    /* ??? FP regs should be initialized to NaN.  */

    env->cc_op = CC_OP_FLAGS;

    /* TODO: We should set PC from the interrupt vector.  */

    env->pc = 0;

    tlb_flush(env, 1);

}



/* CPU models */



static void m5206_cpu_initfn(Object *obj)

{

    M68kCPU *cpu = M68K_CPU(obj);

    CPUM68KState *env = &cpu->env;



    m68k_set_feature(env, M68K_FEATURE_CF_ISA_A);

}



static void m5208_cpu_initfn(Object *obj)

{

    M68kCPU *cpu = M68K_CPU(obj);

    CPUM68KState *env = &cpu->env;



    m68k_set_feature(env, M68K_FEATURE_CF_ISA_A);

    m68k_set_feature(env, M68K_FEATURE_CF_ISA_APLUSC);

    m68k_set_feature(env, M68K_FEATURE_BRAL);

    m68k_set_feature(env, M68K_FEATURE_CF_EMAC);

    m68k_set_feature(env, M68K_FEATURE_USP);

}



static void cfv4e_cpu_initfn(Object *obj)

{

    M68kCPU *cpu = M68K_CPU(obj);

    CPUM68KState *env = &cpu->env;



    m68k_set_feature(env, M68K_FEATURE_CF_ISA_A);

    m68k_set_feature(env, M68K_FEATURE_CF_ISA_B);

    m68k_set_feature(env, M68K_FEATURE_BRAL);

    m68k_set_feature(env, M68K_FEATURE_CF_FPU);

    m68k_set_feature(env, M68K_FEATURE_CF_EMAC);

    m68k_set_feature(env, M68K_FEATURE_USP);

}



static void any_cpu_initfn(Object *obj)

{

    M68kCPU *cpu = M68K_CPU(obj);

    CPUM68KState *env = &cpu->env;



    m68k_set_feature(env, M68K_FEATURE_CF_ISA_A);

    m68k_set_feature(env, M68K_FEATURE_CF_ISA_B);

    m68k_set_feature(env, M68K_FEATURE_CF_ISA_APLUSC);

    m68k_set_feature(env, M68K_FEATURE_BRAL);

    m68k_set_feature(env, M68K_FEATURE_CF_FPU);

    /* MAC and EMAC are mututally exclusive, so pick EMAC.

       It's mostly backwards compatible.  */

    m68k_set_feature(env, M68K_FEATURE_CF_EMAC);

    m68k_set_feature(env, M68K_FEATURE_CF_EMAC_B);

    m68k_set_feature(env, M68K_FEATURE_USP);

    m68k_set_feature(env, M68K_FEATURE_EXT_FULL);

    m68k_set_feature(env, M68K_FEATURE_WORD_INDEX);

}



typedef struct M68kCPUInfo {

    const char *name;

    void (*instance_init)(Object *obj);

} M68kCPUInfo;



static const M68kCPUInfo m68k_cpus[] = {

    { .name = "m5206", .instance_init = m5206_cpu_initfn },

    { .name = "m5208", .instance_init = m5208_cpu_initfn },

    { .name = "cfv4e", .instance_init = cfv4e_cpu_initfn },

    { .name = "any",   .instance_init = any_cpu_initfn },

};



static void m68k_cpu_initfn(Object *obj)

{

    M68kCPU *cpu = M68K_CPU(obj);

    CPUM68KState *env = &cpu->env;



    cpu_exec_init(env);

}



static void m68k_cpu_class_init(ObjectClass *c, void *data)

{

    M68kCPUClass *mcc = M68K_CPU_CLASS(c);

    CPUClass *cc = CPU_CLASS(c);



    mcc->parent_reset = cc->reset;

    cc->reset = m68k_cpu_reset;

}



static void register_cpu_type(const M68kCPUInfo *info)

{

    TypeInfo type_info = {

        .name = info->name,

        .parent = TYPE_M68K_CPU,

        .instance_init = info->instance_init,

    };



    type_register_static(&type_info);

}



static const TypeInfo m68k_cpu_type_info = {

    .name = TYPE_M68K_CPU,

    .parent = TYPE_CPU,

    .instance_size = sizeof(M68kCPU),

    .instance_init = m68k_cpu_initfn,

    .abstract = true,

    .class_size = sizeof(M68kCPUClass),

    .class_init = m68k_cpu_class_init,

};



static void m68k_cpu_register_types(void)

{

    int i;



    type_register_static(&m68k_cpu_type_info);

    for (i = 0; i < ARRAY_SIZE(m68k_cpus); i++) {

        register_cpu_type(&m68k_cpus[i]);

    }

}



type_init(m68k_cpu_register_types)

target-m68k/cpu.h

+2 −1
Original line number Diff line number Diff line
@@ -116,10 +116,11 @@ typedef struct CPUM68KState { 
    uint32_t features;

} CPUM68KState;



#include "cpu-qom.h"



void m68k_tcg_init(void);

CPUM68KState *cpu_m68k_init(const char *cpu_model);

int cpu_m68k_exec(CPUM68KState *s);

void cpu_m68k_close(CPUM68KState *s);

void do_interrupt(CPUM68KState *env1);

void do_interrupt_m68k_hardirq(CPUM68KState *env1);

/* you can call this signal handler from your SIGBUS and SIGSEGV