Commit 9ee660e7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/yongbok/tags/mips-20170921' into staging 



MIPS patches 2017-09-21

Changes:
QOMify MIPS cpu
Improve macro parenthesization

# gpg: Signature made Thu 21 Sep 2017 13:50:37 BST
# gpg:                using RSA key 0x2238EB86D5F797C2
# gpg: Good signature from "Yongbok Kim <yongbok.kim@imgtec.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 8600 4CF5 3415 A5D9 4CFA  2B5C 2238 EB86 D5F7 97C2

* remotes/yongbok/tags/mips-20170921:
  mips: Improve macro parenthesization
  mips: replace cpu_mips_init() with cpu_generic_init()
  mips: MIPSCPU model subclasses
  mips: call cpu_mips_realize_env() from mips_cpu_realizefn()
  mips: split cpu_mips_realize_env() out of cpu_mips_init()
  mips: introduce internal.h and cleanup cpu.h
  mips: move hw/mips/cputimer.c to target/mips/

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ff5667ed 2a2be359

hw/mips/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
obj-y += mips_r4k.o mips_malta.o mips_mipssim.o

obj-y += addr.o cputimer.o mips_int.o

obj-y += addr.o mips_int.o

obj-$(CONFIG_JAZZ) += mips_jazz.o

obj-$(CONFIG_FULONG) += mips_fulong2e.o

obj-y += gt64xxx_pci.o

hw/mips/cps.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void mips_cps_realize(DeviceState *dev, Error **errp) 
    bool itu_present = false;



    for (i = 0; i < s->num_vp; i++) {

        cpu = cpu_mips_init(s->cpu_model);

        cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, s->cpu_model));



        /* Init internal devices */

        cpu_mips_irq_init_cpu(cpu);

hw/mips/mips_fulong2e.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static void mips_fulong2e_init(MachineState *machine) 
    if (cpu_model == NULL) {

        cpu_model = "Loongson-2E";

    }

    cpu = cpu_mips_init(cpu_model);

    cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));

    env = &cpu->env;



    qemu_register_reset(main_cpu_reset, cpu);

hw/mips/mips_jazz.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static void mips_jazz_init(MachineState *machine, 
    if (cpu_model == NULL) {

        cpu_model = "R4000";

    }

    cpu = cpu_mips_init(cpu_model);

    cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));

    env = &cpu->env;

    qemu_register_reset(main_cpu_reset, cpu);

hw/mips/mips_malta.c

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ static void create_cpu_without_cps(const char *cpu_model, 
    int i;



    for (i = 0; i < smp_cpus; i++) {

        cpu = cpu_mips_init(cpu_model);

        cpu = MIPS_CPU(cpu_generic_init(TYPE_MIPS_CPU, cpu_model));



        /* Init internal devices */

        cpu_mips_irq_init_cpu(cpu);