2012-04-11 23:12:05 +02:00
|
|
|
/*
|
|
|
|
* QEMU CRIS CPU
|
|
|
|
*
|
2012-04-11 23:35:40 +02:00
|
|
|
* Copyright (c) 2008 AXIS Communications AB
|
|
|
|
* Written by Edgar E. Iglesias.
|
|
|
|
*
|
2012-04-11 23:12:05 +02:00
|
|
|
* 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>
|
|
|
|
*/
|
|
|
|
|
2016-01-26 19:17:24 +01:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 09:01:28 +01:00
|
|
|
#include "qapi/error.h"
|
2019-04-17 21:17:57 +02:00
|
|
|
#include "qemu/qemu-print.h"
|
2012-04-11 23:12:05 +02:00
|
|
|
#include "cpu.h"
|
2012-04-11 23:35:40 +02:00
|
|
|
#include "mmu.h"
|
2012-04-11 23:12:05 +02:00
|
|
|
|
|
|
|
|
2013-06-21 19:09:18 +02:00
|
|
|
static void cris_cpu_set_pc(CPUState *cs, vaddr value)
|
|
|
|
{
|
|
|
|
CRISCPU *cpu = CRIS_CPU(cs);
|
|
|
|
|
|
|
|
cpu->env.pc = value;
|
|
|
|
}
|
|
|
|
|
2013-08-25 18:53:55 +02:00
|
|
|
static bool cris_cpu_has_work(CPUState *cs)
|
|
|
|
{
|
|
|
|
return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
|
|
|
|
}
|
|
|
|
|
cpu: Use DeviceClass reset instead of a special CPUClass reset
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPU used not to inherit from TYPE_DEVICE. We don't need it any
more, as we can simply use the TYPE_DEVICE reset. The 'cpu_reset()'
function is kept as the API which most places use to reset a CPU; it
is now a wrapper which calls device_cold_reset() and then the
tracepoint function.
This change should not cause CPU objects to be reset more often
than they are at the moment, because:
* nobody is directly calling device_cold_reset() or
qdev_reset_all() on CPU objects
* no CPU object is on a qbus, so they will not be reset either
by somebody calling qbus_reset_all()/bus_cold_reset(), or
by the main "reset sysbus and everything in the qbus tree"
reset that most devices are reset by
Note that this does not change the need for each machine or whatever
to use qemu_register_reset() to arrange to call cpu_reset() -- that
is necessary because CPU objects are not on any qbus, so they don't
get reset when the qbus tree rooted at the sysbus bus is reset, and
this isn't being changed here.
All the changes to the files under target/ were made using the
included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful
"CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c
(2) this bit of the s390 change was done by hand, because the
Coccinelle script is not sophisticated enough to handle the
parent_reset call being inside another function:
| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
| S390CPU *cpu = S390_CPU(s);
| S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
| CPUS390XState *env = &cpu->env;
|+ DeviceState *dev = DEVICE(s);
|
|- scc->parent_reset(s);
|+ scc->parent_reset(dev);
| cpu->env.sigp_order = 0;
| s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200303100511.5498-1-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2020-03-03 11:05:11 +01:00
|
|
|
static void cris_cpu_reset(DeviceState *dev)
|
2012-04-11 23:12:05 +02:00
|
|
|
{
|
cpu: Use DeviceClass reset instead of a special CPUClass reset
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPU used not to inherit from TYPE_DEVICE. We don't need it any
more, as we can simply use the TYPE_DEVICE reset. The 'cpu_reset()'
function is kept as the API which most places use to reset a CPU; it
is now a wrapper which calls device_cold_reset() and then the
tracepoint function.
This change should not cause CPU objects to be reset more often
than they are at the moment, because:
* nobody is directly calling device_cold_reset() or
qdev_reset_all() on CPU objects
* no CPU object is on a qbus, so they will not be reset either
by somebody calling qbus_reset_all()/bus_cold_reset(), or
by the main "reset sysbus and everything in the qbus tree"
reset that most devices are reset by
Note that this does not change the need for each machine or whatever
to use qemu_register_reset() to arrange to call cpu_reset() -- that
is necessary because CPU objects are not on any qbus, so they don't
get reset when the qbus tree rooted at the sysbus bus is reset, and
this isn't being changed here.
All the changes to the files under target/ were made using the
included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful
"CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c
(2) this bit of the s390 change was done by hand, because the
Coccinelle script is not sophisticated enough to handle the
parent_reset call being inside another function:
| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
| S390CPU *cpu = S390_CPU(s);
| S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
| CPUS390XState *env = &cpu->env;
|+ DeviceState *dev = DEVICE(s);
|
|- scc->parent_reset(s);
|+ scc->parent_reset(dev);
| cpu->env.sigp_order = 0;
| s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200303100511.5498-1-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2020-03-03 11:05:11 +01:00
|
|
|
CPUState *s = CPU(dev);
|
2012-04-11 23:12:05 +02:00
|
|
|
CRISCPU *cpu = CRIS_CPU(s);
|
|
|
|
CRISCPUClass *ccc = CRIS_CPU_GET_CLASS(cpu);
|
|
|
|
CPUCRISState *env = &cpu->env;
|
2012-04-11 23:35:40 +02:00
|
|
|
uint32_t vr;
|
|
|
|
|
cpu: Use DeviceClass reset instead of a special CPUClass reset
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPU used not to inherit from TYPE_DEVICE. We don't need it any
more, as we can simply use the TYPE_DEVICE reset. The 'cpu_reset()'
function is kept as the API which most places use to reset a CPU; it
is now a wrapper which calls device_cold_reset() and then the
tracepoint function.
This change should not cause CPU objects to be reset more often
than they are at the moment, because:
* nobody is directly calling device_cold_reset() or
qdev_reset_all() on CPU objects
* no CPU object is on a qbus, so they will not be reset either
by somebody calling qbus_reset_all()/bus_cold_reset(), or
by the main "reset sysbus and everything in the qbus tree"
reset that most devices are reset by
Note that this does not change the need for each machine or whatever
to use qemu_register_reset() to arrange to call cpu_reset() -- that
is necessary because CPU objects are not on any qbus, so they don't
get reset when the qbus tree rooted at the sysbus bus is reset, and
this isn't being changed here.
All the changes to the files under target/ were made using the
included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful
"CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c
(2) this bit of the s390 change was done by hand, because the
Coccinelle script is not sophisticated enough to handle the
parent_reset call being inside another function:
| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
| S390CPU *cpu = S390_CPU(s);
| S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
| CPUS390XState *env = &cpu->env;
|+ DeviceState *dev = DEVICE(s);
|
|- scc->parent_reset(s);
|+ scc->parent_reset(dev);
| cpu->env.sigp_order = 0;
| s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200303100511.5498-1-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2020-03-03 11:05:11 +01:00
|
|
|
ccc->parent_reset(dev);
|
2012-04-11 23:12:05 +02:00
|
|
|
|
2012-04-11 23:35:40 +02:00
|
|
|
vr = env->pregs[PR_VR];
|
2016-11-14 15:19:17 +01:00
|
|
|
memset(env, 0, offsetof(CPUCRISState, end_reset_fields));
|
2012-04-11 23:35:40 +02:00
|
|
|
env->pregs[PR_VR] = vr;
|
|
|
|
|
|
|
|
#if defined(CONFIG_USER_ONLY)
|
|
|
|
/* start in user mode with interrupts enabled. */
|
|
|
|
env->pregs[PR_CCS] |= U_FLAG | I_FLAG | P_FLAG;
|
|
|
|
#else
|
|
|
|
cris_mmu_init(env);
|
|
|
|
env->pregs[PR_CCS] = 0;
|
|
|
|
#endif
|
2012-04-11 23:12:05 +02:00
|
|
|
}
|
|
|
|
|
2013-02-06 17:18:12 +01:00
|
|
|
static ObjectClass *cris_cpu_class_by_name(const char *cpu_model)
|
|
|
|
{
|
|
|
|
ObjectClass *oc;
|
|
|
|
char *typename;
|
|
|
|
|
2014-01-18 04:42:23 +01:00
|
|
|
#if defined(CONFIG_USER_ONLY)
|
|
|
|
if (strcasecmp(cpu_model, "any") == 0) {
|
2017-10-05 15:50:40 +02:00
|
|
|
return object_class_by_name(CRIS_CPU_TYPE_NAME("crisv32"));
|
2014-01-18 04:42:23 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2017-10-05 15:50:40 +02:00
|
|
|
typename = g_strdup_printf(CRIS_CPU_TYPE_NAME("%s"), cpu_model);
|
2013-02-06 17:18:12 +01:00
|
|
|
oc = object_class_by_name(typename);
|
|
|
|
g_free(typename);
|
|
|
|
if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_CRIS_CPU) ||
|
|
|
|
object_class_is_abstract(oc))) {
|
|
|
|
oc = NULL;
|
|
|
|
}
|
|
|
|
return oc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sort alphabetically by VR. */
|
|
|
|
static gint cris_cpu_list_compare(gconstpointer a, gconstpointer b)
|
|
|
|
{
|
|
|
|
CRISCPUClass *ccc_a = CRIS_CPU_CLASS(a);
|
|
|
|
CRISCPUClass *ccc_b = CRIS_CPU_CLASS(b);
|
|
|
|
|
|
|
|
/* */
|
|
|
|
if (ccc_a->vr > ccc_b->vr) {
|
|
|
|
return 1;
|
|
|
|
} else if (ccc_a->vr < ccc_b->vr) {
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cris_cpu_list_entry(gpointer data, gpointer user_data)
|
|
|
|
{
|
|
|
|
ObjectClass *oc = data;
|
|
|
|
const char *typename = object_class_get_name(oc);
|
|
|
|
char *name;
|
|
|
|
|
2017-10-05 15:50:40 +02:00
|
|
|
name = g_strndup(typename, strlen(typename) - strlen(CRIS_CPU_TYPE_SUFFIX));
|
2019-04-17 21:17:57 +02:00
|
|
|
qemu_printf(" %s\n", name);
|
2013-02-06 17:18:12 +01:00
|
|
|
g_free(name);
|
|
|
|
}
|
|
|
|
|
2019-04-17 21:17:57 +02:00
|
|
|
void cris_cpu_list(void)
|
2013-02-06 17:18:12 +01:00
|
|
|
{
|
|
|
|
GSList *list;
|
|
|
|
|
|
|
|
list = object_class_get_list(TYPE_CRIS_CPU, false);
|
|
|
|
list = g_slist_sort(list, cris_cpu_list_compare);
|
2019-04-17 21:17:57 +02:00
|
|
|
qemu_printf("Available CPUs:\n");
|
|
|
|
g_slist_foreach(list, cris_cpu_list_entry, NULL);
|
2013-02-06 17:18:12 +01:00
|
|
|
g_slist_free(list);
|
|
|
|
}
|
|
|
|
|
2013-01-05 15:41:21 +01:00
|
|
|
static void cris_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
|
{
|
2013-07-27 02:53:25 +02:00
|
|
|
CPUState *cs = CPU(dev);
|
2013-01-05 15:41:21 +01:00
|
|
|
CRISCPUClass *ccc = CRIS_CPU_GET_CLASS(dev);
|
2016-10-20 13:26:03 +02:00
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
cpu_exec_realizefn(cs, &local_err);
|
|
|
|
if (local_err != NULL) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
2013-01-05 15:41:21 +01:00
|
|
|
|
2013-07-27 02:53:25 +02:00
|
|
|
cpu_reset(cs);
|
|
|
|
qemu_init_vcpu(cs);
|
2013-01-05 15:41:21 +01:00
|
|
|
|
|
|
|
ccc->parent_realize(dev, errp);
|
|
|
|
}
|
|
|
|
|
2014-01-21 13:44:23 +01:00
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
|
|
static void cris_cpu_set_irq(void *opaque, int irq, int level)
|
|
|
|
{
|
|
|
|
CRISCPU *cpu = opaque;
|
|
|
|
CPUState *cs = CPU(cpu);
|
|
|
|
int type = irq == CRIS_CPU_IRQ ? CPU_INTERRUPT_HARD : CPU_INTERRUPT_NMI;
|
|
|
|
|
2019-10-17 19:16:53 +02:00
|
|
|
if (irq == CRIS_CPU_IRQ) {
|
|
|
|
/*
|
|
|
|
* The PIC passes us the vector for the IRQ as the value it sends
|
|
|
|
* over the qemu_irq line
|
|
|
|
*/
|
|
|
|
cpu->env.interrupt_vector = level;
|
|
|
|
}
|
|
|
|
|
2014-01-21 13:44:23 +01:00
|
|
|
if (level) {
|
|
|
|
cpu_interrupt(cs, type);
|
|
|
|
} else {
|
|
|
|
cpu_reset_interrupt(cs, type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-06-24 05:57:38 +02:00
|
|
|
static void cris_disas_set_info(CPUState *cpu, disassemble_info *info)
|
|
|
|
{
|
|
|
|
CRISCPU *cc = CRIS_CPU(cpu);
|
|
|
|
CPUCRISState *env = &cc->env;
|
|
|
|
|
|
|
|
if (env->pregs[PR_VR] != 32) {
|
|
|
|
info->mach = bfd_mach_cris_v0_v10;
|
|
|
|
info->print_insn = print_insn_crisv10;
|
|
|
|
} else {
|
|
|
|
info->mach = bfd_mach_cris_v32;
|
|
|
|
info->print_insn = print_insn_crisv32;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-11 23:41:06 +02:00
|
|
|
static void cris_cpu_initfn(Object *obj)
|
|
|
|
{
|
|
|
|
CRISCPU *cpu = CRIS_CPU(obj);
|
2013-02-06 17:18:12 +01:00
|
|
|
CRISCPUClass *ccc = CRIS_CPU_GET_CLASS(obj);
|
2012-04-11 23:41:06 +02:00
|
|
|
CPUCRISState *env = &cpu->env;
|
|
|
|
|
2019-03-28 22:26:22 +01:00
|
|
|
cpu_set_cpustate_pointers(cpu);
|
2013-01-19 23:55:42 +01:00
|
|
|
|
2013-02-06 17:18:12 +01:00
|
|
|
env->pregs[PR_VR] = ccc->vr;
|
|
|
|
|
2014-01-21 13:44:23 +01:00
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
|
|
/* IRQ and NMI lines. */
|
|
|
|
qdev_init_gpio_in(DEVICE(cpu), cris_cpu_set_irq, 2);
|
|
|
|
#endif
|
2012-04-11 23:41:06 +02:00
|
|
|
}
|
|
|
|
|
2013-02-06 17:18:12 +01:00
|
|
|
static void crisv8_cpu_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
2013-02-18 19:59:39 +01:00
|
|
|
CPUClass *cc = CPU_CLASS(oc);
|
2013-02-06 17:18:12 +01:00
|
|
|
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
|
|
|
|
|
|
|
|
ccc->vr = 8;
|
2013-02-18 19:59:39 +01:00
|
|
|
cc->do_interrupt = crisv10_cpu_do_interrupt;
|
2013-07-07 14:39:41 +02:00
|
|
|
cc->gdb_read_register = crisv10_cpu_gdb_read_register;
|
2017-10-16 04:02:42 +02:00
|
|
|
cc->tcg_initialize = cris_initialize_crisv10_tcg;
|
2013-02-06 17:18:12 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void crisv9_cpu_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
2013-02-18 19:59:39 +01:00
|
|
|
CPUClass *cc = CPU_CLASS(oc);
|
2013-02-06 17:18:12 +01:00
|
|
|
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
|
|
|
|
|
|
|
|
ccc->vr = 9;
|
2013-02-18 19:59:39 +01:00
|
|
|
cc->do_interrupt = crisv10_cpu_do_interrupt;
|
2013-07-07 14:39:41 +02:00
|
|
|
cc->gdb_read_register = crisv10_cpu_gdb_read_register;
|
2017-10-16 04:02:42 +02:00
|
|
|
cc->tcg_initialize = cris_initialize_crisv10_tcg;
|
2013-02-06 17:18:12 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void crisv10_cpu_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
2013-02-18 19:59:39 +01:00
|
|
|
CPUClass *cc = CPU_CLASS(oc);
|
2013-02-06 17:18:12 +01:00
|
|
|
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
|
|
|
|
|
|
|
|
ccc->vr = 10;
|
2013-02-18 19:59:39 +01:00
|
|
|
cc->do_interrupt = crisv10_cpu_do_interrupt;
|
2013-07-07 14:39:41 +02:00
|
|
|
cc->gdb_read_register = crisv10_cpu_gdb_read_register;
|
2017-10-16 04:02:42 +02:00
|
|
|
cc->tcg_initialize = cris_initialize_crisv10_tcg;
|
2013-02-06 17:18:12 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void crisv11_cpu_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
2013-02-18 19:59:39 +01:00
|
|
|
CPUClass *cc = CPU_CLASS(oc);
|
2013-02-06 17:18:12 +01:00
|
|
|
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
|
|
|
|
|
|
|
|
ccc->vr = 11;
|
2013-02-18 19:59:39 +01:00
|
|
|
cc->do_interrupt = crisv10_cpu_do_interrupt;
|
2013-07-07 14:39:41 +02:00
|
|
|
cc->gdb_read_register = crisv10_cpu_gdb_read_register;
|
2017-10-16 04:02:42 +02:00
|
|
|
cc->tcg_initialize = cris_initialize_crisv10_tcg;
|
2013-02-06 17:18:12 +01:00
|
|
|
}
|
|
|
|
|
2016-08-15 13:59:32 +02:00
|
|
|
static void crisv17_cpu_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
CPUClass *cc = CPU_CLASS(oc);
|
|
|
|
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
|
|
|
|
|
|
|
|
ccc->vr = 17;
|
|
|
|
cc->do_interrupt = crisv10_cpu_do_interrupt;
|
|
|
|
cc->gdb_read_register = crisv10_cpu_gdb_read_register;
|
2017-10-16 04:02:42 +02:00
|
|
|
cc->tcg_initialize = cris_initialize_crisv10_tcg;
|
2016-08-15 13:59:32 +02:00
|
|
|
}
|
|
|
|
|
2013-02-06 17:18:12 +01:00
|
|
|
static void crisv32_cpu_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
|
|
|
|
|
|
|
|
ccc->vr = 32;
|
|
|
|
}
|
|
|
|
|
2012-04-11 23:12:05 +02:00
|
|
|
static void cris_cpu_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
2013-01-05 15:41:21 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
2012-04-11 23:12:05 +02:00
|
|
|
CPUClass *cc = CPU_CLASS(oc);
|
|
|
|
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
|
|
|
|
|
2018-01-14 03:04:12 +01:00
|
|
|
device_class_set_parent_realize(dc, cris_cpu_realizefn,
|
|
|
|
&ccc->parent_realize);
|
2013-01-05 15:41:21 +01:00
|
|
|
|
cpu: Use DeviceClass reset instead of a special CPUClass reset
The CPUClass has a 'reset' method. This is a legacy from when
TYPE_CPU used not to inherit from TYPE_DEVICE. We don't need it any
more, as we can simply use the TYPE_DEVICE reset. The 'cpu_reset()'
function is kept as the API which most places use to reset a CPU; it
is now a wrapper which calls device_cold_reset() and then the
tracepoint function.
This change should not cause CPU objects to be reset more often
than they are at the moment, because:
* nobody is directly calling device_cold_reset() or
qdev_reset_all() on CPU objects
* no CPU object is on a qbus, so they will not be reset either
by somebody calling qbus_reset_all()/bus_cold_reset(), or
by the main "reset sysbus and everything in the qbus tree"
reset that most devices are reset by
Note that this does not change the need for each machine or whatever
to use qemu_register_reset() to arrange to call cpu_reset() -- that
is necessary because CPU objects are not on any qbus, so they don't
get reset when the qbus tree rooted at the sysbus bus is reset, and
this isn't being changed here.
All the changes to the files under target/ were made using the
included Coccinelle script, except:
(1) the deletion of the now-inaccurate and not terribly useful
"CPUClass::reset" comments was done with a perl one-liner afterwards:
perl -n -i -e '/ CPUClass::reset/ or print' target/*/*.c
(2) this bit of the s390 change was done by hand, because the
Coccinelle script is not sophisticated enough to handle the
parent_reset call being inside another function:
| @@ -96,8 +96,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
| S390CPU *cpu = S390_CPU(s);
| S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
| CPUS390XState *env = &cpu->env;
|+ DeviceState *dev = DEVICE(s);
|
|- scc->parent_reset(s);
|+ scc->parent_reset(dev);
| cpu->env.sigp_order = 0;
| s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200303100511.5498-1-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2020-03-03 11:05:11 +01:00
|
|
|
device_class_set_parent_reset(dc, cris_cpu_reset, &ccc->parent_reset);
|
2013-02-06 17:18:12 +01:00
|
|
|
|
|
|
|
cc->class_by_name = cris_cpu_class_by_name;
|
2013-08-25 18:53:55 +02:00
|
|
|
cc->has_work = cris_cpu_has_work;
|
2013-02-02 10:57:51 +01:00
|
|
|
cc->do_interrupt = cris_cpu_do_interrupt;
|
2014-09-13 18:45:21 +02:00
|
|
|
cc->cpu_exec_interrupt = cris_cpu_exec_interrupt;
|
2013-05-27 01:33:50 +02:00
|
|
|
cc->dump_state = cris_cpu_dump_state;
|
2013-06-21 19:09:18 +02:00
|
|
|
cc->set_pc = cris_cpu_set_pc;
|
2013-06-29 04:18:45 +02:00
|
|
|
cc->gdb_read_register = cris_cpu_gdb_read_register;
|
|
|
|
cc->gdb_write_register = cris_cpu_gdb_write_register;
|
2019-04-02 10:24:13 +02:00
|
|
|
cc->tlb_fill = cris_cpu_tlb_fill;
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
2013-06-29 18:55:54 +02:00
|
|
|
cc->get_phys_page_debug = cris_cpu_get_phys_page_debug;
|
2012-05-04 12:54:34 +02:00
|
|
|
dc->vmsd = &vmstate_cris_cpu;
|
2013-06-29 18:55:54 +02:00
|
|
|
#endif
|
2013-06-28 23:18:47 +02:00
|
|
|
|
|
|
|
cc->gdb_num_core_regs = 49;
|
2014-09-12 20:04:17 +02:00
|
|
|
cc->gdb_stop_before_watchpoint = true;
|
2015-06-24 05:57:38 +02:00
|
|
|
|
|
|
|
cc->disas_set_info = cris_disas_set_info;
|
2017-10-16 04:02:42 +02:00
|
|
|
cc->tcg_initialize = cris_initialize_tcg;
|
2012-04-11 23:12:05 +02:00
|
|
|
}
|
|
|
|
|
2017-10-05 15:50:40 +02:00
|
|
|
#define DEFINE_CRIS_CPU_TYPE(cpu_model, initfn) \
|
|
|
|
{ \
|
|
|
|
.parent = TYPE_CRIS_CPU, \
|
|
|
|
.class_init = initfn, \
|
|
|
|
.name = CRIS_CPU_TYPE_NAME(cpu_model), \
|
|
|
|
}
|
2012-04-11 23:12:05 +02:00
|
|
|
|
2017-10-05 15:50:40 +02:00
|
|
|
static const TypeInfo cris_cpu_model_type_infos[] = {
|
|
|
|
{
|
|
|
|
.name = TYPE_CRIS_CPU,
|
|
|
|
.parent = TYPE_CPU,
|
|
|
|
.instance_size = sizeof(CRISCPU),
|
|
|
|
.instance_init = cris_cpu_initfn,
|
|
|
|
.abstract = true,
|
|
|
|
.class_size = sizeof(CRISCPUClass),
|
|
|
|
.class_init = cris_cpu_class_init,
|
|
|
|
},
|
|
|
|
DEFINE_CRIS_CPU_TYPE("crisv8", crisv8_cpu_class_init),
|
|
|
|
DEFINE_CRIS_CPU_TYPE("crisv9", crisv9_cpu_class_init),
|
|
|
|
DEFINE_CRIS_CPU_TYPE("crisv10", crisv10_cpu_class_init),
|
|
|
|
DEFINE_CRIS_CPU_TYPE("crisv11", crisv11_cpu_class_init),
|
|
|
|
DEFINE_CRIS_CPU_TYPE("crisv17", crisv17_cpu_class_init),
|
|
|
|
DEFINE_CRIS_CPU_TYPE("crisv32", crisv32_cpu_class_init),
|
|
|
|
};
|
2012-04-11 23:12:05 +02:00
|
|
|
|
2017-10-05 15:50:40 +02:00
|
|
|
DEFINE_TYPES(cris_cpu_model_type_infos)
|