2994fd96d9
Instead of making cpu_init() return CPUArchState, return CPUState.
Changes were made using the Coccinelle semantic patch below.
@@
typedef CPUState;
identifier e;
expression args;
type CPUArchState;
@@
- e =
+ cpu =
cpu_init(args);
- if (!e) {
+ if (!cpu) {
...
}
- cpu = ENV_GET_CPU(env);
+ e = cpu->env_ptr;
@@
identifier new_env, new_cpu, env, cpu;
type CPUArchState;
expression args;
@@
-{
- CPUState *cpu = ENV_GET_CPU(env);
- CPUArchState *new_env = cpu_init(args);
- CPUState *new_cpu = ENV_GET_CPU(new_env);
+{
+ CPUState *cpu = ENV_GET_CPU(env);
+ CPUState *new_cpu = cpu_init(args);
+ CPUArchState *new_env = new_cpu->env_ptr;
...
}
@@
identifier c, cpu_init_func, cpu_model;
type StateType, CPUType;
@@
-static inline StateType* cpu_init(const char *cpu_model)
-{
- CPUType *c = cpu_init_func(cpu_model);
(
- if (c == NULL) {
- return NULL;
- }
- return &c->env;
|
- if (c) {
- return &c->env;
- }
- return NULL;
)
-}
+#define cpu_init(cpu_model) CPU(cpu_init_func(cpu_model))
@@
identifier cpu_init_func;
identifier model;
@@
-#define cpu_init(model) (&cpu_init_func(model)->env)
+#define cpu_init(model) CPU(cpu_init_func(model))
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Michael Walle <michael@walle.cc>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Cc: Anthony Green <green@moxielogic.com>
Cc: Jia Liu <proljc@gmail.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Cc: Max Filippov <jcmvbkbc@gmail.com>
[AF: Fixed up cpu_copy() manually]
Signed-off-by: Andreas Färber <afaerber@suse.de>
150 lines
3.9 KiB
C
150 lines
3.9 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 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 General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef _CPU_MOXIE_H
|
|
#define _CPU_MOXIE_H
|
|
|
|
#include "config.h"
|
|
#include "qemu-common.h"
|
|
|
|
#define TARGET_LONG_BITS 32
|
|
|
|
#define CPUArchState struct CPUMoxieState
|
|
|
|
#define ELF_MACHINE 0xFEED /* EM_MOXIE */
|
|
|
|
#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
|
|
|
|
#include "exec/cpu-defs.h"
|
|
#include "fpu/softfloat.h"
|
|
|
|
#define TARGET_PAGE_BITS 12 /* 4k */
|
|
|
|
#define TARGET_PHYS_ADDR_SPACE_BITS 32
|
|
#define TARGET_VIRT_ADDR_SPACE_BITS 32
|
|
|
|
#define NB_MMU_MODES 1
|
|
|
|
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];
|
|
|
|
CPU_COMMON
|
|
|
|
} CPUMoxieState;
|
|
|
|
#include "qom/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;
|
|
void (*parent_reset)(CPUState *cpu);
|
|
} MoxieCPUClass;
|
|
|
|
/**
|
|
* MoxieCPU:
|
|
* @env: #CPUMoxieState
|
|
*
|
|
* A Moxie CPU.
|
|
*/
|
|
typedef struct MoxieCPU {
|
|
/*< private >*/
|
|
CPUState parent_obj;
|
|
/*< public >*/
|
|
|
|
CPUMoxieState env;
|
|
} MoxieCPU;
|
|
|
|
static inline MoxieCPU *moxie_env_get_cpu(CPUMoxieState *env)
|
|
{
|
|
return container_of(env, MoxieCPU, env);
|
|
}
|
|
|
|
#define ENV_GET_CPU(e) CPU(moxie_env_get_cpu(e))
|
|
|
|
#define ENV_OFFSET offsetof(MoxieCPU, env)
|
|
|
|
MoxieCPU *cpu_moxie_init(const char *cpu_model);
|
|
int cpu_moxie_exec(CPUMoxieState *s);
|
|
void moxie_cpu_do_interrupt(CPUState *cs);
|
|
void moxie_cpu_dump_state(CPUState *cpu, FILE *f,
|
|
fprintf_function cpu_fprintf, 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 cpu_init(cpu_model) CPU(cpu_moxie_init(cpu_model))
|
|
|
|
#define cpu_exec cpu_moxie_exec
|
|
#define cpu_gen_code cpu_moxie_gen_code
|
|
#define cpu_signal_handler cpu_moxie_signal_handler
|
|
|
|
static inline int cpu_mmu_index(CPUMoxieState *env)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#include "exec/cpu-all.h"
|
|
#include "exec/exec-all.h"
|
|
|
|
static inline void cpu_get_tb_cpu_state(CPUMoxieState *env, target_ulong *pc,
|
|
target_ulong *cs_base, int *flags)
|
|
{
|
|
*pc = env->pc;
|
|
*cs_base = 0;
|
|
*flags = 0;
|
|
}
|
|
|
|
int moxie_cpu_handle_mmu_fault(CPUState *cpu, vaddr address,
|
|
int rw, int mmu_idx);
|
|
|
|
#endif /* _CPU_MOXIE_H */
|