781c67ca55
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>
127 lines
3.5 KiB
C
127 lines
3.5 KiB
C
/*
|
|
* Moxie emulation
|
|
*
|
|
* Copyright (c) 2008, 2010, 2013 Anthony Green
|
|
*
|
|
* 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 program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef MOXIE_CPU_H
|
|
#define MOXIE_CPU_H
|
|
|
|
#include "exec/cpu-defs.h"
|
|
|
|
#define MOXIE_EX_DIV0 0
|
|
#define MOXIE_EX_BAD 1
|
|
#define MOXIE_EX_IRQ 2
|
|
#define MOXIE_EX_SWI 3
|
|
#define MOXIE_EX_MMU_MISS 4
|
|
#define MOXIE_EX_BREAK 16
|
|
|
|
typedef struct CPUMoxieState {
|
|
|
|
uint32_t flags; /* general execution flags */
|
|
uint32_t gregs[16]; /* general registers */
|
|
uint32_t sregs[256]; /* special registers */
|
|
uint32_t pc; /* program counter */
|
|
/* Instead of saving the cc value, we save the cmp arguments
|
|
and compute cc on demand. */
|
|
uint32_t cc_a; /* reg a for condition code calculation */
|
|
uint32_t cc_b; /* reg b for condition code calculation */
|
|
|
|
void *irq[8];
|
|
|
|
/* Fields up to this point are cleared by a CPU reset */
|
|
struct {} end_reset_fields;
|
|
} CPUMoxieState;
|
|
|
|
#include "hw/core/cpu.h"
|
|
|
|
#define TYPE_MOXIE_CPU "moxie-cpu"
|
|
|
|
#define MOXIE_CPU_CLASS(klass) \
|
|
OBJECT_CLASS_CHECK(MoxieCPUClass, (klass), TYPE_MOXIE_CPU)
|
|
#define MOXIE_CPU(obj) \
|
|
OBJECT_CHECK(MoxieCPU, (obj), TYPE_MOXIE_CPU)
|
|
#define MOXIE_CPU_GET_CLASS(obj) \
|
|
OBJECT_GET_CLASS(MoxieCPUClass, (obj), TYPE_MOXIE_CPU)
|
|
|
|
/**
|
|
* MoxieCPUClass:
|
|
* @parent_reset: The parent class' reset handler.
|
|
*
|
|
* A Moxie CPU model.
|
|
*/
|
|
typedef struct MoxieCPUClass {
|
|
/*< private >*/
|
|
CPUClass parent_class;
|
|
/*< public >*/
|
|
|
|
DeviceRealize parent_realize;
|
|
DeviceReset parent_reset;
|
|
} MoxieCPUClass;
|
|
|
|
/**
|
|
* MoxieCPU:
|
|
* @env: #CPUMoxieState
|
|
*
|
|
* A Moxie CPU.
|
|
*/
|
|
typedef struct MoxieCPU {
|
|
/*< private >*/
|
|
CPUState parent_obj;
|
|
/*< public >*/
|
|
|
|
CPUNegativeOffsetState neg;
|
|
CPUMoxieState env;
|
|
} MoxieCPU;
|
|
|
|
|
|
void moxie_cpu_do_interrupt(CPUState *cs);
|
|
void moxie_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
|
|
hwaddr moxie_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
|
|
void moxie_translate_init(void);
|
|
int cpu_moxie_signal_handler(int host_signum, void *pinfo,
|
|
void *puc);
|
|
|
|
#define MOXIE_CPU_TYPE_SUFFIX "-" TYPE_MOXIE_CPU
|
|
#define MOXIE_CPU_TYPE_NAME(model) model MOXIE_CPU_TYPE_SUFFIX
|
|
#define CPU_RESOLVING_TYPE TYPE_MOXIE_CPU
|
|
|
|
#define cpu_signal_handler cpu_moxie_signal_handler
|
|
|
|
static inline int cpu_mmu_index(CPUMoxieState *env, bool ifetch)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
typedef CPUMoxieState CPUArchState;
|
|
typedef MoxieCPU ArchCPU;
|
|
|
|
#include "exec/cpu-all.h"
|
|
|
|
static inline void cpu_get_tb_cpu_state(CPUMoxieState *env, target_ulong *pc,
|
|
target_ulong *cs_base, uint32_t *flags)
|
|
{
|
|
*pc = env->pc;
|
|
*cs_base = 0;
|
|
*flags = 0;
|
|
}
|
|
|
|
bool moxie_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
|
|
MMUAccessType access_type, int mmu_idx,
|
|
bool probe, uintptr_t retaddr);
|
|
|
|
#endif /* MOXIE_CPU_H */
|